From 0b725a12836d8f08a52cead2feac87261fa12cec Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Wed, 30 Jul 2025 21:46:17 +0200 Subject: [PATCH 1/6] fjdkal --- setup/.setuptools-odoo-make-default-ignore | 2 -- setup/README | 2 -- .../odoo/addons/account_analytic_attribution | 1 - setup/account_analytic_attribution/setup.py | 6 ------ .../odoo/addons/account_analytic_compassion | 1 - setup/account_analytic_compassion/setup.py | 6 ------ setup/account_ebics_CH/odoo/addons/account_ebics_CH | 1 - setup/account_ebics_CH/setup.py | 6 ------ .../odoo/addons/account_ebics_payment_return | 1 - setup/account_ebics_payment_return/setup.py | 6 ------ .../odoo/addons/account_invoice_export_grouped | 1 - setup/account_invoice_export_grouped/setup.py | 6 ------ .../odoo/addons/account_invoice_split_invoice | 1 - setup/account_invoice_split_invoice/setup.py | 6 ------ .../odoo/addons/account_move_periodic_accounting_transfer | 1 - setup/account_move_periodic_accounting_transfer/setup.py | 6 ------ .../odoo/addons/account_offbalance_sponsorship | 1 - setup/account_offbalance_sponsorship/setup.py | 6 ------ .../odoo/addons/account_payment_line_free | 1 - setup/account_payment_line_free/setup.py | 6 ------ .../odoo/addons/account_statement_completion | 1 - setup/account_statement_completion/setup.py | 6 ------ .../odoo/addons/compassion_sub_chart_account | 1 - setup/compassion_sub_chart_account/setup.py | 6 ------ .../odoo/addons/donation_report_compassion | 1 - setup/donation_report_compassion/setup.py | 6 ------ setup/invoice_restrictions/odoo/addons/invoice_restrictions | 1 - setup/invoice_restrictions/setup.py | 6 ------ setup/recurring_contract/odoo/addons/recurring_contract | 1 - setup/recurring_contract/setup.py | 6 ------ 30 files changed, 102 deletions(-) delete mode 100644 setup/.setuptools-odoo-make-default-ignore delete mode 100644 setup/README delete mode 120000 setup/account_analytic_attribution/odoo/addons/account_analytic_attribution delete mode 100644 setup/account_analytic_attribution/setup.py delete mode 120000 setup/account_analytic_compassion/odoo/addons/account_analytic_compassion delete mode 100644 setup/account_analytic_compassion/setup.py delete mode 120000 setup/account_ebics_CH/odoo/addons/account_ebics_CH delete mode 100644 setup/account_ebics_CH/setup.py delete mode 120000 setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return delete mode 100644 setup/account_ebics_payment_return/setup.py delete mode 120000 setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped delete mode 100644 setup/account_invoice_export_grouped/setup.py delete mode 120000 setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice delete mode 100644 setup/account_invoice_split_invoice/setup.py delete mode 120000 setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer delete mode 100644 setup/account_move_periodic_accounting_transfer/setup.py delete mode 120000 setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship delete mode 100644 setup/account_offbalance_sponsorship/setup.py delete mode 120000 setup/account_payment_line_free/odoo/addons/account_payment_line_free delete mode 100644 setup/account_payment_line_free/setup.py delete mode 120000 setup/account_statement_completion/odoo/addons/account_statement_completion delete mode 100644 setup/account_statement_completion/setup.py delete mode 120000 setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account delete mode 100644 setup/compassion_sub_chart_account/setup.py delete mode 120000 setup/donation_report_compassion/odoo/addons/donation_report_compassion delete mode 100644 setup/donation_report_compassion/setup.py delete mode 120000 setup/invoice_restrictions/odoo/addons/invoice_restrictions delete mode 100644 setup/invoice_restrictions/setup.py delete mode 120000 setup/recurring_contract/odoo/addons/recurring_contract delete mode 100644 setup/recurring_contract/setup.py 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, -) From 4585a27eba1535fba3414b1cf55594287e2aa085 Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Fri, 14 Nov 2025 17:07:06 +0100 Subject: [PATCH 2/6] Allow gift wizard to generate on multiple contract. --- recurring_contract/models/contract_group.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From 9d401a439b66995f3af67661539e04209291cf69 Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Mon, 12 Jan 2026 19:04:13 +0100 Subject: [PATCH 3/6] free rejected payment order/payment order line corrected --- .../models/account_payment_return.py | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) 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): From 1832978eee00b787bfb70d09d69cc2d6ace8d4ed Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Tue, 13 Jan 2026 09:26:55 +0100 Subject: [PATCH 4/6] Revert "fjdkal" This reverts commit 0b725a12836d8f08a52cead2feac87261fa12cec. --- setup/.setuptools-odoo-make-default-ignore | 2 ++ setup/README | 2 ++ .../odoo/addons/account_analytic_attribution | 1 + setup/account_analytic_attribution/setup.py | 6 ++++++ .../odoo/addons/account_analytic_compassion | 1 + setup/account_analytic_compassion/setup.py | 6 ++++++ setup/account_ebics_CH/odoo/addons/account_ebics_CH | 1 + setup/account_ebics_CH/setup.py | 6 ++++++ .../odoo/addons/account_ebics_payment_return | 1 + setup/account_ebics_payment_return/setup.py | 6 ++++++ .../odoo/addons/account_invoice_export_grouped | 1 + setup/account_invoice_export_grouped/setup.py | 6 ++++++ .../odoo/addons/account_invoice_split_invoice | 1 + setup/account_invoice_split_invoice/setup.py | 6 ++++++ .../odoo/addons/account_move_periodic_accounting_transfer | 1 + setup/account_move_periodic_accounting_transfer/setup.py | 6 ++++++ .../odoo/addons/account_offbalance_sponsorship | 1 + setup/account_offbalance_sponsorship/setup.py | 6 ++++++ .../odoo/addons/account_payment_line_free | 1 + setup/account_payment_line_free/setup.py | 6 ++++++ .../odoo/addons/account_statement_completion | 1 + setup/account_statement_completion/setup.py | 6 ++++++ .../odoo/addons/compassion_sub_chart_account | 1 + setup/compassion_sub_chart_account/setup.py | 6 ++++++ .../odoo/addons/donation_report_compassion | 1 + setup/donation_report_compassion/setup.py | 6 ++++++ setup/invoice_restrictions/odoo/addons/invoice_restrictions | 1 + setup/invoice_restrictions/setup.py | 6 ++++++ setup/recurring_contract/odoo/addons/recurring_contract | 1 + setup/recurring_contract/setup.py | 6 ++++++ 30 files changed, 102 insertions(+) create mode 100644 setup/.setuptools-odoo-make-default-ignore create mode 100644 setup/README create mode 120000 setup/account_analytic_attribution/odoo/addons/account_analytic_attribution create mode 100644 setup/account_analytic_attribution/setup.py create mode 120000 setup/account_analytic_compassion/odoo/addons/account_analytic_compassion create mode 100644 setup/account_analytic_compassion/setup.py create mode 120000 setup/account_ebics_CH/odoo/addons/account_ebics_CH create mode 100644 setup/account_ebics_CH/setup.py create mode 120000 setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return create mode 100644 setup/account_ebics_payment_return/setup.py create mode 120000 setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped create mode 100644 setup/account_invoice_export_grouped/setup.py create mode 120000 setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice create mode 100644 setup/account_invoice_split_invoice/setup.py create mode 120000 setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer create mode 100644 setup/account_move_periodic_accounting_transfer/setup.py create mode 120000 setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship create mode 100644 setup/account_offbalance_sponsorship/setup.py create mode 120000 setup/account_payment_line_free/odoo/addons/account_payment_line_free create mode 100644 setup/account_payment_line_free/setup.py create mode 120000 setup/account_statement_completion/odoo/addons/account_statement_completion create mode 100644 setup/account_statement_completion/setup.py create mode 120000 setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account create mode 100644 setup/compassion_sub_chart_account/setup.py create mode 120000 setup/donation_report_compassion/odoo/addons/donation_report_compassion create mode 100644 setup/donation_report_compassion/setup.py create mode 120000 setup/invoice_restrictions/odoo/addons/invoice_restrictions create mode 100644 setup/invoice_restrictions/setup.py create mode 120000 setup/recurring_contract/odoo/addons/recurring_contract create mode 100644 setup/recurring_contract/setup.py diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore new file mode 100644 index 00000000..207e6153 --- /dev/null +++ b/setup/.setuptools-odoo-make-default-ignore @@ -0,0 +1,2 @@ +# addons listed in this file are ignored by +# setuptools-odoo-make-default (one addon per line) diff --git a/setup/README b/setup/README new file mode 100644 index 00000000..a63d633e --- /dev/null +++ b/setup/README @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000..310fa7f3 --- /dev/null +++ b/setup/account_analytic_attribution/odoo/addons/account_analytic_attribution @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_analytic_attribution/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..a1e994d2 --- /dev/null +++ b/setup/account_analytic_compassion/odoo/addons/account_analytic_compassion @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_analytic_compassion/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..9a509b77 --- /dev/null +++ b/setup/account_ebics_CH/odoo/addons/account_ebics_CH @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_ebics_CH/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..4c4612bc --- /dev/null +++ b/setup/account_ebics_payment_return/odoo/addons/account_ebics_payment_return @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_ebics_payment_return/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..c0c70343 --- /dev/null +++ b/setup/account_invoice_export_grouped/odoo/addons/account_invoice_export_grouped @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_invoice_export_grouped/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..27049931 --- /dev/null +++ b/setup/account_invoice_split_invoice/odoo/addons/account_invoice_split_invoice @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_invoice_split_invoice/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..c1fd39ee --- /dev/null +++ b/setup/account_move_periodic_accounting_transfer/odoo/addons/account_move_periodic_accounting_transfer @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_move_periodic_accounting_transfer/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..4e7f7029 --- /dev/null +++ b/setup/account_offbalance_sponsorship/odoo/addons/account_offbalance_sponsorship @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_offbalance_sponsorship/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..f33a125b --- /dev/null +++ b/setup/account_payment_line_free/odoo/addons/account_payment_line_free @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_payment_line_free/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..bb2d285b --- /dev/null +++ b/setup/account_statement_completion/odoo/addons/account_statement_completion @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_statement_completion/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..4be32bad --- /dev/null +++ b/setup/compassion_sub_chart_account/odoo/addons/compassion_sub_chart_account @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/compassion_sub_chart_account/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..563a51e3 --- /dev/null +++ b/setup/donation_report_compassion/odoo/addons/donation_report_compassion @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/donation_report_compassion/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..3e53ab4d --- /dev/null +++ b/setup/invoice_restrictions/odoo/addons/invoice_restrictions @@ -0,0 +1 @@ +../../../../invoice_restrictions \ No newline at end of file diff --git a/setup/invoice_restrictions/setup.py b/setup/invoice_restrictions/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/invoice_restrictions/setup.py @@ -0,0 +1,6 @@ +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 new file mode 120000 index 00000000..c33f356a --- /dev/null +++ b/setup/recurring_contract/odoo/addons/recurring_contract @@ -0,0 +1 @@ +../../../../recurring_contract \ No newline at end of file diff --git a/setup/recurring_contract/setup.py b/setup/recurring_contract/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/recurring_contract/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From b58f0ff8b69e8dd9c2f43e04d928ccea99de9234 Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Tue, 13 Jan 2026 09:27:13 +0100 Subject: [PATCH 5/6] Revert "Allow gift wizard to generate on multiple contract." This reverts commit 4585a27eba1535fba3414b1cf55594287e2aa085. --- recurring_contract/models/contract_group.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recurring_contract/models/contract_group.py b/recurring_contract/models/contract_group.py index 88bac182..f563867a 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.current_contract_id + contract = gift_wizard.contract_id price = gift_wizard.amount line_name = gift_wizard.description or product.name else: From 0ff4a295ce886d483cfdbb6b11b15d03e63ec509 Mon Sep 17 00:00:00 2001 From: David Wulliamoz Date: Tue, 13 Jan 2026 09:33:42 +0100 Subject: [PATCH 6/6] corrections --- .../models/account_payment_return.py | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/account_ebics_payment_return/models/account_payment_return.py b/account_ebics_payment_return/models/account_payment_return.py index 85ed84c8..8d6a3481 100644 --- a/account_ebics_payment_return/models/account_payment_return.py +++ b/account_ebics_payment_return/models/account_payment_return.py @@ -71,7 +71,8 @@ def _process_pain002(self): except Exception as e: _logger.info( - "[FAIL] import file '%s' to bank Statements", self.name, exc_info=True + "[FAIL] import file '%s' to bank Statements", + self.name, exc_info=True ) self.env.cr.rollback() self.invalidate_cache() @@ -95,14 +96,15 @@ def _on_error_parse_xml_and_cancel(self, err_message): ).text _logger.info("PAIN002 po_name: %s", po_name) po_state = root.find( - "./ns:CstmrPmtStsRpt/ns:OrgnlGrpInfAndSts/ns:GrpSts", namespaces={"ns": ns} + "./ns:CstmrPmtStsRpt/ns:OrgnlGrpInfAndSts/ns:GrpSts", + namespaces={"ns": ns} ).text _logger.info("PAIN002 po_state: %s", po_state) payment_order = self.env["account.payment.order"].search( [("name", "=", po_name)] ) _logger.info("PAIN002 payment_order: %s", payment_order) - 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,11 +123,14 @@ 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 - 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}", ) + endtoend_id=t.find("./ns:OrgnlEndToEndId", + namespaces={"ns": ns}).text + payment_ids = payment_order.payment_ids.filtered( + lambda l: int(endtoend_id) in l.move_id.mapped("id")) + payment_line_ids = payment_order.payment_line_ids.filtered( + lambda l: payment_ids in l.payment_ids) + _logger.info(f"PAIN002 payments found: {payment_ids.name} " + f"with endtoend_id: {endtoend_id}", ) # free line with message rsn = t.findall( @@ -135,13 +140,14 @@ def _on_error_parse_xml_and_cancel(self, err_message): for r in rsn: rsn_text.append(r.text) rsn_txt = " ".join(rsn_text) - _logger.info(f"PAIN002 line free: {rsn_txt} for lines {payment_line_ids}", ) + _logger.info(f"PAIN002 line free: {rsn_txt} " + f"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}" ,) + _logger.info(f"PAIN002 line free: {rsn_txt}") except Exception as e: - _logger.info(f"error line free: {e}" ,) + _logger.error(f"Error freeing line {b.id}: {e}") if payment_order.state == "generated":