Skip to content
Extraits de code Groupes Projets
Valider 1295e284 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

sync branch with master

parents eb54c74b cb462602
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!1[add] merge 14.0 new process adh
...@@ -6,7 +6,6 @@ from odoo import _, api, fields, models ...@@ -6,7 +6,6 @@ from odoo import _, api, fields, models
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import UserError, ValidationError
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
# HELP : https://chemistry.apache.org/python/docs/examples.html
class ScopInstance(models.Model): class ScopInstance(models.Model):
...@@ -17,7 +16,7 @@ class ScopInstance(models.Model): ...@@ -17,7 +16,7 @@ class ScopInstance(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
is_type_membership = fields.Boolean("Adhésions") is_type_membership = fields.Boolean("Adhésions")
date_membership = fields.Date( date_membership = fields.Date(
string="Date d'adhésion statistique", string="Date d'adhésion",
) )
instance_partner_ids = fields.One2many( instance_partner_ids = fields.One2many(
comodel_name="scop.instance.partner", comodel_name="scop.instance.partner",
...@@ -254,7 +253,6 @@ class ScopInstance(models.Model): ...@@ -254,7 +253,6 @@ class ScopInstance(models.Model):
Select all coop in state positive & status "soumis cg" to be validated Select all coop in state positive & status "soumis cg" to be validated
- use scop_valid_cg - use scop_valid_cg
- set lf_adhesion qualified - set lf_adhesion qualified
- affect new start_stat if needed
- log success or error - log success or error
- open wizard to send mail to all validated coops - open wizard to send mail to all validated coops
""" """
...@@ -276,14 +274,12 @@ class ScopInstance(models.Model): ...@@ -276,14 +274,12 @@ class ScopInstance(models.Model):
membership_period = self.env["scop.membership.period"].search( membership_period = self.env["scop.membership.period"].search(
[ [
("partner_id", "=", partner.id), ("partner_id", "=", partner.id),
("start", "=", self.date),
("end", "=", False), ("end", "=", False),
], ],
limit=1,
) )
if membership_period.start_stat != r.statistic_membership_date: if membership_period:
membership_period.update( membership_period.update(
{"start_stat": r.statistic_membership_date} {"start": r.statistic_membership_date}
) )
# log success # log success
validated_partners.append(partner.id) validated_partners.append(partner.id)
...@@ -351,4 +347,6 @@ class ScopInstance(models.Model): ...@@ -351,4 +347,6 @@ class ScopInstance(models.Model):
membership_period_ids = partner.partner_id.membership_period_ids.filtered( membership_period_ids = partner.partner_id.membership_period_ids.filtered(
lambda p: p.start == self.date.date() and not p.end lambda p: p.start == self.date.date() and not p.end
) )
membership_period_ids.update({"start_stat": self.date_membership}) membership_period_ids.update(
{"start": self.date_membership}
)
...@@ -57,7 +57,7 @@ class ScopInstancePartner(models.Model): ...@@ -57,7 +57,7 @@ class ScopInstancePartner(models.Model):
) )
comments = fields.Text("Commentaires") comments = fields.Text("Commentaires")
statistic_membership_date = fields.Date( statistic_membership_date = fields.Date(
string="Date d'adhésion statistique", string="Date d'adhésion",
default=lambda self: self._get_default_date_stat(), default=lambda self: self._get_default_date_stat(),
) )
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<button <button
name="update_membership_date" name="update_membership_date"
type="object" type="object"
string="Mettre à jour la date d'adhésion statistique" string="Mettre à jour la date d'adhésion"
class="btn-outline-dark btn-sm" class="btn-outline-dark btn-sm"
/> />
</group> </group>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<field <field
name="statistic_membership_date" name="statistic_membership_date"
readonly="False" readonly="False"
string="Date adhésion stat." string="Date adhésion"
/> />
<button <button
name="switch_state" name="switch_state"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter