From 03f5c14d23c8e64ca36d5fe63f443ade5cbfac84 Mon Sep 17 00:00:00 2001
From: Benjamin <35699580+benj-filament@users.noreply.github.com>
Date: Mon, 14 Oct 2019 10:32:26 +0200
Subject: [PATCH] modif vue liste fichier & suppression bouton ajouter un
fichiier
---
__manifest__.py | 2 +-
models/api_alfresco.py | 8 ++++++--
models/res_partner.py | 1 +
views/alfresco_partner_files.xml | 12 ++++++------
views/res_partner.xml | 2 +-
wizard/add_file_wizard.py | 8 ++++++--
wizard/add_file_wizard.xml | 2 +-
7 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/__manifest__.py b/__manifest__.py
index bcd26ec..1b64faf 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -14,7 +14,7 @@
"data": [
# "security/ir.model.access.csv",
"datas/ir_config_parameter.xml",
- "views/assets.xml",
+ # "views/assets.xml", # supprime le bouton ajouter un fichier en attendant validation de la CG
"views/alfresco_partner_files.xml",
"views/res_partner.xml",
"wizard/add_file_wizard.xml",
diff --git a/models/api_alfresco.py b/models/api_alfresco.py
index 75f6e30..b39e823 100644
--- a/models/api_alfresco.py
+++ b/models/api_alfresco.py
@@ -121,7 +121,7 @@ class ConnectorAlfresco(models.AbstractModel):
return self.get_nodeRef(
self.alfresco_get_by_url(url=url, call_type='post', json=json))
- def alfresco_upload(self, raisonSociale, type, periode, validite, filename, mimetype, doc):
+ def alfresco_upload(self, partner, type, periode, validite, filename, mimetype, doc):
""" Upload d'un document sur Alfresco
:param doc: document encodé en base64
@@ -130,7 +130,10 @@ class ConnectorAlfresco(models.AbstractModel):
"""
url = '/alfresco/s/erp/depotdocument'
json = {
- 'raisonSociale': raisonSociale,
+ 'raisonSociale': partner.name,
+ 'id': partner.id,
+ 'siret': partner.siret,
+ 'numAdherent': partner.member_number,
'periode': periode,
'type': type,
'nomOrigine': filename,
@@ -138,6 +141,7 @@ class ConnectorAlfresco(models.AbstractModel):
'validite': validite,
'contentBase64': doc,
}
+ print(json)
return self.get_nodeRef(
self.alfresco_get_by_url(url=url, call_type='post', json=json))
diff --git a/models/res_partner.py b/models/res_partner.py
index 2a0b88b..b49c06e 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -46,4 +46,5 @@ class AlfrescoPartner(models.Model):
"views": [[False, "tree"]],
"search_view_id": self.env.ref(
"connector_alfresco.alfresco_partner_files_search").id,
+ 'context': {'search_default_group_periode': True}
}
diff --git a/views/alfresco_partner_files.xml b/views/alfresco_partner_files.xml
index 9dbb6f1..0d51406 100644
--- a/views/alfresco_partner_files.xml
+++ b/views/alfresco_partner_files.xml
@@ -12,15 +12,15 @@
<search>
<!-- Champs de recherche -->
<field name="name" />
- <field name="type"/>
<field name="periode"/>
+ <field name="type"/>
<field name="validite"/>
<!-- Groupes -->
<group expand="0" name="group_by" string="Group By">
- <filter string="Types" name="file_type" context="{'group_by': 'type'}"/>
- <filter string="Période" name="file_periode" context="{'group_by': 'periode'}"/>
- <filter string="Validité" name="file_validite" context="{'group_by': 'validite'}"/>
- <filter string="Dernière Modification" name="last_modification" context="{'group_by': 'last_modification'}"/>
+ <filter string="Période" name="group_periode" context="{'group_by': 'periode'}"/>
+ <filter string="Types" name="group_type" context="{'group_by': 'type'}"/>
+ <filter string="Validité" name="group_validite" context="{'group_by': 'validite'}"/>
+ <filter string="Dernière Modification" name="group_last_modification" context="{'group_by': 'last_modification'}"/>
</group>
</search>
@@ -32,7 +32,7 @@
<field name="model">alfresco.partner.files</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
- <tree string="Fichiers" create="false" edit="false" delete="false">
+ <tree string="Fichiers" create="false" edit="false" delete="false" >
<field name="name" />
<field name="type"/>
<field name="periode"/>
diff --git a/views/res_partner.xml b/views/res_partner.xml
index ba1d761..4897f2d 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -11,7 +11,7 @@
<field name="inherit_id" ref="cgscop_partner.view_partner_cooperative_form"/>
<field name="arch" type="xml">
<header position="inside">
- <button string="Fichiers" type="object" name="get_partner_files" />
+ <button string="Documents" type="object" name="get_partner_files" />
</header>
</field>
</record>
diff --git a/wizard/add_file_wizard.py b/wizard/add_file_wizard.py
index 35099c0..00dcb97 100644
--- a/wizard/add_file_wizard.py
+++ b/wizard/add_file_wizard.py
@@ -64,7 +64,7 @@ class AddFileWizard(models.TransientModel):
else:
content_type = guess_mimetype(self.file)
self.alfresco_upload(
- raisonSociale=self.partner_id.name,
+ partner=self.partner_id,
type=self.type,
periode=self.periode,
validite=self.validite,
@@ -72,4 +72,8 @@ class AddFileWizard(models.TransientModel):
mimetype=content_type,
doc=self.file.decode('utf-8'))
- return self.partner_id.get_partner_files()
+ return {
+ 'type': 'ir.actions.client',
+ 'tag': 'reload',
+ }
+
diff --git a/wizard/add_file_wizard.xml b/wizard/add_file_wizard.xml
index 9dc16e2..6ceae9e 100644
--- a/wizard/add_file_wizard.xml
+++ b/wizard/add_file_wizard.xml
@@ -8,8 +8,8 @@
<form string="Ajouter un Fichier">
<group name="infos" string="Informations">
<field name="partner_id" readonly="1" />
- <field name="type" required="1" />
<field name="periode" required="1" />
+ <field name="type" required="1" />
<field name="validite" required="1" />
</group>
<group>
--
GitLab