diff --git a/models/scop_instance.py b/models/scop_instance.py index 04c65dbf2b5372b03207c7828bd1d18b94317161..bd3314781f686cfcddb2d77a9ac59a0c8e86ed19 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 """ @@ -281,9 +279,9 @@ class ScopInstance(models.Model): ], limit=1, ) - if membership_period.start_stat != r.statistic_membership_date: + if membership_period.start != r.statistic_membership_date: membership_period.update( - {"start_stat": r.statistic_membership_date} + {"start": r.statistic_membership_date} ) # log success validated_partners.append(partner.id) @@ -352,5 +350,5 @@ class ScopInstance(models.Model): lambda p: p.start == self.date.date() and not p.end ) membership_period_ids.update( - {"start_stat": self.date_membership} + {"start": self.date_membership} ) diff --git a/models/scop_instance_partner.py b/models/scop_instance_partner.py index 3305fde66432dd85b9f7327973570c74187e666e..ec4c73002e79575637518732375af73b66873df3 100644 --- a/models/scop_instance_partner.py +++ b/models/scop_instance_partner.py @@ -54,7 +54,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 ddf9e876ada6bd953fb7fc1a8761e25ef246fbde..13ed5ce23151ca8771e4445c3a60ff5e4865ca1f 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> @@ -121,7 +121,7 @@ <field name="statistic_membership_date" readonly="False" - string="Date adhésion stat." + string="Date adhésion" /> <button name="switch_state"