Skip to content
Extraits de code Groupes Projets

[add] merge 14.0 new process adh

9 files
+ 123
87
Comparer les modifications
  • Côte à côte
  • En ligne

Fichiers

+ 13
34
@@ -76,29 +76,12 @@ class ScopInstance(models.Model):
- datas_stats_ur : list of dict per ur
- datas_stats_global : dict of stats
"""
partners = self._get_partners()
# We use LM instead of res_partner to get more info ...
# ... fields of res_partner are on LM (delegate = true)
lm_ids = list()
for partner in partners:
lm_partner = partner.get_lm_adhesion()
lm_ids.append(lm_partner.id)
partners_lm = self.env["scop.liste.ministere"].browse(lm_ids)
partner_ids = self._get_partners()
ur_global = partners_lm.read_group(
domain=[("id", "in", partners_lm.ids)],
fields=["ur_id"],
groupby=["ur_id", "eff_tt", "eff_sal_assoc"],
orderby="ur_id",
lazy=True,
)
datas_stats_global = {
"ur_global": ur_global,
"partners": partners_lm,
return {
"ur_ids": partner_ids.mapped("ur_id").sorted("id"),
"partner_ids": partner_ids,
}
return datas_stats_global
def _get_partners(self):
"""
@@ -149,10 +132,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):
@@ -161,10 +144,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(
{
@@ -188,10 +171,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 {
@@ -260,7 +243,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()
@@ -278,9 +261,7 @@ class ScopInstance(models.Model):
],
)
if membership_period:
membership_period.update(
{"start": r.statistic_membership_date}
)
membership_period.update({"start": r.statistic_membership_date})
# log success
validated_partners.append(partner.id)
r.is_success = True
@@ -347,6 +328,4 @@ class ScopInstance(models.Model):
membership_period_ids = partner.partner_id.membership_period_ids.filtered(
lambda p: p.start == self.date.date() and not p.end
)
membership_period_ids.update(
{"start": self.date_membership}
)
membership_period_ids.update({"start": self.date_membership})
Chargement en cours