diff --git a/__manifest__.py b/__manifest__.py
index 42561fe364c5a677275bc45cdf7645ee8437f9b9..1684a321e21c3d7a69f820872266c060533117d8 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -1,7 +1,7 @@
{
"name": "CG SCOP - Gestion Contacts",
"summary": "CG SCOP - Gestion des contacts",
- "version": "14.0.1.0.0",
+ "version": "14.0.1.0.2",
"author": "Le Filament",
"license": "AGPL-3",
"application": False,
diff --git a/models/res_partner.py b/models/res_partner.py
index 65afdec88c9c8e1db26bc0f204218eb29e377563..f29a94eebab999b1de39f027f997918a04cb8cc6 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -63,10 +63,9 @@ class ScopPartner(models.Model):
("1_information", "Phase d'information"),
("2_pre-diagnostic", "Phase de pré-diagnostic"),
("3_accompagnement", "Phase d'accompagnement projet"),
- ("4_adhesion", "Phase d'adhésion"),
- ("5_cg", "Soumis CGScop"),
- ("6_suivi", "Phase de suivi"),
- ("7_abandonne", "Projet abandonné"),
+ ("4_suivi", "Phase de suivi"),
+ ("5_abandonne", "Projet abandonné"),
+ ("6_decede", "Coop Décédée"),
],
tracking=True,
string="Statut projet",
@@ -85,15 +84,17 @@ class ScopPartner(models.Model):
ondelete="restrict",
tracking=True,
)
+
membership_status = fields.Selection(
[
- ("member", "Adhérent"),
("not_member", "Non Adhérent"),
+ ("adhesion", "Phase d'Adhésion"),
+ ("soumis_cg", "Soumis CG"),
+ ("member", "Adhérent"),
("out", "Radié"),
],
string="Statut d'adhésion",
- compute="_compute_membership",
- store=True,
+ default="not_member",
)
member_number = fields.Char(
"No adhérent (texte)", compute="_compute_membership_number", store=True
@@ -790,7 +791,8 @@ class ScopPartner(models.Model):
)
# Création d'une période lors du changement de statut en Suivi
- if vals.get("project_status") == "6_suivi" and not self.env.context.get(
+ # Todo: A voir si le statut reste à celui là
+ if vals.get("project_status") == "4_suivi" and not self.env.context.get(
"import_file"
):
if not partner.scop_period_ids:
@@ -827,7 +829,8 @@ class ScopPartner(models.Model):
for vals in vals_list:
# Création d'une période si la coop est en statut en Suivi
- if vals.get("is_cooperative") and vals.get("project_status") == "6_suivi":
+ # Todo: A voir si le statut est bien celui là
+ if vals.get("is_cooperative") and vals.get("project_status") == "4_suivi":
for partner in partners:
if not partner.scop_period_ids:
partner._create_period(partner)
@@ -984,6 +987,7 @@ class ScopPartner(models.Model):
"membership_period_ids.end_reason_id",
"membership_period_ids.end",
)
+ # Todo: A revoir comment on assigne le statut member
def _compute_membership(self):
for partner in self:
if partner.membership_period_ids:
@@ -1155,9 +1159,11 @@ class ScopPartner(models.Model):
# Button & Action
# ------------------------------------------------------
def scop_send_to_cg(self):
+ # Todo: A vérifier pour le statut suivi car déjà en statut suivi normalement
self.write(
{
- "project_status": "5_cg",
+ "project_status": "4_suivi",
+ "membership_status": "soumis_cg",
}
)
return True
@@ -1170,25 +1176,23 @@ class ScopPartner(models.Model):
self.scop_valid_cg()
def scop_valid_cg(self):
+ # Todo: A confirmer qu'on passe bien au statut member?
self.write(
{
- "project_status": "6_suivi",
+ "membership_status": "member",
}
)
return True
def scop_prj_adhesion(self):
- self.write(
- {
- "project_status": "4_adhesion",
- }
- )
+ self.write({"membership_status": "adhesion"})
return True
def scop_abandonne(self):
+ # Todo: A vérifier pour le statut member?
self.write(
{
- "project_status": "7_abandonne",
+ "project_status": "5_abandonne",
}
)
return True
@@ -1292,7 +1296,7 @@ class ScopPartner(models.Model):
"default_is_company": True,
"default_is_cooperative": True,
"default_company_type": "company",
- "default_project_status": "6_suivi",
+ "default_project_status": "4_suivi",
}
# Détermine le filtre par défaut pour l'affichage
@@ -1331,14 +1335,14 @@ class ScopPartner(models.Model):
"target": "current",
"domain": [
("is_cooperative", "=", True),
- ("project_status", "=", "6_suivi"),
+ ("project_status", "=", "4_suivi"),
],
"context": ctx,
}
- def show_prospect(self):
+ def show_creation_project(self):
"""
- Affichage des prospect avec filtre par défaut
+ Affichage des projets en création avec filtre par défaut
"""
ctx = {
"default_is_company": True,
@@ -1353,7 +1357,7 @@ class ScopPartner(models.Model):
ctx.update({"search_default_my_ur": True})
return {
- "name": "Prospects",
+ "name": "Projets de création",
"type": "ir.actions.act_window",
"res_model": "res.partner",
"search_view_id": (
@@ -1384,9 +1388,7 @@ class ScopPartner(models.Model):
"1_information",
"2_pre-diagnostic",
"3_accompagnement",
- "4_adhesion",
- "5_cg",
- "7_abandonne",
+ "5_abandonne",
),
),
],
@@ -1428,7 +1430,64 @@ class ScopPartner(models.Model):
),
],
"target": "current",
- "domain": [("is_cooperative", "=", True)],
+ "domain": [
+ ("is_cooperative", "=", True),
+ (
+ "project_status",
+ "in",
+ ("4_suivi",),
+ ),
+ ],
+ "context": ctx,
+ }
+
+ def show_processus_adhesion(self):
+ """
+ Affichage des coopératives dans leur processus d'adhésion par défaut
+ """
+ ctx = {
+ "default_is_company": True,
+ "default_is_cooperative": True,
+ "default_company_type": "company",
+ "default_project_status": "4_suivi",
+ }
+
+ # Détermine le filtre par défaut pour l'affichage
+ filtre = self.env.company.ur_id.partner_filter
+ if filtre == "2":
+ ctx.update({"search_default_my_ur_adherent": True})
+
+ return {
+ "name": "Processus d'adhésion",
+ "type": "ir.actions.act_window",
+ "res_model": "res.partner",
+ "search_view_id": (
+ self.env.ref("cgscop_partner.scop_partner_view_search").id,
+ ),
+ "view_mode": "kanban,tree,form,activity",
+ "views": [
+ (
+ self.env.ref("cgscop_partner.view_partner_adhesion_kanban").id,
+ "kanban",
+ ),
+ (
+ self.env.ref("cgscop_partner.view_partner_prospect_tree").id,
+ "tree",
+ ),
+ (
+ self.env.ref("cgscop_partner.scop_contact_view_form").id,
+ "form",
+ ),
+ ],
+ "target": "current",
+ "domain": [
+ ("is_cooperative", "=", True),
+ (
+ "project_status",
+ "in",
+ ("4_suivi",),
+ ),
+ ],
"context": ctx,
}
diff --git a/views/res_partner.xml b/views/res_partner.xml
index a406a730d8baf2400dfc285bed9e13942095a405..d3c5b1fc080619b0d0e21517b373edbaa0d028ad 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -531,7 +531,7 @@
type="action"
name="%(cgscop_partner.scop_period_wizard_create_action)d"
class="oe_highlight"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_suivi')]}"
groups="cgscop_partner.group_add_period"
/>
<button
@@ -539,28 +539,28 @@
type="action"
name="%(cgscop_partner.scop_address_wizard_action)d"
class="oe_highlight"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_suivi')]}"
/>
<button
string="Nouvelle période d'adhésion"
type="action"
name="%(cgscop_partner.scop_membership_period_wizard_create_action)d"
class="oe_highlight"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_suivi')]}"
groups="cgscop_partner.group_add_period"
/>
<button
string="Décès/Mise en sommeil"
type="action"
name="%(cgscop_partner.scop_deces_wizard_create_action)d"
- attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '4_suivi')]}"
groups="cgscop_partner.group_add_period"
/>
<button
string="Radiation"
type="action"
name="%(cgscop_partner.scop_membership_out_wizard_create_action)d"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_suivi')]}"
groups="cgscop_partner.group_add_period"
/>
<button
@@ -568,29 +568,29 @@
type="object"
name="scop_send_to_cg"
class="btn-primary"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_adhesion')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('membership_status', '!=', 'adhesion')]}"
/>
<button
string="Dossier créé CG"
type="object"
name="scop_valid_cg_button"
class="btn-primary"
- attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '5_cg')]}"
+ attrs="{'invisible': ['|', ('write_date', '=', False), ('membership_status', '!=', 'soumis_cg')]}"
groups="cgscop_partner.group_cg_administrator"
/>
<button
string="Prospect Abandonne"
type="object"
name="scop_abandonne"
- attrs="{'invisible':[('project_status','in',('5_cg', '6_suivi', '7_abandonne'))]}"
+ attrs="{'invisible':[('project_status','in', ('4_suivi', '5_abandonne'))]}"
/>
<button
string="Projet d'adhésion"
class="oe_read_only"
type="object"
name="scop_prj_adhesion"
- attrs="{'invisible':['|',('project_status','not in',('6_suivi')),('membership_status','in',('member'))]}"
- confirm="Êtes-vous sûr de vouloir basculer cette coopérative dans les projets ?"
+ attrs="{'invisible':['|', ('project_status','!=','4_suivi'), ('membership_status','not in',('out', 'not_member'))]}"
+ confirm="Êtes-vous sûr de vouloir rebasculer cette coopérative dans le processus d'adhésion ?"
/>
<button
string="Modification statut projet"
@@ -602,8 +602,15 @@
name="project_status"
widget="statusbar"
clickable="True"
- statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion"
- attrs="{'invisible':[('project_status','in',('6_suivi'))]}"
+ statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement"
+ attrs="{'invisible':[('project_status','in',('4_suivi'))]}"
+ />
+ <field
+ name="membership_status"
+ widget="statusbar"
+ clickable="True"
+ statusbar_visible="not_member,adhesion,soumis_cg,member,out"
+ attrs="{'invisible':[('project_status','not in',('4_suivi'))]}"
/>
</header>
</xpath>
@@ -649,7 +656,7 @@
default_focus="1"
required="1"
placeholder="Raison Sociale"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi'), ('is_cooperative', '=', True)]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi'), ('is_cooperative', '=', True)]}"
/>
<button
style="margin: -50px 0px 0px"
@@ -667,7 +674,7 @@
<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', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required': ['|', ('project_status','in',('2_pre-diagnostic', '3_accompagnement')), '&', ('write_date', '=', False), ('project_status', '=', '4_suivi')]}"
options="{'no_open': True, 'no_create': True}"
placeholder="Forme Coopérative"
/>
@@ -678,7 +685,7 @@
options="{'no_open': True, 'no_create': True}"
domain="[('is_coop', '=', True)]"
name="partner_company_type_id"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}"
placeholder="Statut Juridique"
/>
</h3>
@@ -715,7 +722,7 @@
<field
name="cae"
class="oe_edit_only"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
</h3>
<field name="user_id" invisible="1" />
@@ -743,48 +750,48 @@
name="street"
placeholder="Rue..."
class="o_address_street"
- attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
/>
<field
name="street3"
placeholder="Rue 3..."
class="o_address_street"
- attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
- modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_suivi']]}"
/>
<field
name="state_id"
@@ -792,16 +799,16 @@
placeholder="Région"
options='{"no_open": True, "no_create": True}'
context="{'country_id': country_id, 'zip': zip}"
- attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
- modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('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': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"
- modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"
+ attrs="{'readonly': [('type', '!=', 'facility'), ('write_date', '!=', False), ('project_status', '=', '4_suivi')]}"
+ modifiers="{'readonly':[['project_status', '=', '4_suivi']]}"
/>
</div>
<field name="zip_departement" string="N° de département" />
@@ -810,7 +817,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"
@@ -934,7 +941,7 @@
/>
<field
name="creation_delegate_id"
- attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg'))], 'invisible':[('project_status', 'in', '6_suivi')]}"
+ attrs="{'required':['|', ('membership_status','in',('adhesion', 'soumis_cg')), ('project_status','in',('3_accompagnement'))], 'invisible':[('project_status', 'in', '4_suivi')]}"
options="{'no_open': True, 'no_create': True}"
domain="[('ur_id', '=', ur_id)]"
/>
@@ -1033,8 +1040,8 @@
name="date_1st_sign"
attrs="{
'invisible': ['|', '&', ('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement')), ('is_ag_constitution', '!=', True), ('cooperative_form_id', '=', %(cgscop_partner.form_noncooperative)d)],
- 'required': ['|', ('project_status', 'in', ('4_adhesion', '5_cg', '6_suivi')), ('is_ag_constitution', '=', True), ('is_cooperative', '=', True), ('cooperative_form_id', '!=', %(cgscop_partner.form_noncooperative)d)],
- 'readonly': [('id','!=',False), ('project_status', '=', '6_suivi'), ('is_administrative', '!=', True)]}"
+ 'required': [('project_status', 'in', ('4_suivi')), ('is_ag_constitution', '=', True), ('is_cooperative', '=', True), ('cooperative_form_id', '!=', %(cgscop_partner.form_noncooperative)d)],
+ 'readonly': [('id','!=',False), ('project_status', '=', '4_suivi'), ('is_administrative', '!=', True)]}"
/>
<field
name="registration_date"
@@ -1042,11 +1049,11 @@
/>
<field
name="social_object"
- attrs="{'required': [('is_cooperative', '=', True), ('project_status','in',('2_pre-diagnostic', '3_accompagnement','4_adhesion', '5_cg', '6_suivi'))]}"
+ attrs="{'required': [('is_cooperative', '=', True), ('project_status','in',('2_pre-diagnostic', '3_accompagnement', '4_suivi'))]}"
/>
<field
name="naf_id"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
options="{'no_open': True, 'no_create': True}"
/>
<field
@@ -1069,7 +1076,7 @@
<field
name="siret"
class="oe_edit_only"
- attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
+ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '4_suivi')], 'required':[('write_date', '=', False), ('project_status', '=', '4_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
/>
</div>
<label
@@ -1096,19 +1103,19 @@
/>
<field
name="capital"
- attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))],}"
+ attrs="{'required':[('project_status','in',('4_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))],}"
widget="monetary"
/>
<field
name="first_closeout"
attrs="{
- 'required':[('is_cooperative', '!=', False), ('project_status', 'in', ('4_adhesion', '5_cg', '6_suivi')), ('cooperative_form_id', '!=', %(cgscop_partner.form_noncooperative)d)],
+ 'required':[('is_cooperative', '!=', False), ('project_status', '=', '4_suivi'), ('cooperative_form_id', '!=', %(cgscop_partner.form_noncooperative)d)],
'invisible': ['|', ('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement')), ('cooperative_form_id', '=', %(cgscop_partner.form_noncooperative)d)],
- 'readonly': [('id','!=',False), ('project_status', '=', '6_suivi'), ('is_administrative', '!=', True)]}"
+ 'readonly': [('id','!=',False), ('project_status', '=', '4_suivi'), ('is_administrative', '!=', True)]}"
/>
<field
name="closeout_month"
- attrs="{'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi'))], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
+ attrs="{'required':[('project_status','=','4_suivi')], 'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"
/>
<field
name="is_seed_scop"
@@ -1116,7 +1123,7 @@
/>
<field
name="seed_end"
- attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi')),('is_seed_scop', '=', True)]}"
+ attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','=','4_suivi'),('is_seed_scop', '=', True)]}"
/>
<field
name="is_incubated"
@@ -1129,11 +1136,11 @@
/>
<field
name="staff_last"
- attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"
+ attrs="{'invisible': [('project_status', 'not in', ('4_suivi'))]}"
/>
<field
name="staff_last_date"
- attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"
+ attrs="{'invisible': [('project_status', 'not in', ('4_suivi'))]}"
/>
</group>
</group>
@@ -1405,7 +1412,7 @@
<page
name='scop_revision'
string="Révisions"
- attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '4_suivi')]}"
>
<group col="3">
<group string="Contrat de révision">
@@ -1474,7 +1481,7 @@
<page
name="scop_periods"
string="Historique"
- attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '4_suivi')]}"
>
<field
name="scop_period_ids"
@@ -1517,7 +1524,7 @@
<page
name='scop_membership'
string="Périodes d'adhésion"
- attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '4_suivi')]}"
>
<field
name="membership_period_ids"
@@ -1543,7 +1550,7 @@
<page
name='scop_staff'
string="Effectifs"
- attrs="{'invisible': ['|','&', ('is_cooperative', '=', True), ('project_status', '!=', '6_suivi'),'&',('is_cooperative', '=', False),('organization_subtype_id','!=', %(cgscop_partner.riga_11528)d)]}"
+ attrs="{'invisible': ['|','&', ('is_cooperative', '=', True), ('project_status', '!=', '4_suivi'),'&',('is_cooperative', '=', False),('organization_subtype_id','!=', %(cgscop_partner.riga_11528)d)]}"
>
<field
name="staff_ids"
@@ -1594,7 +1601,7 @@
<page
name='scop_rse'
string="Actions RSE"
- attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '4_suivi')]}"
>
<field name="action_rse_ids" widget="one2many">
<tree string="Actions RSE" editable="top">
@@ -1610,7 +1617,7 @@
<page
name='scop_xnet'
string="Extranet"
- attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '4_suivi')]}"
>
<group string="Annuaire">
<field name="secteur_id" />
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index 15e38145b16de4edc04a44a0236f30d508a82797..e735a2ea5315e518513271b7c51c52e517b89d6c 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -292,6 +292,33 @@
</field>
</record>
+ <!-- KANBAN -->
+ <record id="view_partner_adhesion_kanban" model="ir.ui.view">
+ <field name="name">adhesion.kanban</field>
+ <field name="model">res.partner</field>
+ <field name="mode">primary</field>
+ <field name="inherit_id" ref="base.res_partner_kanban_view" />
+ <field name="arch" type="xml">
+ <xpath expr="//kanban" position="attributes">
+ <attribute name="default_group_by">membership_status</attribute>
+ <attribute name="archivable">0</attribute>
+ <attribute name="group_create">0</attribute>
+ <attribute name="group_edit">0</attribute>
+ <attribute name="group_delete">0</attribute>
+ <attribute name="quick_create">0</attribute>
+ <attribute name="block_drag_drop_kanban">1</attribute>
+ <attribute name="records_draggable">0</attribute>
+ </xpath>
+ <xpath expr="//kanban/field[@name='type']" position="after">
+ <field name="activity_state" />
+ <progressbar
+ field="activity_state"
+ colors='{"planned": "success", "today": "warning", "overdue": "danger"}'
+ />
+ </xpath>
+ </field>
+ </record>
+
<!-- Action serveur pour rediriger le menu item vers du code python -->
<record model="ir.actions.server" id="scop_cooperative_act_server">
<field name="name">CG Scop - Filtre coop par défaut</field>
@@ -301,12 +328,12 @@
<field name="code">action = model.show_coop()</field>
</record>
- <record model="ir.actions.server" id="scop_prospect_act_server">
- <field name="name">CG Scop - Filtre prospects par défaut</field>
+ <record model="ir.actions.server" id="scop_creation_project_act_server">
+ <field name="name">CG Scop - Filtre projets de création par défaut</field>
<field name="model_id" ref="cgscop_partner.model_res_partner" />
<field name="type">ir.actions.server</field>
<field name="state">code</field>
- <field name="code">action = model.show_prospect()</field>
+ <field name="code">action = model.show_creation_project()</field>
</record>
<record model="ir.actions.server" id="scop_organisme_act_server">
@@ -317,6 +344,14 @@
<field name="code">action = model.show_organisme()</field>
</record>
+ <record model="ir.actions.server" id="scop_adhesion_act_server">
+ <field name="name">CG Scop - Filtre processus d'adhésion par défaut</field>
+ <field name="model_id" ref="cgscop_partner.model_res_partner" />
+ <field name="type">ir.actions.server</field>
+ <field name="state">code</field>
+ <field name="code">action = model.show_processus_adhesion()</field>
+ </record>
+
<menuitem
id="menu_organismes"
name="Coopératives"
@@ -324,10 +359,10 @@
sequence="10"
/>
<menuitem
- id="menu_action_prospect"
- action="scop_prospect_act_server"
+ id="menu_action_creation_project"
+ action="scop_creation_project_act_server"
parent="menu_organismes"
- name="Projets"
+ name="Projets de création"
sequence="10"
/>
<menuitem
@@ -344,6 +379,13 @@
name="Toutes les coopératives et projets"
sequence="30"
/>
+ <menuitem
+ id="menu_action_adhesion"
+ action="scop_adhesion_act_server"
+ parent="menu_organismes"
+ name="Processus d'adhésion"
+ sequence="30"
+ />
</data>
</odoo>
diff --git a/wizard/scop_deces_wizard.py b/wizard/scop_deces_wizard.py
index e6919c9a899d79cd8adceafb10f56d85f4eca339..d047691b3ffad7a411c778265497b5738225d035 100644
--- a/wizard/scop_deces_wizard.py
+++ b/wizard/scop_deces_wizard.py
@@ -71,6 +71,7 @@ class ScopDecesWizard(models.TransientModel):
{
"dissolution_date": period.end,
"dissolution_reason_id": period.dissolution_reason_id.id,
+ "project_status": "6_decede",
}
)
diff --git a/wizard/scop_membership_out_wizard.py b/wizard/scop_membership_out_wizard.py
index 41e774fe9919cffe297a37e475b6de5fc6bfe393..1077c361ff8752d09114a579bba3458d54b4e959 100644
--- a/wizard/scop_membership_out_wizard.py
+++ b/wizard/scop_membership_out_wizard.py
@@ -60,6 +60,7 @@ class ScopMembershipOutWizard(models.TransientModel):
period.end_reason_id.id,
period.note,
)
+ self.partner_id.write({"membership_status": "out"})
return
# ............................................................
diff --git a/wizard/scop_status_wizard.py b/wizard/scop_status_wizard.py
index e2029dc984164d1efc34c501f602d9133a402c73..57a82e4200708204ecbc0e68dfd7559e8c1cd407 100644
--- a/wizard/scop_status_wizard.py
+++ b/wizard/scop_status_wizard.py
@@ -7,10 +7,8 @@ PROJECT_STATUS = [
("1_information", "Phase d'information"),
("2_pre-diagnostic", "Phase de pré-diagnostic"),
("3_accompagnement", "Phase d'accompagnement projet"),
- ("4_adhesion", "Phase d'adhésion"),
- ("5_cg", "Soumis CGScop"),
- ("6_suivi", "Phase de suivi"),
- ("7_abandonne", "Projet abandonné"),
+ ("4_suivi", "Phase de suivi"),
+ ("5_abandonne", "Projet abandonné"),
]