diff --git a/models/scop_instance.py b/models/scop_instance.py
index 04c65dbf2b5372b03207c7828bd1d18b94317161..9e7cbed24139ee304a02bad84c0b416cd90d6bb7 100644
--- a/models/scop_instance.py
+++ b/models/scop_instance.py
@@ -150,10 +150,10 @@ class ScopInstance(models.Model):
:return:
"""
partners = self._get_partners().filtered(
- lambda p: p.project_status == "6_suivi"
+ lambda p: p.membership_status == "member"
)
if len(partners) < 1:
- raise UserError(_('Aucune coopérative n\'est en statut "suivi"'))
+ raise UserError(_('Aucune coopérative n\'est en statut "membre"'))
return self.create_report_adhesion(partners)
def create_report_adhesion_per_ur(self):
@@ -162,10 +162,10 @@ class ScopInstance(models.Model):
:return:
"""
partners = self._get_partners().filtered(
- lambda i: i.project_status == "6_suivi"
+ lambda i: i.membership_status == "member"
)
if len(partners) < 1:
- raise UserError(_('Aucune coopérative n\'est en statut "suivi"'))
+ raise UserError(_('Aucune coopérative n\'est en statut "membre"'))
urs = partners.mapped("ur_id")
wizard = self.env["scop.instance.report.wizard"].create(
{
@@ -189,10 +189,10 @@ class ScopInstance(models.Model):
Open wizard to send mail adhésions
"""
partners = self._get_partners().filtered(
- lambda i: i.project_status == "6_suivi"
+ lambda i: i.membership_status == "member"
)
if len(partners) < 1:
- raise UserError(_('Aucune coopérative n\'est en statut "suivi"'))
+ raise UserError(_('Aucune coopérative n\'est en statut "membre"'))
wizard = self.env["scop.instance.mail.wizard"].create({})
return {
@@ -262,7 +262,7 @@ class ScopInstance(models.Model):
partners_to_validate = self.env.context.get(
"partners_to_validate",
self.instance_partner_ids.filtered(
- lambda p: p.state == "positive" and p.project_status == "5_cg"
+ lambda p: p.state == "positive" and p.membership_status == "soumis_cg"
),
)
validated_partners = list()
diff --git a/models/scop_instance_partner.py b/models/scop_instance_partner.py
index 3305fde66432dd85b9f7327973570c74187e666e..24530c1e64bb0422745fba37f3d47d945e1aab8e 100644
--- a/models/scop_instance_partner.py
+++ b/models/scop_instance_partner.py
@@ -40,6 +40,9 @@ class ScopInstancePartner(models.Model):
project_status = fields.Selection(
string="Statut projet", related="partner_id.project_status"
)
+ membership_status = fields.Selection(
+ string="Statut d'adhésion", related="partner_id.membership_status"
+ )
state = fields.Selection(
string="Avis",
diff --git a/models/union_regionale.py b/models/union_regionale.py
index 02c88463c678e7e21ab0b4d5367da3e14db57ef6..56c149abc9a64c8600c793111887a6956bef3759 100644
--- a/models/union_regionale.py
+++ b/models/union_regionale.py
@@ -19,7 +19,7 @@ class UnionRegionale(models.Model):
self.env["scop.instance"]
.browse(self.env.context.get("active_id"))
.mapped("instance_partner_ids")
- .filtered(lambda i: i.project_status == "6_suivi")
+ .filtered(lambda i: i.membership_status == "member")
.mapped("partner_id")
)
partners_ur = partners.filtered(lambda p: p.ur_id == self)
diff --git a/report/report_scop_instance_adhesion.xml b/report/report_scop_instance_adhesion.xml
index 7b8067ba6da6fd1affc1e5008a963aee63579501..be8aca20509107da65cda482702d016cdcdd8732 100644
--- a/report/report_scop_instance_adhesion.xml
+++ b/report/report_scop_instance_adhesion.xml
@@ -205,7 +205,7 @@
t-esc="partner.project_federation.name"
/></td>
<td><t
- t-esc="partner.partner_company_type_id"
+ t-esc="partner.partner_company_type_id.name"
/></td>
</tr>
</t>
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 9d7b22fe9f4adbc8324ab0f35f84a8a67b85e86b..a08b443c3cbc170bbc3df99d8abdf3b7c3df90e9 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -17,6 +17,7 @@
<field name="phone" />
<field name="email" />
<field name="project_status" />
+ <field name="membership_status" />
</tree>
</field>
</record>
diff --git a/views/scop_instance.xml b/views/scop_instance.xml
index ddf9e876ada6bd953fb7fc1a8761e25ef246fbde..8329d703d8dec6242148d07666c40bc9bc265a17 100644
--- a/views/scop_instance.xml
+++ b/views/scop_instance.xml
@@ -114,7 +114,8 @@
/>
<field name="phone" readonly="True" />
<field name="email" readonly="True" />
- <field name="project_status" readonly="True" />
+ <field name="project_status" readonly="True" invisible="1"/>
+ <field name="membership_status" readonly="True" />
<field name="state" readonly="True" />
<field name="comments" readonly="False" />
<field name="amount_adhesion" readonly="False" />
@@ -128,7 +129,7 @@
type="object"
string="Changer avis"
icon="fa-retweet"
- attrs="{'invisible':[('project_status','=','6_suivi')]}"
+ attrs="{'invisible':[('project_status','=','4_suivi')]}"
/>
<field name="is_success" invisible="True" />
<button
diff --git a/wizard/scop_instance_mail_membership_wizard.py b/wizard/scop_instance_mail_membership_wizard.py
index c2d9af207dfefb6fe4da2859b2726673b0c24eea..9d5b27fe64e6daad7bae7385197f8d3c299f0b03 100644
--- a/wizard/scop_instance_mail_membership_wizard.py
+++ b/wizard/scop_instance_mail_membership_wizard.py
@@ -20,7 +20,7 @@ class ScopInstanceMailWizard(models.TransientModel):
self.env.context.get("active_id")
)
partner_ids = instance_id._get_partners().filtered(
- lambda i: i.project_status == "6_suivi"
+ lambda i: i.membership_status == "member"
)
if partner_ids:
res = [("id", "in", partner_ids.ids)]
diff --git a/wizard/scop_instance_wizard.py b/wizard/scop_instance_wizard.py
index 3988713ffc5b2651f60bebcac452d966af77f5d9..ec65e06c66d5dffc14e40a4031efb7300ade5c1c 100644
--- a/wizard/scop_instance_wizard.py
+++ b/wizard/scop_instance_wizard.py
@@ -42,7 +42,7 @@ class ScopInstanceWizard(models.TransientModel):
[
("is_cooperative", "=", True),
("id", "not in", already_linked_ids),
- ("project_status", "=", "5_cg"),
+ ("membership_status", "=", "soumis_cg"),
]
)
return {
@@ -77,7 +77,7 @@ class ScopInstanceWizard(models.TransientModel):
[
("is_cooperative", "=", True),
("id", "not in", already_linked_ids),
- ("project_status", "=", "5_cg"),
+ ("membership_status", "=", "soumis_cg"),
]
)
# Write instance in partner