diff --git a/account_ebics_payment_return/models/account_payment_return.py b/account_ebics_payment_return/models/account_payment_return.py index 392c9863..85ed84c8 100644 --- 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 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 index f563867a..88bac182 100644 --- 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 deleted file mode 100644 index 207e6153..00000000 --- a/setup/.setuptools-odoo-make-default-ignore +++ /dev/null @@ -1,2 +0,0 @@ -# addons listed in this file are ignored by -# setuptools-odoo-make-default (one addon per line) diff --git a/setup/README b/setup/README deleted file mode 100644 index a63d633e..00000000 --- a/setup/README +++ /dev/null @@ -1,2 +0,0 @@ -To learn more about this directory, please visit -https://pypi.python.org/pypi/setuptools-odoo diff --git a/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution b/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution deleted file mode 120000 index 310fa7f3..00000000 --- a/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution +++ /dev/null @@ -1 +0,0 @@ -../../../../account_analytic_attribution \ No newline at end of file diff --git a/setup/account_analytic_attribution/setup.py b/setup/account_analytic_attribution/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_analytic_attribution/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion b/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion deleted file mode 120000 index a1e994d2..00000000 --- a/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion +++ /dev/null @@ -1 +0,0 @@ -../../../../account_analytic_compassion \ No newline at end of file diff --git a/setup/account_analytic_compassion/setup.py b/setup/account_analytic_compassion/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_analytic_compassion/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/account_ebics_CH/odoo/addons/account_ebics_CH b/setup/account_ebics_CH/odoo/addons/account_ebics_CH deleted file mode 120000 index 9a509b77..00000000 --- a/setup/account_ebics_CH/odoo/addons/account_ebics_CH +++ /dev/null @@ -1 +0,0 @@ -../../../../account_ebics_CH \ No newline at end of file diff --git a/setup/account_ebics_CH/setup.py b/setup/account_ebics_CH/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_ebics_CH/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) 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 deleted file mode 120000 index 4c4612bc..00000000 --- a/setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return +++ /dev/null @@ -1 +0,0 @@ -../../../../account_ebics_payment_return \ No newline at end of file diff --git a/setup/account_ebics_payment_return/setup.py b/setup/account_ebics_payment_return/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_ebics_payment_return/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) 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 deleted file mode 120000 index c0c70343..00000000 --- a/setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped +++ /dev/null @@ -1 +0,0 @@ -../../../../account_invoice_export_grouped \ No newline at end of file diff --git a/setup/account_invoice_export_grouped/setup.py b/setup/account_invoice_export_grouped/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_invoice_export_grouped/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) 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 deleted file mode 120000 index 27049931..00000000 --- a/setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice +++ /dev/null @@ -1 +0,0 @@ -../../../../account_invoice_split_invoice \ No newline at end of file diff --git a/setup/account_invoice_split_invoice/setup.py b/setup/account_invoice_split_invoice/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_invoice_split_invoice/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer b/setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer deleted file mode 120000 index c1fd39ee..00000000 --- a/setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer +++ /dev/null @@ -1 +0,0 @@ -../../../../account_move_periodic_accounting_transfer \ No newline at end of file diff --git a/setup/account_move_periodic_accounting_transfer/setup.py b/setup/account_move_periodic_accounting_transfer/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_move_periodic_accounting_transfer/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship b/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship deleted file mode 120000 index 4e7f7029..00000000 --- a/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship +++ /dev/null @@ -1 +0,0 @@ -../../../../account_offbalance_sponsorship \ No newline at end of file diff --git a/setup/account_offbalance_sponsorship/setup.py b/setup/account_offbalance_sponsorship/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_offbalance_sponsorship/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) 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 deleted file mode 120000 index f33a125b..00000000 --- a/setup/account_payment_line_free/odoo/addons/account_payment_line_free +++ /dev/null @@ -1 +0,0 @@ -../../../../account_payment_line_free \ No newline at end of file diff --git a/setup/account_payment_line_free/setup.py b/setup/account_payment_line_free/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_payment_line_free/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/account_statement_completion/odoo/addons/account_statement_completion b/setup/account_statement_completion/odoo/addons/account_statement_completion deleted file mode 120000 index bb2d285b..00000000 --- a/setup/account_statement_completion/odoo/addons/account_statement_completion +++ /dev/null @@ -1 +0,0 @@ -../../../../account_statement_completion \ No newline at end of file diff --git a/setup/account_statement_completion/setup.py b/setup/account_statement_completion/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/account_statement_completion/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) 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 deleted file mode 120000 index 4be32bad..00000000 --- a/setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account +++ /dev/null @@ -1 +0,0 @@ -../../../../compassion_sub_chart_account \ No newline at end of file diff --git a/setup/compassion_sub_chart_account/setup.py b/setup/compassion_sub_chart_account/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/compassion_sub_chart_account/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/donation_report_compassion/odoo/addons/donation_report_compassion b/setup/donation_report_compassion/odoo/addons/donation_report_compassion deleted file mode 120000 index 563a51e3..00000000 --- a/setup/donation_report_compassion/odoo/addons/donation_report_compassion +++ /dev/null @@ -1 +0,0 @@ -../../../../donation_report_compassion \ No newline at end of file diff --git a/setup/donation_report_compassion/setup.py b/setup/donation_report_compassion/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/donation_report_compassion/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/invoice_restrictions/odoo/addons/invoice_restrictions b/setup/invoice_restrictions/odoo/addons/invoice_restrictions deleted file mode 120000 index 3e53ab4d..00000000 --- a/setup/invoice_restrictions/odoo/addons/invoice_restrictions +++ /dev/null @@ -1 +0,0 @@ -../../../../invoice_restrictions \ No newline at end of file diff --git a/setup/invoice_restrictions/setup.py b/setup/invoice_restrictions/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/invoice_restrictions/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/recurring_contract/odoo/addons/recurring_contract b/setup/recurring_contract/odoo/addons/recurring_contract deleted file mode 120000 index c33f356a..00000000 --- a/setup/recurring_contract/odoo/addons/recurring_contract +++ /dev/null @@ -1 +0,0 @@ -../../../../recurring_contract \ No newline at end of file diff --git a/setup/recurring_contract/setup.py b/setup/recurring_contract/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/recurring_contract/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -)