[FIX] account_payment_pro_receiptbook, account_payment_pro, l10n_ar_payment_bundle: apply upstream fixes from PRs ingadhoc#1055, ingadhoc#1054, ingadhoc#1051, ingadhoc#1049

- account_payment_pro_receiptbook: enforce receiptbook prefix in _get_next_sequence_format
  (PR ingadhoc#1055): replaces previous _get_last_sequence_domain approach; now detects prefix
  mismatch after _get_last_sequence() and falls back to direct SQL filtered by correct
  sequence_prefix, preventing PAY-prefixed orphan sequences from propagating.

- account_payment_pro: sync amount when all to_pay lines removed (PR ingadhoc#1054); add
  _onchange_amount to keep amount in sync with to_pay_amount on line changes (PR ingadhoc#1049).

- l10n_ar_payment_bundle: wrap action_post unlink/validation in for-rec loop and filter
  draft_linked by parent non-draft state to fix batch posting (PR ingadhoc#1051).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 2 people

account_payment_pro/models/account_payment.py

@@ -984,6 +984,12 @@ def _compute_to_pay_amount(self):
         for rec in self:
             rec.to_pay_amount = rec.selected_debt + rec.unreconciled_amount
 
+    @api.onchange("to_pay_move_line_ids")
+    def _onchange_amount(self):
+        for rec in self.filtered(lambda r: r.company_id.use_payment_pro):
+            if rec.amount != abs(rec.to_pay_amount):
+                rec.amount = abs(rec.to_pay_amount)
+
     @api.onchange("to_pay_amount")
     def _inverse_to_pay_amount(self):
         for rec in self:
@@ -1004,11 +1010,13 @@ def _onchange_to_pay_lines_adjust_amount(self):
         Aplica a todos los tipos de pago (clientes y proveedores).
         """
         for rec in self:
-            if not rec.use_payment_pro or rec.state != "draft":
+            if not rec.use_payment_pro or rec.state != "draft" or not rec.currency_id:
                 continue
             if not rec.to_pay_move_line_ids:
+                if not rec.currency_id.is_zero(rec.amount - abs(rec.to_pay_amount)):
+                    rec.amount = abs(rec.to_pay_amount)
                 continue
-            if not rec.payment_difference or not rec.currency_id:
+            if not rec.payment_difference:
                 continue
             diff_in_a = rec._get_payment_difference_in_currency_a()
             amount = rec.amount + diff_in_a

account_payment_pro_receiptbook/models/account_move.py

@@ -9,32 +9,13 @@ class AccountMove(models.Model):
         store=True,
     )
 
-    def _get_receiptbook_expected_prefix(self):
-        # Derive the expected sequence_prefix from the receiptbook so we can
-        # constrain _get_last_sequence_domain to only RE-X (or whatever the
-        # talonario prefix is) and avoid PAY-prefixed orphan sequences from
-        # poisoning the prefix subquery that Odoo base adds on top of our WHERE.
-        self.ensure_one()
-        if not self.receiptbook_id:
-            return None
-        if self.receiptbook_id.document_type_id:
-            return "%s %s" % (
-                self.receiptbook_id.document_type_id.doc_code_prefix,
-                self.receiptbook_id.prefix or "",
-            )
-        return self.receiptbook_id.prefix or None
-
     def _get_last_sequence_domain(self, relaxed=False):
         self.ensure_one()
         is_payment = self.origin_payment_id or self.env.context.get("is_payment")
 
         if self.receiptbook_id and is_payment:
             where_string = "WHERE receiptbook_id = %(receiptbook_id)s AND name != '/'"
             param = {"receiptbook_id": self.receiptbook_id.id}
-            expected_prefix = self._get_receiptbook_expected_prefix()
-            if expected_prefix:
-                where_string += " AND sequence_prefix = %(sequence_prefix)s"
-                param["sequence_prefix"] = expected_prefix
             return where_string, param
         else:
             where_string, param = super()._get_last_sequence_domain(relaxed)
@@ -55,10 +36,36 @@ def _get_starting_sequence(self):
 
     def _get_next_sequence_format(self):
         if self.receiptbook_id:
+            starting_sequence = self._get_starting_sequence()
+            format_string, starting_values = self._get_sequence_format_param(starting_sequence)
+            expected_prefix = starting_values.get("prefix1", "")
+
             last_sequence = self._get_last_sequence()
-            new = not last_sequence
-            if new:
-                last_sequence = self._get_last_sequence(relaxed=True) or self._get_starting_sequence()
+
+            if last_sequence:
+                _, last_values = self._get_sequence_format_param(last_sequence)
+                if last_values.get("prefix1") != expected_prefix:
+                    # La última secuencia tiene un formato incorrecto (por error previo).
+                    # Buscamos en la BD la última secuencia válida para este receiptbook
+                    # filtrando directamente por el sequence_prefix correcto.
+                    self.flush_model(["name", "sequence_number", "sequence_prefix"])
+                    self.env.cr.execute(
+                        """
+                        SELECT name FROM account_move
+                        WHERE receiptbook_id = %s
+                          AND name != '/'
+                          AND sequence_prefix = %s
+                        ORDER BY sequence_number DESC
+                        LIMIT 1
+                        """,
+                        [self.receiptbook_id.id, expected_prefix],
+                    )
+                    row = self.env.cr.fetchone()
+                    last_sequence = row[0] if row else None
+
+            if not last_sequence:
+                starting_values["seq"] = 0
+                return format_string, starting_values
 
             format_string, format_values = self._get_sequence_format_param(last_sequence)
             return format_string, format_values

l10n_ar_payment_bundle/models/account_payment.py

@@ -227,11 +227,12 @@ def _select_bundle(self, bundles):
         return super()._select_bundle(bundles)
 
     def action_post(self):
-        if self.link_payment_ids and self.payment_method_code != "payment_bundle":
-            self.link_payment_ids.unlink()
+        for rec in self:
+            if rec.link_payment_ids and rec.payment_method_code != "payment_bundle":
+                rec.link_payment_ids.unlink()
 
-        if self.main_payment_id and not self.main_payment_id.name:
-            raise ValidationError(_("The main payment must have a name before a linked payment can be posted."))
+            if rec.main_payment_id and not rec.main_payment_id.name:
+                raise ValidationError(_("The main payment must have a name before a linked payment can be posted."))
 
         self._check_bundle_currency_consistency()
 
@@ -254,7 +255,9 @@ def action_post(self):
             payment.name = f"{self.name} ({next_num})"
             next_num += 1
 
-        draft_linked = self.link_payment_ids.filtered(lambda x: x.state == "draft")
+        draft_linked = self.filtered(lambda x: x.state != "draft").link_payment_ids.filtered(
+            lambda x: x.state == "draft"
+        )
         if draft_linked:
             draft_linked.action_post()