diff --git a/models/res_partner.py b/models/res_partner.py index ce389dfdc892dba389409282d4af269df05879fe..2126ea3ce0edcb9b3c526153a76bd180206f791e 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -268,17 +268,12 @@ class ScopPartner(models.Model): rec.is_cooperative = False rec.incub_out_done = True - def incub_coop_non_adh(self): + def incub_coop(self): for rec in self: rec.is_cooperative = True - rec.project_status = "4_suivi" - rec.incub_out_done = True - - def incub_coop_adh(self): - for rec in self: - rec.is_cooperative = True - rec.project_status = "2_pre-diagnostic" rec.incub_out_done = True + if not rec.project_status: + rec.project_status = "3_accompagnement" def toggle_incub_active(self): for rec in self: diff --git a/views/res_partner.xml b/views/res_partner.xml index 800fa326c7002d94fbce359cf8b727526fbc08cc..7674fccb0668266662646da0abac94dc195e91e8 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -54,18 +54,11 @@ attrs="{'invisible':['|','|',('incub_status','in',('1_prospection','2_pre-incubation','9_abandonne')),('incub_out_mode','!=',('2_non_coop')),('incub_out_done','=',True)]}" /> <button - string="Création coop. non adhérente" + string="Création coopérative" type="object" - name="incub_coop_non_adh" + name="incub_coop" class="oe_read_only" - attrs="{'invisible':['|','|',('incub_status','in',('1_prospection','2_pre-incubation','9_abandonne')),('incub_out_mode','!=',('3_coop_non_adh')),('incub_out_done','=',True)]}" - /> - <button - string="Création coop. projet adhésion" - type="object" - name="incub_coop_adh" - class="oe_read_only" - attrs="{'invisible':['|','|',('incub_status','in',('1_prospection','2_pre-incubation','9_abandonne')),('incub_out_mode','!=',('4_coop_adh')),('incub_out_done','=',True)]}" + attrs="{'invisible':['|','|',('incub_status','in',('1_prospection','2_pre-incubation','9_abandonne')),('incub_out_mode','not in',('3_coop_non_adh', '4_coop_adh')),('incub_out_done','=',True)]}" /> <field name="incub_status"