diff --git a/models/scop_instance.py b/models/scop_instance.py index 32c890f1952ee1e2d24ee66b856dcf94224599cd..5340e06cd67f53aef83d471847f3d6b06859991a 100644 --- a/models/scop_instance.py +++ b/models/scop_instance.py @@ -6,7 +6,6 @@ from odoo import _, api, fields, models from odoo.exceptions import UserError, ValidationError _logger = logging.getLogger(__name__) -# HELP : https://chemistry.apache.org/python/docs/examples.html class ScopInstance(models.Model): @@ -17,7 +16,7 @@ class ScopInstance(models.Model): # ------------------------------------------------------ is_type_membership = fields.Boolean("Adhésions") date_membership = fields.Date( - string="Date d'adhésion statistique", + string="Date d'adhésion", ) instance_partner_ids = fields.One2many( comodel_name="scop.instance.partner", @@ -254,7 +253,6 @@ class ScopInstance(models.Model): Select all coop in state positive & status "soumis cg" to be validated - use scop_valid_cg - set lf_adhesion qualified - - affect new start_stat if needed - log success or error - open wizard to send mail to all validated coops """ @@ -276,14 +274,12 @@ class ScopInstance(models.Model): membership_period = self.env["scop.membership.period"].search( [ ("partner_id", "=", partner.id), - ("start", "=", self.date), ("end", "=", False), ], - limit=1, ) - if membership_period.start_stat != r.statistic_membership_date: + if membership_period: membership_period.update( - {"start_stat": r.statistic_membership_date} + {"start": r.statistic_membership_date} ) # log success validated_partners.append(partner.id) @@ -351,4 +347,6 @@ 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_stat": self.date_membership}) + membership_period_ids.update( + {"start": self.date_membership} + ) diff --git a/models/scop_instance_partner.py b/models/scop_instance_partner.py index 24530c1e64bb0422745fba37f3d47d945e1aab8e..c78715f3f5e43071997390ecca2a1a912e2b3b4c 100644 --- a/models/scop_instance_partner.py +++ b/models/scop_instance_partner.py @@ -57,7 +57,7 @@ class ScopInstancePartner(models.Model): ) comments = fields.Text("Commentaires") statistic_membership_date = fields.Date( - string="Date d'adhésion statistique", + string="Date d'adhésion", default=lambda self: self._get_default_date_stat(), ) diff --git a/views/scop_instance.xml b/views/scop_instance.xml index 643f31d731b868135c2da9c5619f7e0a4adaf24e..74bb36da254d1f981d92f8712d01f1082977f852 100644 --- a/views/scop_instance.xml +++ b/views/scop_instance.xml @@ -89,7 +89,7 @@ <button name="update_membership_date" 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" /> </group> @@ -126,7 +126,7 @@ <field name="statistic_membership_date" readonly="False" - string="Date adhésion stat." + string="Date adhésion" /> <button name="switch_state"