diff --git a/models/res_partner.py b/models/res_partner.py index 365ef291fb4fac172b3c3b31f048b75cdc411883..930d3709c75cd9ac53a1a84fd19fd300a0ee9484 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -19,7 +19,7 @@ class ScopPartner(models.Model): "Montant de l’étude de faisabilité") date_convention = fields.Date("Date de signature de la convention") amount_convention = fields.Integer("Montant de la convention") - file_fill = fields.Boolean("Dossier d’adhésion complet") + file_full = fields.Boolean("Dossier d’adhésion complet") date_transmission_cg = fields.Date( "Date de transmission du dossier à la CG") diff --git a/views/res_partner.xml b/views/res_partner.xml index e7de74a82ea07282cabfac00beb573ffc525a439..1e87b5b4e7bd040cabdd5b96b771fdbe6f06cef6 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -13,31 +13,35 @@ <field name="arch" type="xml"> <field name="prescriber_canal_id" position="replace"/> <xpath expr='//notebook' position="inside"> - <page name="adhesion_processus" string="Processus Adhesion"> - <field name="purcent_realisation"/> - <field name="date_realisation"/> - <field name="prescriber_canal_id" widget="res_partner_many2one" options="{'no_create': True}"/> + <page name="adhesion_processus" string="Processus Adhesion" autofocus="autofocus"> <group> - <group> - <group string="Phase d'information" attrs="{'invisible': [('project_status','in',('6_suivi'))]}"> - <field name="date_first_rdv"/> - <field name="date_send_guide"/> - </group> - <group sttring="Phase de pré-diagnostic" attrs="{'invisible':[('project_status','in',('1_information'))]}"> - <field name="feasibility_study" widget="boolean_toggle"/> - <field name="amount_feasibility_study"/> - </group> - <group sttring="Phase d'accompagnement'" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic'))]}"> - <field name="date_convention"/> - <field name="amount_convention"/> - </group> - <group sttring="Phase d'adhésion" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement'))]}"> - <field name="file_full" widget="boolean_toggle"/> - </group> - <group sttring="Soumis CGScop" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion'))]}"> - <field name="date_transmission_cg"/> - </group> + <group string="Général"> + <field name="purcent_realisation"/> + <field name="date_realisation"/> + <field name="prescriber_canal_id" widget="res_partner_many2one" options="{'no_create': True}"/> </group> + </group> + <group col="5"> + <group string="Phase d'information" attrs="{'invisible': [('project_status','in',('6_suivi'))]}"> + <field name="date_first_rdv"/> + <field name="date_send_guide"/> + </group> + <group string="Phase de pré-diagnostic" attrs="{'invisible':[('project_status','in',('1_information'))]}"> + <field name="feasibility_study" widget="boolean_toggle"/> + <field name="amount_feasibility_study"/> + </group> + <group string="Phase d'accompagnement" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic'))]}"> + <field name="date_convention"/> + <field name="amount_convention"/> + </group> + <group string="Phase d'adhésion" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement'))]}"> + <field name="file_full" widget="boolean_toggle"/> + </group> + <group string="Soumis CGScop" attrs="{'invisible':[('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion'))]}"> + <field name="date_transmission_cg"/> + </group> + </group> + <group> <group string="Dossier EU"> <field name="file_fse_open" widget="boolean_toggle"/> <field name="date_return_file"/>