From 5c2474d14fbf20439fcbb2375a6b65d3b0f53db1 Mon Sep 17 00:00:00 2001
From: Remi <remi@le-filament.com>
Date: Tue, 15 Oct 2019 11:35:30 +0200
Subject: [PATCH] Modifications affichage
---
views/res_partner_cooperative.xml | 42 +++++++++++++++----------------
views/scop_config_lists_views.xml | 20 +++++++--------
views/scop_config_views.xml | 17 +++++++------
wizard/scop_deces_wizard.py | 7 +++---
wizard/scop_period_wizard.py | 22 ++++++++--------
5 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index ed89feb..1ad3ed3 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -155,11 +155,11 @@
<div class="oe_bloc_cgscop">
<div class="o_row d-flex">
<h3>
- <field class="o_field_header" name="cooperative_form_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '6_suivi'))]}" options="{'no_open': True}" placeholder="Forme Coopérative"/>
+ <field class="o_field_header" name="cooperative_form_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '6_suivi'))]}" options="{'no_open': True, 'no_create': True}" placeholder="Forme Coopérative"/>
</h3>
<span> </span>
<h3>
- <field options="{'no_open': True}" name="partner_company_type_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '6_suivi'))]}" placeholder="Statut Juridique"/>
+ <field options="{'no_open': True, 'no_create': True}" name="partner_company_type_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '6_suivi'))]}" placeholder="Statut Juridique"/>
</h3>
</div>
<div class="o_row d-flex ">
@@ -199,7 +199,7 @@
<field name="cedex" placeholder="Cedex" class="o_address_city"
attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"/>
<field name="state_id" class="o_address_zip" placeholder="Région"
- options='{"no_open": True}' context="{'country_id': country_id, 'zip': zip}"
+ options='{"no_open": True, "no_create": True}' context="{'country_id': country_id, 'zip': zip}"
attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"/>
<field name="country_id" placeholder="Pays" class="o_address_country" options='{"no_open": True, "no_create": True}'
attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"/>
@@ -228,23 +228,23 @@
</div>
</group>
<group string="Suivi UR">
- <field name="ur_id" required="True" options="{'no_create': True}"/>
+ <field name="ur_id" required="True" options="{'no_open': True, 'no_create': True}"/>
<field name="creation_delegate_id" widget="res_partner_many2one"
- attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg', '6_suivi'))], 'invisible':[('project_status', '=', '6_suivi')]}" options="{'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
- <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/>
- <field name="revision_person_id" widget="res_partner_many2one" readonly="True" options="{'no_create': True}"/>
+ attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg', '6_suivi'))], 'invisible':[('project_status', '=', '6_suivi')]}" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/>
+ <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/>
+ <field name="revision_person_id" widget="res_partner_many2one" readonly="True" options="{'no_open': True, 'no_create': True}"/>
<field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('category', '=', 'segment_1'),('ur_id', '=', ur_id)]"/>
<field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('category', '=', 'segment_2'),('ur_id', '=', ur_id)]"/>
<field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('category', '=', 'segment_3'),('ur_id', '=', ur_id)]"/>
<field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('category', '=', 'segment_4'),('ur_id', '=', ur_id)]"/>
</group>
<group string="Informations Activité">
- <field name="creation_origin_id" required="True" options="{'no_create': True}"/>
- <field name="creation_suborigin_id" attrs="{'required':[('creation_origin_id','!=',False)]}" domain="[('parent_id', '=', creation_origin_id), ('child_ids', '=', False)]" options="{'no_create': True}"/>
- <field name="date_1st_sign" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
- <field name="registration_date" attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
+ <field name="creation_origin_id" required="True" options="{'no_open': True, 'no_create': True}"/>
+ <field name="creation_suborigin_id" attrs="{'required':[('creation_origin_id','!=',False)]}" domain="[('parent_id', '=', creation_origin_id), ('child_ids', '=', False)]" options="{'no_open': True, 'no_create': True}"/>
+ <field name="date_1st_sign"/>
+ <field name="registration_date"/>
<field name="social_object" attrs="{'required':[('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_cg', '6_suivi'))]}"/>
- <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}" options="{'no_create': True}"/>
+ <field name="naf_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}" options="{'no_open': True, 'no_create': True}"/>
<field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
<field name="siret" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))]}"/>
<field name="siren" readonly="1"/>
@@ -334,7 +334,7 @@
attrs="{'invisible': [('type','!=', 'contact')]}"/>
<field name="firstname" string="Prénom" required="1"/>
<field name="lastname" string="Nom de famille" required="1"/>
- <field name="mandate_id" options="{'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}" required="1"/>
+ <field name="mandate_id" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}" required="1"/>
<field name="function" placeholder="Responsable des ventes"
attrs="{'invisible': [('type','!=', 'contact')]}"/>
<field name="email"/>
@@ -445,7 +445,7 @@
<field name="cedex" placeholder="Cedex" class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}" modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"/>
<field name="state_id" class="o_address_zip" placeholder="State"
- options='{"no_open": True}' context="{'country_id': country_id, 'zip': zip}"/>
+ options='{"no_open": True, "no_create": True}' context="{'country_id': country_id, 'zip': zip}"/>
<field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
</div>
</div>
@@ -456,7 +456,7 @@
<field name="name" string="Nom" attrs="{'required' : [('type', '!=', 'contact')], 'invisible' : [('type', '=', 'contact')]}"/>
<field name="firstname" string="Prénom" attrs="{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"/>
<field name="lastname" string="Nom de famille" attrs="{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"/>
- <field name="mandate_id" options="{'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}"/>
+ <field name="mandate_id" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('type','!=', 'contact')]}"/>
<field name="function" placeholder="e.g. Directeur des Ventes"
attrs="{'invisible': [('type','!=', 'contact')]}"/>
<field name="email"/>
@@ -480,9 +480,9 @@
<field name="bank_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="bank2_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="accountant_id" widget="res_partner_many2one" options="{'no_create': True}"/>
- <field name="accountant_person_id" widget="res_partner_many2one" attrs="{'invisible': [('accountant_id', '=', False)]}" domain="[('parent_id', '=', accountant_id), ('is_company', '=', False)]" options="{'no_create': True}"/>
+ <field name="accountant_person_id" widget="res_partner_many2one" attrs="{'invisible': [('accountant_id', '=', False)]}" domain="[('parent_id', '=', accountant_id), ('is_company', '=', False)]" options="{'no_open': True, 'no_create': True}"/>
<field name="auditor_id" widget="res_partner_many2one" options="{'no_create': True}"/>
- <field name="auditor_person_id" widget="res_partner_many2one" attrs="{'invisible': [('auditor_id', '=', False)]}" domain="[('parent_id', '=', auditor_id), ('is_company', '=', False)]" options="{'no_create': True}"/>
+ <field name="auditor_person_id" widget="res_partner_many2one" attrs="{'invisible': [('auditor_id', '=', False)]}" domain="[('parent_id', '=', auditor_id), ('is_company', '=', False)]" options="{'no_open': True, 'no_create': True}"/>
</group>
</page>
<page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
@@ -491,8 +491,8 @@
<field name="revision_contract"/>
<field name="revision_company_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="revision_backup_company_id" widget="res_partner_many2one" options="{'no_create': True}"/>
- <field name="revision_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/>
- <field name="revision_certified_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]"/>
+ <field name="revision_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]" options="{'no_open': True, 'no_create': True}"/>
+ <field name="revision_certified_person_id" widget="res_partner_many2one" domain="[('is_company', '=', False), ('parent_id', 'in', (revision_company_id, revision_backup_company_id))]" options="{'no_open': True, 'no_create': True}"/>
<field name="revision_person_assign_date"/>
</group>
<group>
@@ -503,10 +503,10 @@
<field name="revision_ids" widget="one2many">
<tree string="Révisions" editable="top">
<field name="date"/>
- <field name="delegate_id"/>
+ <field name="delegate_id" options="{'no_create': True}"/>
<field name="revision_result_year"/>
<field name="revision_staff"/>
- <field name="revision_format_id" options="{'no_create': True}"/>
+ <field name="revision_format_id" options="{'no_open': True, 'no_create': True}"/>
<field name="revision_followup"/>
<field name="note"/>
</tree>
diff --git a/views/scop_config_lists_views.xml b/views/scop_config_lists_views.xml
index 09c5453..7477939 100644
--- a/views/scop_config_lists_views.xml
+++ b/views/scop_config_lists_views.xml
@@ -10,7 +10,7 @@
<field name="name">scop.contribution.type.tree</field>
<field name="model">scop.contribution.type</field>
<field name="arch" type="xml">
- <tree string="Contribution Types">
+ <tree string="Contribution Types" editable="top">
<field name="name"/>
</tree>
</field>
@@ -29,7 +29,7 @@
<field name="name">scop.financial.tools.type.tree</field>
<field name="model">scop.financial.tools.type</field>
<field name="arch" type="xml">
- <tree string="Financial Tools Types">
+ <tree string="Financial Tools Types" editable="top">
<field name="name"/>
</tree>
</field>
@@ -48,7 +48,7 @@
<field name="name">scop.financial.intervention.type.tree</field>
<field name="model">scop.financial.intervention.type</field>
<field name="arch" type="xml">
- <tree string="Financial Intervention Types">
+ <tree string="Financial Intervention Types" editable="top">
<field name="name"/>
</tree>
</field>
@@ -67,7 +67,7 @@
<field name="name">scop.financial.category.tree</field>
<field name="model">scop.financial.category</field>
<field name="arch" type="xml">
- <tree string="Financial Categories">
+ <tree string="Financial Categories" editable="top">
<field name="name"/>
</tree>
</field>
@@ -86,7 +86,7 @@
<field name="name">scop.liasse.fiscale.source.tree</field>
<field name="model">scop.liasse.fiscale.source</field>
<field name="arch" type="xml">
- <tree string="Liasse Fiscale Sources">
+ <tree string="Liasse Fiscale Sources" editable="top">
<field name="name"/>
</tree>
</field>
@@ -105,7 +105,7 @@
<field name="name">scop.liasse.fiscale.type.tree</field>
<field name="model">scop.liasse.fiscale.type</field>
<field name="arch" type="xml">
- <tree string="Liasse Fiscale Types">
+ <tree string="Liasse Fiscale Types" editable="top">
<field name="name"/>
</tree>
</field>
@@ -123,7 +123,7 @@
<field name="name">scop.membership.type.tree</field>
<field name="model">scop.membership.type</field>
<field name="arch" type="xml">
- <tree string="Membership Types">
+ <tree string="Membership Types" editable="top">
<field name="name"/>
</tree>
</field>
@@ -142,7 +142,7 @@
<field name="name">scop.membership.reason.end.tree</field>
<field name="model">scop.membership.reason.end</field>
<field name="arch" type="xml">
- <tree string="Reasons for end of Membership">
+ <tree string="Reasons for end of Membership" editable="top">
<field name="name"/>
</tree>
</field>
@@ -161,7 +161,7 @@
<field name="name">scop.revision.format.tree</field>
<field name="model">scop.revision.format</field>
<field name="arch" type="xml">
- <tree string="Revision Formats">
+ <tree string="Revision Formats" editable="top">
<field name="name"/>
</tree>
</field>
@@ -179,7 +179,7 @@
<field name="name">scop.questionnaire.type.tree</field>
<field name="model">scop.questionnaire.type</field>
<field name="arch" type="xml">
- <tree string="Questionnaire Types">
+ <tree string="Questionnaire Types" editable="top">
<field name="name"/>
</tree>
</field>
diff --git a/views/scop_config_views.xml b/views/scop_config_views.xml
index 8abaa4f..b6f523d 100644
--- a/views/scop_config_views.xml
+++ b/views/scop_config_views.xml
@@ -10,7 +10,7 @@
<field name="name">res.partner.dissolution.reason.tree</field>
<field name="model">res.partner.dissolution.reason</field>
<field name="arch" type="xml">
- <tree string="Dissolution Reasons">
+ <tree string="Dissolution Reasons" editable="top">
<field name="name"/>
</tree>
</field>
@@ -28,7 +28,7 @@
<field name="name">res.partner.creation.origin.tree</field>
<field name="model">res.partner.creation.origin</field>
<field name="arch" type="xml">
- <tree string="Creation Origins" editable="bottom">
+ <tree string="Creation Origins" editable="top">
<field name="name"/>
<field name="parent_id"/>
<field name="id_riga"/>
@@ -48,7 +48,7 @@
<field name="name">res.partner.organization.type.tree</field>
<field name="model">res.partner.organization.type</field>
<field name="arch" type="xml">
- <tree string="Organization Types">
+ <tree string="Organization Types" editable="top">
<field name="name"/>
<field name="parent_id"/>
<field name="id_riga"/>
@@ -69,7 +69,7 @@
<field name="name">res.partner.cooperative.form.tree</field>
<field name="model">res.partner.cooperative.form</field>
<field name="arch" type="xml">
- <tree string="Cooperative Forms">
+ <tree string="Cooperative Forms" editable="top">
<field name="name"/>
</tree>
</field>
@@ -88,7 +88,7 @@
<field name="name">res.partner.certification.tree</field>
<field name="model">res.partner.certification</field>
<field name="arch" type="xml">
- <tree string="Certifications">
+ <tree string="Certifications" editable="top">
<field name="name"/>
</tree>
</field>
@@ -141,7 +141,7 @@
<field name="name">res.partner.rgpd.origin.tree</field>
<field name="model">res.partner.rgpd.origin</field>
<field name="arch" type="xml">
- <tree string="RGPD Origins">
+ <tree string="RGPD Origins" editable="top">
<field name="name"/>
</tree>
</field>
@@ -160,7 +160,7 @@
<field name="name">res.partner.newsletter.tree</field>
<field name="model">res.partner.newsletter</field>
<field name="arch" type="xml">
- <tree string="Newsletters">
+ <tree string="Newsletters" editable="top">
<field name="name"/>
</tree>
</field>
@@ -179,9 +179,10 @@
<field name="name">res.partner.segment.tree</field>
<field name="model">res.partner.segment</field>
<field name="arch" type="xml">
- <tree string="Segmentations">
+ <tree string="Segmentations" editable="top">
<field name="category"/>
<field name="name"/>
+ <field name="ur_id"/>
</tree>
</field>
</record>
diff --git a/wizard/scop_deces_wizard.py b/wizard/scop_deces_wizard.py
index 9927c04..992ffb3 100644
--- a/wizard/scop_deces_wizard.py
+++ b/wizard/scop_deces_wizard.py
@@ -18,7 +18,7 @@ class ScopDecesWizard(models.TransientModel):
def _default_last_period_id(self):
return self.env['scop.period'].search(
[('partner_id', '=', self.env.context.get('active_id')),
- ('end_reason', '=', False)],
+ ('end', '=', False)],
limit=1).id
# Fields common
@@ -50,8 +50,9 @@ class ScopDecesWizard(models.TransientModel):
})
else:
raise ValidationError(
- "La date de fin doit être postèrieure à la date de " +
- "début : " + str(last_period.start))
+ "La date de fin doit être postèrieure à la date de "
+ + "début de la dernière période: "
+ + str(last_period.start))
# Update partner
partner = self.env['res.partner'].browse(period.partner_id)
diff --git a/wizard/scop_period_wizard.py b/wizard/scop_period_wizard.py
index 616d748..f7fc9aa 100644
--- a/wizard/scop_period_wizard.py
+++ b/wizard/scop_period_wizard.py
@@ -170,17 +170,17 @@ class ScopPeiodWizard(models.TransientModel):
[('partner_id', '=', self.env.context.get('active_id'))],
limit=1)
if previous_period:
- if (previous_period.end and
- period.start >= previous_period.end):
- partner_values = {
- 'dissolution_date': False,
- 'dissolution_reason_id': False,
- }
- else:
- raise ValidationError(
- "La nouvelle période ne peut commencer avant la "
- + "fin de la période précédente : "
- + str(previous_period.end))
+ if previous_period.end:
+ if period.start >= previous_period.end:
+ partner_values = {
+ 'dissolution_date': False,
+ 'dissolution_reason_id': False,
+ }
+ else:
+ raise ValidationError(
+ "La nouvelle période ne peut commencer avant la "
+ + "fin de la période précédente : "
+ + str(previous_period.end))
if period.start >= previous_period.start:
if not previous_period.end_reason:
previous_period.write({
--
GitLab