From 60e0030bf9c9e369b19bacfa1d7b19489a9cb0c9 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Sat, 27 Feb 2021 15:17:32 +0700 Subject: [PATCH 1/7] [ADD] account_move_cancel_confirm --- account_move_cancel_confirm/README.rst | 87 ++++ account_move_cancel_confirm/__init__.py | 4 + account_move_cancel_confirm/__manifest__.py | 14 + account_move_cancel_confirm/model/__init__.py | 4 + .../model/account_move.py | 30 ++ .../model/account_payment.py | 20 + .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 424 ++++++++++++++++++ account_move_cancel_confirm/tests/__init__.py | 3 + .../tests/test_account_move_cancel_confirm.py | 100 +++++ 12 files changed, 691 insertions(+) create mode 100644 account_move_cancel_confirm/README.rst create mode 100644 account_move_cancel_confirm/__init__.py create mode 100644 account_move_cancel_confirm/__manifest__.py create mode 100644 account_move_cancel_confirm/model/__init__.py create mode 100644 account_move_cancel_confirm/model/account_move.py create mode 100644 account_move_cancel_confirm/model/account_payment.py create mode 100644 account_move_cancel_confirm/readme/CONTRIBUTORS.rst create mode 100644 account_move_cancel_confirm/readme/DESCRIPTION.rst create mode 100644 account_move_cancel_confirm/static/description/icon.png create mode 100644 account_move_cancel_confirm/static/description/index.html create mode 100644 account_move_cancel_confirm/tests/__init__.py create mode 100644 account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py diff --git a/account_move_cancel_confirm/README.rst b/account_move_cancel_confirm/README.rst new file mode 100644 index 00000000000..465fbfc3bb8 --- /dev/null +++ b/account_move_cancel_confirm/README.rst @@ -0,0 +1,87 @@ +=========================== +Account Move Cancel Confirm +=========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:8fdb807cbdb0d685dd76fe8971c57cb506e0d371bb5fc1e2a8545b47af46274a + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github + :target: https://github.com/OCA/account-invoicing/tree/16.0/account_move_cancel_confirm + :alt: OCA/account-invoicing +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-account_move_cancel_confirm + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-invoicing&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +When user click to cancel invoice and journal entry, a confirmation wizard will be show, with reason as optional. + +For information on how to enable the feature, refer to the Configuration of the module *base_cancel_confirm*. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Ecosoft + +Contributors +~~~~~~~~~~~~ + +* Kitti U. +* Jordi Masvidal + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-kittiu| image:: https://github.com/kittiu.png?size=40px + :target: https://github.com/kittiu + :alt: kittiu + +Current `maintainer `__: + +|maintainer-kittiu| + +This module is part of the `OCA/account-invoicing `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_move_cancel_confirm/__init__.py b/account_move_cancel_confirm/__init__.py new file mode 100644 index 00000000000..02c244eef06 --- /dev/null +++ b/account_move_cancel_confirm/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import model diff --git a/account_move_cancel_confirm/__manifest__.py b/account_move_cancel_confirm/__manifest__.py new file mode 100644 index 00000000000..a8ab2a439c6 --- /dev/null +++ b/account_move_cancel_confirm/__manifest__.py @@ -0,0 +1,14 @@ +# Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Account Move Cancel Confirm", + "version": "16.0.1.0.0", + "author": "Ecosoft, Odoo Community Association (OCA)", + "category": "Usability", + "license": "AGPL-3", + "website": "https://github.com/OCA/account-invoicing", + "depends": ["base_cancel_confirm", "account"], + "installable": True, + "maintainers": ["kittiu"], +} diff --git a/account_move_cancel_confirm/model/__init__.py b/account_move_cancel_confirm/model/__init__.py new file mode 100644 index 00000000000..6deaa9b6941 --- /dev/null +++ b/account_move_cancel_confirm/model/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import account_move +from . import account_payment diff --git a/account_move_cancel_confirm/model/account_move.py b/account_move_cancel_confirm/model/account_move.py new file mode 100644 index 00000000000..a7f4c2a23ab --- /dev/null +++ b/account_move_cancel_confirm/model/account_move.py @@ -0,0 +1,30 @@ +# Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class AccountMove(models.Model): + _name = "account.move" + _inherit = ["account.move", "base.cancel.confirm"] + + _has_cancel_reason = "optional" # ["no", "optional", "required"] + + def button_cancel(self): + cancel_res_model = self.env.context.get("cancel_res_model", False) + cancel_res_ids = self.env.context.get("cancel_res_ids", False) + cancel_method = self.env.context.get("cancel_method", False) + # cancel from payment + if cancel_res_model == "account.payment" and cancel_method == "action_cancel": + docs = self.env[cancel_res_model].browse(cancel_res_ids) + cancel_reason = ", ".join( + docs.filtered("cancel_reason").mapped("cancel_reason") + ) + self.write({"cancel_confirm": True, "cancel_reason": cancel_reason}) + if not self.filtered("cancel_confirm"): + return self.open_cancel_confirm_wizard() + return super().button_cancel() + + def button_draft(self): + self.clear_cancel_confirm_data() + return super().button_draft() diff --git a/account_move_cancel_confirm/model/account_payment.py b/account_move_cancel_confirm/model/account_payment.py new file mode 100644 index 00000000000..82d15cf36c7 --- /dev/null +++ b/account_move_cancel_confirm/model/account_payment.py @@ -0,0 +1,20 @@ +# Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class AccountPayment(models.Model): + _name = "account.payment" + _inherit = ["account.payment", "base.cancel.confirm"] + + _has_cancel_reason = "optional" # ["no", "optional", "required"] + + def action_cancel(self): + if not self.filtered("cancel_confirm"): + return self.open_cancel_confirm_wizard() + return super().action_cancel() + + def action_draft(self): + self.clear_cancel_confirm_data() + return super().action_draft() diff --git a/account_move_cancel_confirm/readme/CONTRIBUTORS.rst b/account_move_cancel_confirm/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..28058a545d7 --- /dev/null +++ b/account_move_cancel_confirm/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Kitti U. +* Jordi Masvidal diff --git a/account_move_cancel_confirm/readme/DESCRIPTION.rst b/account_move_cancel_confirm/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..8271ae7ef74 --- /dev/null +++ b/account_move_cancel_confirm/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +When user click to cancel invoice and journal entry, a confirmation wizard will be show, with reason as optional. + +For information on how to enable the feature, refer to the Configuration of the module *base_cancel_confirm*. diff --git a/account_move_cancel_confirm/static/description/icon.png b/account_move_cancel_confirm/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_move_cancel_confirm/static/description/index.html b/account_move_cancel_confirm/static/description/index.html new file mode 100644 index 00000000000..c1034f46168 --- /dev/null +++ b/account_move_cancel_confirm/static/description/index.html @@ -0,0 +1,424 @@ + + + + + +Account Move Cancel Confirm + + + +
+

Account Move Cancel Confirm

+ + +

Beta License: AGPL-3 OCA/account-invoicing Translate me on Weblate Try me on Runboat

+

When user click to cancel invoice and journal entry, a confirmation wizard will be show, with reason as optional.

+

For information on how to enable the feature, refer to the Configuration of the module base_cancel_confirm.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Ecosoft
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

kittiu

+

This module is part of the OCA/account-invoicing project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_move_cancel_confirm/tests/__init__.py b/account_move_cancel_confirm/tests/__init__.py new file mode 100644 index 00000000000..7b96be289e4 --- /dev/null +++ b/account_move_cancel_confirm/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_account_move_cancel_confirm diff --git a/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py new file mode 100644 index 00000000000..7ae17e348fb --- /dev/null +++ b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py @@ -0,0 +1,100 @@ +# Copyright 2022 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields +from odoo.tests import Form +from odoo.tests.common import TransactionCase + + +class TestAccountMoveCancelConfirm(TransactionCase): + def setUp(self): + super().setUp() + self.account_move_model = self.env["account.move"] + self.register_payments_model = self.env["account.payment.register"] + self.payment_model = self.env["account.payment"] + self.partner = self.env.ref("base.res_partner_2") + self.product = self.env.ref("product.product_product_7") + self.payment_method_manual_in = self.env.ref( + "account.account_payment_method_manual_in" + ) + # Add parameter with cancel confirm + self.env["ir.config_parameter"].create( + {"key": "account.move.cancel_confirm_disable", "value": "False"} + ) + self.env["ir.config_parameter"].create( + {"key": "account.payment.cancel_confirm_disable", "value": "False"} + ) + self.journal_bank = self.env["account.journal"].create( + {"name": "Bank", "type": "bank", "code": "BNK67"} + ) + self.move = self.account_move_model.create( + { + "partner_id": self.partner.id, + "invoice_date": fields.Date.today(), + "move_type": "in_invoice", + "invoice_line_ids": [ + ( + 0, + 0, + { + "product_id": self.product.id, + "price_unit": 100.0, + }, + ) + ], + } + ) + + def test_01_cancel_move(self): + """ + - Cancel a account move with the wizard asking for the reason + - Then the account move should be canceled and the reason stored + """ + # Click cancel, cancel confirm wizard will open. Type in cancel_reason + res = self.move.button_cancel() + ctx = res.get("context") + self.assertEqual(ctx["cancel_method"], "button_cancel") + self.assertEqual(ctx["default_has_cancel_reason"], "optional") + wizard = Form(self.env["cancel.confirm"].with_context(**ctx)) + wizard.cancel_reason = "Wrong information" + wiz = wizard.save() + # Confirm cancel on wizard + wiz.confirm_cancel() + self.assertEqual(self.move.cancel_reason, wizard.cancel_reason) + self.assertEqual(self.move.state, "cancel") + # Set to draft + self.move.button_draft() + self.assertEqual(self.move.cancel_reason, False) + self.assertEqual(self.move.state, "draft") + + def test_02_cancel_payment(self): + """ + - Cancel a payment with the wizard asking for the reason + - Then the payment should be canceled and the reason stored + """ + # Create Payment + self.move.action_post() + res = self.move.action_register_payment() + payment_register_form = Form( + self.env[res["res_model"]].with_context(**res["context"]) + ) + payment = payment_register_form.save() + payment.action_create_payments() + payment = self.payment_model.search([], order="id desc", limit=1) + self.assertEqual(payment.state, "posted") + # Click cance, cancel confirm wizard will open. Type in cancel_reason + res = payment.action_cancel() + ctx = res.get("context") + self.assertEqual(ctx["cancel_method"], "action_cancel") + self.assertEqual(ctx["default_has_cancel_reason"], "optional") + wizard = Form(self.env["cancel.confirm"].with_context(**ctx)) + wizard.cancel_reason = "Wrong information" + wiz = wizard.save() + # Confirm cancel on wizard + wiz.confirm_cancel() + self.assertEqual(payment.cancel_reason, wizard.cancel_reason) + self.assertEqual(payment.state, "cancel") + # Set to draft + payment.action_draft() + self.assertEqual(payment.cancel_reason, False) + self.assertEqual(payment.state, "draft") From f7ee3926dd8dfef84842b937399ae790a8b6653d Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 22 Jul 2024 07:59:43 +0000 Subject: [PATCH 2/7] [UPD] Update account_move_cancel_confirm.pot --- .../i18n/account_move_cancel_confirm.pot | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 account_move_cancel_confirm/i18n/account_move_cancel_confirm.pot diff --git a/account_move_cancel_confirm/i18n/account_move_cancel_confirm.pot b/account_move_cancel_confirm/i18n/account_move_cancel_confirm.pot new file mode 100644 index 00000000000..a8ba06cfab9 --- /dev/null +++ b/account_move_cancel_confirm/i18n/account_move_cancel_confirm.pot @@ -0,0 +1,48 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_cancel_confirm +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_confirm +msgid "A flag signify that this document is confirmed for cancellation" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_reason +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_reason +msgid "An optional cancel reason" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_confirm +msgid "Cancel Confirmed" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_reason +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_reason +msgid "Cancel Reason" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model,name:account_move_cancel_confirm.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model,name:account_move_cancel_confirm.model_account_payment +msgid "Payments" +msgstr "" From a3aad8f34fd6c16903304dde27e39d1210272d51 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 22 Jul 2024 08:09:41 +0000 Subject: [PATCH 3/7] [BOT] post-merge updates --- account_move_cancel_confirm/README.rst | 2 +- .../static/description/index.html | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/account_move_cancel_confirm/README.rst b/account_move_cancel_confirm/README.rst index 465fbfc3bb8..3f7bd8d1590 100644 --- a/account_move_cancel_confirm/README.rst +++ b/account_move_cancel_confirm/README.rst @@ -7,7 +7,7 @@ Account Move Cancel Confirm !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:8fdb807cbdb0d685dd76fe8971c57cb506e0d371bb5fc1e2a8545b47af46274a + !! source digest: sha256:6d9331c29140b523ccb8fc453786dcfb6f74b4037119c36c0fe65d26b0eb1dea !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_move_cancel_confirm/static/description/index.html b/account_move_cancel_confirm/static/description/index.html index c1034f46168..bc8fb5ed527 100644 --- a/account_move_cancel_confirm/static/description/index.html +++ b/account_move_cancel_confirm/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -366,7 +367,7 @@

Account Move Cancel Confirm

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:8fdb807cbdb0d685dd76fe8971c57cb506e0d371bb5fc1e2a8545b47af46274a +!! source digest: sha256:6d9331c29140b523ccb8fc453786dcfb6f74b4037119c36c0fe65d26b0eb1dea !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/account-invoicing Translate me on Weblate Try me on Runboat

When user click to cancel invoice and journal entry, a confirmation wizard will be show, with reason as optional.

@@ -409,7 +410,9 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

From 54ec3a987c5d1d1275463e137cd3c1c4b70196a4 Mon Sep 17 00:00:00 2001 From: mymage Date: Mon, 29 Jul 2024 13:56:00 +0000 Subject: [PATCH 4/7] Added translation using Weblate (Italian) --- account_move_cancel_confirm/i18n/it.po | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 account_move_cancel_confirm/i18n/it.po diff --git a/account_move_cancel_confirm/i18n/it.po b/account_move_cancel_confirm/i18n/it.po new file mode 100644 index 00000000000..3cd6116d1da --- /dev/null +++ b/account_move_cancel_confirm/i18n/it.po @@ -0,0 +1,49 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_move_cancel_confirm +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_confirm +msgid "A flag signify that this document is confirmed for cancellation" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_reason +#: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_reason +msgid "An optional cancel reason" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_confirm +msgid "Cancel Confirmed" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_reason +#: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_reason +msgid "Cancel Reason" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model,name:account_move_cancel_confirm.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: account_move_cancel_confirm +#: model:ir.model,name:account_move_cancel_confirm.model_account_payment +msgid "Payments" +msgstr "" From 152547126b19e01cf7a90dc46ac51818a8ca78ff Mon Sep 17 00:00:00 2001 From: mymage Date: Wed, 7 Aug 2024 15:18:58 +0000 Subject: [PATCH 5/7] Translated using Weblate (Italian) Currently translated at 100.0% (6 of 6 strings) Translation: account-invoicing-16.0/account-invoicing-16.0-account_move_cancel_confirm Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-account_move_cancel_confirm/it/ --- account_move_cancel_confirm/i18n/it.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/account_move_cancel_confirm/i18n/it.po b/account_move_cancel_confirm/i18n/it.po index 3cd6116d1da..3f56b57ca0d 100644 --- a/account_move_cancel_confirm/i18n/it.po +++ b/account_move_cancel_confirm/i18n/it.po @@ -6,44 +6,46 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2024-08-07 17:58+0000\n" +"Last-Translator: mymage \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.6.2\n" #. module: account_move_cancel_confirm #: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_confirm #: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_confirm msgid "A flag signify that this document is confirmed for cancellation" -msgstr "" +msgstr "Una spunta indica che questo documento รจ confermato per l'annullamento" #. module: account_move_cancel_confirm #: model:ir.model.fields,help:account_move_cancel_confirm.field_account_move__cancel_reason #: model:ir.model.fields,help:account_move_cancel_confirm.field_account_payment__cancel_reason msgid "An optional cancel reason" -msgstr "" +msgstr "Un motivo di annullamento opzionale" #. module: account_move_cancel_confirm #: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_confirm #: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_confirm msgid "Cancel Confirmed" -msgstr "" +msgstr "Annullamento confermato" #. module: account_move_cancel_confirm #: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_move__cancel_reason #: model:ir.model.fields,field_description:account_move_cancel_confirm.field_account_payment__cancel_reason msgid "Cancel Reason" -msgstr "" +msgstr "Causale annullamento" #. module: account_move_cancel_confirm #: model:ir.model,name:account_move_cancel_confirm.model_account_move msgid "Journal Entry" -msgstr "" +msgstr "Registrazione contabile" #. module: account_move_cancel_confirm #: model:ir.model,name:account_move_cancel_confirm.model_account_payment msgid "Payments" -msgstr "" +msgstr "Pagamenti" From 6836a29a8ae44d9ca914646b6535050c5f72b3db Mon Sep 17 00:00:00 2001 From: GuillemCForgeFlow Date: Mon, 28 Oct 2024 16:18:51 +0100 Subject: [PATCH 6/7] [IMP]account_move_cancel_confirm: black, isort, prettier --- .../tests/test_account_move_cancel_confirm.py | 9 +-------- .../odoo/addons/account_move_cancel_confirm | 1 + setup/account_move_cancel_confirm/setup.py | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 120000 setup/account_move_cancel_confirm/odoo/addons/account_move_cancel_confirm create mode 100644 setup/account_move_cancel_confirm/setup.py diff --git a/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py index 7ae17e348fb..94a6a04d94c 100644 --- a/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py +++ b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py @@ -33,14 +33,7 @@ def setUp(self): "invoice_date": fields.Date.today(), "move_type": "in_invoice", "invoice_line_ids": [ - ( - 0, - 0, - { - "product_id": self.product.id, - "price_unit": 100.0, - }, - ) + (0, 0, {"product_id": self.product.id, "price_unit": 100.0,},) ], } ) diff --git a/setup/account_move_cancel_confirm/odoo/addons/account_move_cancel_confirm b/setup/account_move_cancel_confirm/odoo/addons/account_move_cancel_confirm new file mode 120000 index 00000000000..5efa21e8b92 --- /dev/null +++ b/setup/account_move_cancel_confirm/odoo/addons/account_move_cancel_confirm @@ -0,0 +1 @@ +../../../../account_move_cancel_confirm \ No newline at end of file diff --git a/setup/account_move_cancel_confirm/setup.py b/setup/account_move_cancel_confirm/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/account_move_cancel_confirm/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 6516e17657fc5442d101378345c57c37c82366a5 Mon Sep 17 00:00:00 2001 From: GuillemCForgeFlow Date: Mon, 28 Oct 2024 16:10:22 +0100 Subject: [PATCH 7/7] [BKP][ADD]account_move_cancel_confirm Backport from https://github.com/OCA/account-invoicing/tree/16.0/account_move_cancel_confirm Not major changes to be done, direct backport --- account_move_cancel_confirm/__manifest__.py | 2 +- account_move_cancel_confirm/readme/CONTRIBUTORS.rst | 1 + .../tests/test_account_move_cancel_confirm.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/account_move_cancel_confirm/__manifest__.py b/account_move_cancel_confirm/__manifest__.py index a8ab2a439c6..00bf86649cf 100644 --- a/account_move_cancel_confirm/__manifest__.py +++ b/account_move_cancel_confirm/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Account Move Cancel Confirm", - "version": "16.0.1.0.0", + "version": "13.0.1.0.0", "author": "Ecosoft, Odoo Community Association (OCA)", "category": "Usability", "license": "AGPL-3", diff --git a/account_move_cancel_confirm/readme/CONTRIBUTORS.rst b/account_move_cancel_confirm/readme/CONTRIBUTORS.rst index 28058a545d7..dd1f9de5a29 100644 --- a/account_move_cancel_confirm/readme/CONTRIBUTORS.rst +++ b/account_move_cancel_confirm/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Kitti U. * Jordi Masvidal +* Guillem Casassas diff --git a/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py index 94a6a04d94c..a84f22744f1 100644 --- a/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py +++ b/account_move_cancel_confirm/tests/test_account_move_cancel_confirm.py @@ -33,7 +33,7 @@ def setUp(self): "invoice_date": fields.Date.today(), "move_type": "in_invoice", "invoice_line_ids": [ - (0, 0, {"product_id": self.product.id, "price_unit": 100.0,},) + (0, 0, {"product_id": self.product.id, "price_unit": 100.0}) ], } )