CompassionCH · davidwul · Jul 30, 2025 · Nov 14, 2025 · Jan 12, 2026 · gemini-code-assist
diff --git a/account_ebics_payment_return/models/account_payment_return.py b/account_ebics_payment_return/models/account_payment_return.py
@@ -102,7 +102,7 @@ def _on_error_parse_xml_and_cancel(self, err_message):
             [("name", "=", po_name)]
         )
         _logger.info("PAIN002 payment_order: %s", payment_order)
-        if payment_order.state == "generated":
+        if payment_order.state  in ("generated","uploaded"):
-        if payment_order.state  in ("generated","uploaded"):
+        if payment_order.state in ("generated", "uploaded"):
-        if payment_order.state  in ("generated","uploaded"):
+        if payment_order.state in ("generated", "uploaded"):
             if po_state == "RJCT":
                 _logger.info(
                     "RJCT payment order %s with the folowing err: %s",
@@ -121,13 +121,11 @@ def _on_error_parse_xml_and_cancel(self, err_message):
                 for t in tx:
                     if t.find("./ns:TxSts", namespaces={"ns": ns}).text == "RJCT":
                         # search for payment line
-                        payment_line_ids = payment_order.bank_line_ids.filtered(
-                            lambda r, transaction=t: r.name
-                            == transaction.find(
-                                "./ns:OrgnlEndToEndId", namespaces={"ns": ns}
-                            ).text
-                        )[0].payment_line_ids
-                        _logger.info("PAIN002 payment_line_ids: %s", payment_line_ids)
+                        endtoend_id=t.find("./ns:OrgnlEndToEndId", namespaces={"ns": ns}).text
+                        payment_id = payment_order.payment_ids.filtered(
+                            lambda l: l.move_id.id == int(endtoend_id))
+                        payment_line_ids = payment_order.payment_line_ids.filtered(lambda l: l.payment_ids.id ==payment_id.id)
+                        _logger.info(f"PAIN002 payment_line_ids: {payment_id.name} with endtoend_id: {endtoend_id}", )
 
                         # free line with message
                         rsn = t.findall(
@@ -136,9 +134,18 @@ def _on_error_parse_xml_and_cancel(self, err_message):
                         rsn_text = []
                         for r in rsn:
                             rsn_text.append(r.text)
-                        payment_line_ids.free_line(" ".join(rsn_text))
+                        rsn_txt = " ".join(rsn_text)
+                        _logger.info(f"PAIN002 line free: {rsn_txt} for lines {payment_line_ids}", )
+                        for b in payment_line_ids:
+                            try:
+                                b.free_line(rsn_txt)
+                                _logger.info(f"PAIN002 line free: {rsn_txt}" ,)
+                            except Exception as e:
+                                _logger.info(f"error line free: {e}" ,)
 
-                payment_order.generated2uploaded()
+
+                if payment_order.state == "generated":
+                    payment_order.generated2uploaded()
                 self.write({"state": "done", "note_process": err_message})
 
     def _unlink_pain002(self):

diff --git a/recurring_contract/models/contract_group.py b/recurring_contract/models/contract_group.py
@@ -541,7 +541,7 @@ def build_inv_line_data(
         elif gift_wizard:
             product = gift_wizard.product_id
             qty = gift_wizard.quantity
-            contract = gift_wizard.contract_id
+            contract = gift_wizard.current_contract_id
             price = gift_wizard.amount
             line_name = gift_wizard.description or product.name
         else:

diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore
diff --git a/setup/README b/setup/README
diff --git a/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution b/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution
diff --git a/setup/account_analytic_attribution/setup.py b/setup/account_analytic_attribution/setup.py
diff --git a/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion b/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion
diff --git a/setup/account_analytic_compassion/setup.py b/setup/account_analytic_compassion/setup.py
diff --git a/setup/account_ebics_CH/odoo/addons/account_ebics_CH b/setup/account_ebics_CH/odoo/addons/account_ebics_CH
diff --git a/setup/account_ebics_CH/setup.py b/setup/account_ebics_CH/setup.py
diff --git a/setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return b/setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return
diff --git a/setup/account_ebics_payment_return/setup.py b/setup/account_ebics_payment_return/setup.py
diff --git a/setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped b/setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped
diff --git a/setup/account_invoice_export_grouped/setup.py b/setup/account_invoice_export_grouped/setup.py
diff --git a/setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice b/setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice
diff --git a/setup/account_invoice_split_invoice/setup.py b/setup/account_invoice_split_invoice/setup.py
diff --git a/...t_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer b/...t_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer
diff --git a/setup/account_move_periodic_accounting_transfer/setup.py b/setup/account_move_periodic_accounting_transfer/setup.py
diff --git a/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship b/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship
diff --git a/setup/account_offbalance_sponsorship/setup.py b/setup/account_offbalance_sponsorship/setup.py
diff --git a/setup/account_payment_line_free/odoo/addons/account_payment_line_free b/setup/account_payment_line_free/odoo/addons/account_payment_line_free
diff --git a/setup/account_payment_line_free/setup.py b/setup/account_payment_line_free/setup.py
diff --git a/setup/account_statement_completion/odoo/addons/account_statement_completion b/setup/account_statement_completion/odoo/addons/account_statement_completion
diff --git a/setup/account_statement_completion/setup.py b/setup/account_statement_completion/setup.py
diff --git a/setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account b/setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account
diff --git a/setup/compassion_sub_chart_account/setup.py b/setup/compassion_sub_chart_account/setup.py
diff --git a/setup/donation_report_compassion/odoo/addons/donation_report_compassion b/setup/donation_report_compassion/odoo/addons/donation_report_compassion
diff --git a/setup/donation_report_compassion/setup.py b/setup/donation_report_compassion/setup.py
diff --git a/setup/invoice_restrictions/odoo/addons/invoice_restrictions b/setup/invoice_restrictions/odoo/addons/invoice_restrictions
diff --git a/setup/invoice_restrictions/setup.py b/setup/invoice_restrictions/setup.py
diff --git a/setup/recurring_contract/odoo/addons/recurring_contract b/setup/recurring_contract/odoo/addons/recurring_contract
diff --git a/setup/recurring_contract/setup.py b/setup/recurring_contract/setup.py