diff --git a/models/res_partner.py b/models/res_partner.py
index 13bb4d796bbe804154ebd6533eb3ee4b5307f8f7..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 = "6_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 c773ff034a80556fc70bfdc2a92e6df0c0bcc7c2..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"
@@ -100,13 +93,13 @@
default_focus="1"
required="1"
placeholder="Raison Sociale"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
</h1>
</div>
<group col="3" string="Informations Générales">
-
+<!-- Todo : A vérieir les statuts-->
<group string="Contact">
<field name="sigle" />
<label for='street' string="Adresse du siège social" />
@@ -115,48 +108,48 @@
name="street"
placeholder="Rue..."
class="o_address_street"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="street2"
placeholder="Rue 2..."
class="o_address_street"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="street3"
placeholder="Rue 3..."
class="o_address_street"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="zip_id"
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
placeholder="CP / Ville autocomplétion..."
class="oe_edit_only"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="zip"
placeholder="CP..."
class="o_address_city"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
/>
<field name="zip_departement" invisible="1" />
<field
name="city"
placeholder="Ville..."
class="o_address_city"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
- modifiers="{'readonly':[['project_status', '=', '6_suivi']], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_suivi']], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
/>
<field name="city_id" invisible="1" />
<field
name="cedex"
placeholder="Cedex"
class="o_address_city"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
- modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_suivi']]}"
/>
<field
name="state_id"
@@ -164,16 +157,16 @@
placeholder="Région"
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']]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_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']]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_suivi']]}"
/>
</div>
<field
@@ -186,7 +179,7 @@
name="phone"
widget="phone"
string="Téléphone 1"
- attrs="{'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="mobile"