sync with master

models/res_partner.py

@@ -10,6 +10,5 @@ class ResPartner(models.Model):
     exo_ids = fields.One2many(
         comodel_name="scop.cotisation.cg.exo",
         inverse_name="partner_id",
-        domain=[("state", "=", "done")],
         string="Exonérations",
     )

models/scop_cotisation_cg_exo.py

@@ -109,7 +109,7 @@ class ScopCotisationExo(models.Model):
     amount_quarter = fields.Float("Montant souhaité pour les échéances")
     percent_quarter = fields.Integer("Réduction appliquée aux échéances")
     date_exo_ok = fields.Date("Date Acceptation Exo")
-    head_office_comment = fields.Text("Commentaire du bureau")
+    head_office_comment = fields.Text("Commentaire")
     note = fields.Text("Notes internes")
     instance_id = fields.Many2one(comodel_name="scop.instance", string="Instance")
     bordereau_ids = fields.Many2many(
@@ -265,6 +265,18 @@ class ScopCotisationExo(models.Model):
 
     def create_lines(self):
         self.exo_line_ids.unlink()
+        # Get last bdx for prorate calculation
+        last_bdx = self.env["scop.bordereau"].search(
+            [
+                ("state", "in", ["validated", "paid"]),
+                ("partner_id", "=", self.partner_id.id),
+            ],
+            order="date_cotisation desc",
+            limit=1,
+        )
+        if last_bdx:
+            contrib_type = last_bdx.mapped("invoice_ids.type_contribution_id")
+        else:
             contrib_type = self.partner_id.get_partner_contribution_type()
 
         # if exo is percent => affects percent to each line
@@ -282,15 +294,6 @@ class ScopCotisationExo(models.Model):
         if self.type_exo == "amount":
             # if various contribution type => affects prorate amount to each line
             if len(contrib_type) > 1:
-                # Get last bdx for prorate calculation
-                last_bdx = self.env["scop.bordereau"].search(
-                    [
-                        ("state", "in", ["validated", "paid"]),
-                        ("partner_id", "=", self.partner_id.id),
-                    ],
-                    order="date_cotisation desc",
-                    limit=1,
-                )
                 if last_bdx:
                     last_amount = last_bdx.amount_total_cotiz
                     amount_by_type = last_bdx.get_contribution_type()
@@ -489,17 +492,21 @@ class ScopCotisationExo(models.Model):
                     )
 
                 if exo_amount != 0:
-                    date_refund = (
-                        bordereau_id.date_cotisation
-                        if bordereau_id.state == "draft"
-                        else self.date_exo_ok
-                    )
-                    date_due = bordereau_id.invoice_ids.filtered(
+                    if self.date_exo_ok > bordereau_id.date_cotisation:
+                        date_refund = self.date_exo_ok
+                    else:
+                        date_refund = bordereau_id.date_cotisation
+
+                    quarter_date_due = bordereau_id.invoice_ids.filtered(
                         lambda i: i.cotiz_quarter == str(quarter)
                         and i.move_type == "out_invoice"
                     )[0].invoice_date_due
+                    if quarter_date_due < self.date_exo_ok:
+                        date_due = self.date_exo_ok
+                    else:
+                        date_due = quarter_date_due
                     # Create refund
-                    refund = bordereau_id.invoice_ids.create(
+                    bordereau_id.invoice_ids.create(
                         {
                             "partner_id": bordereau_id.partner_id.id,
                             "liasse_fiscale_id": bordereau_id.liasse_fiscale_id.id,

views/res_partner.xml

@@ -18,17 +18,20 @@
                             <field name="exo_ids" mode="tree,form" readonly="1">
                                 <tree create="false" edit="false" delete="false">
                                     <field name="date_request" />
+                                    <field name="number" />
                                     <field name="source" />
                                     <field name="date_exo_start" />
                                     <field name="date_exo_end" />
                                     <field name="ur_notice" />
                                     <field name="final_notice" />
                                     <field name="date_exo_ok" />
+                                    <field name="head_office_comment" optional="show" />
                                 </tree>
                                 <form>
                                     <group string="Demande initiale">
                                         <group name="request">
                                             <field name="date_request" />
+                                            <field name="number" />
                                             <field name="source" />
                                             <field
                                             name="ur_notice"
@@ -53,7 +56,7 @@
                                     <strong><label for="head_office_comment" /></strong>
                                     <field
                                     name="head_office_comment"
-                                    placeholder="Commentaire du bureau"
+                                    placeholder="Commentaire"
                                 />
                                 </form>
                             </field>

views/scop_cotisation_cg_exo.xml

@@ -12,6 +12,7 @@
                 <search string="Exonerations">
                     <field name="partner_id" options="{'no_create': 1}" />
                     <field name="name" />
+                    <field name="number" />
                     <field name="date_request" />
                     <separator />
                     <filter
@@ -64,6 +65,7 @@
                 <tree string="Exonerations">
                     <field name="date_request" />
                     <field name="partner_id" />
+                    <field name="number" optional="show" />
                     <field name="state" />
                     <field name="date_exo_start" />
                     <field name="date_exo_end" />