diff --git a/account_avatax_sale_oca/views/sale_order_view.xml b/account_avatax_sale_oca/views/sale_order_view.xml index c01f4375d..b4536ec8a 100644 --- a/account_avatax_sale_oca/views/sale_order_view.xml +++ b/account_avatax_sale_oca/views/sale_order_view.xml @@ -60,11 +60,11 @@ - + diff --git a/account_ecotax_sale/README.rst b/account_ecotax_sale/README.rst new file mode 100644 index 000000000..fcd771554 --- /dev/null +++ b/account_ecotax_sale/README.rst @@ -0,0 +1,89 @@ +====================== +sale Ecotax Management +====================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:731b0e3366890dbeca7db020b75324a2d458308b74991b4ce1d16937c9591178 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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--fiscal--rule-lightgray.png?logo=github + :target: https://github.com/OCA/account-fiscal-rule/tree/16.0/account_ecotax_sale + :alt: OCA/account-fiscal-rule +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-fiscal-rule-16-0/account-fiscal-rule-16-0-account_ecotax_sale + :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-fiscal-rule&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module is an extension of the module *l10n_fr_ecotax* for sale orders. Please refer to the README of the module *account_ecotax* for more info about ecotax management. + +**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 +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* Mourad EL HADJ MIMOUNE +* Florian DA COSTA + + +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-mourad-ehm| image:: https://github.com/mourad-ehm.png?size=40px + :target: https://github.com/mourad-ehm + :alt: mourad-ehm +.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px + :target: https://github.com/florian-dacosta + :alt: florian-dacosta + +Current `maintainers `__: + +|maintainer-mourad-ehm| |maintainer-florian-dacosta| + +This module is part of the `OCA/account-fiscal-rule `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_ecotax_sale/__init__.py b/account_ecotax_sale/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/account_ecotax_sale/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_ecotax_sale/__manifest__.py b/account_ecotax_sale/__manifest__.py new file mode 100644 index 000000000..dde2d6d54 --- /dev/null +++ b/account_ecotax_sale/__manifest__.py @@ -0,0 +1,19 @@ +# © 2014-2023 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "sale Ecotax Management", + "summary": "Sale Ecotaxe", + "version": "16.0.2.0.0", + "maintainers": ["mourad-ehm", "florian-dacosta"], + "author": "Akretion,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-fiscal-rule", + "category": "Localization/Account Taxes", + "license": "AGPL-3", + "depends": ["account_ecotax", "sale"], + "data": [ + "views/sale_view.xml", + "security/ir.model.access.csv", + ], + "installable": True, +} diff --git a/account_ecotax_sale/i18n/account_ecotaxe_sale.pot b/account_ecotax_sale/i18n/account_ecotaxe_sale.pot new file mode 100644 index 000000000..097bb7fc3 --- /dev/null +++ b/account_ecotax_sale/i18n/account_ecotaxe_sale.pot @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_fr_ecotaxe_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.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: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order__amount_ecotaxe +msgid "Included Ecotaxe" +msgstr "" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model,name:l10n_fr_ecotaxe_sale.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model,name:l10n_fr_ecotaxe_sale.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order_line__subtotal_ecotaxe +msgid "Subtotal Ecotaxe" +msgstr "" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order_line__unit_ecotaxe_amount +msgid "ecotaxe Unit." +msgstr "" diff --git a/account_ecotax_sale/i18n/fr.po b/account_ecotax_sale/i18n/fr.po new file mode 100644 index 000000000..c39f68b5e --- /dev/null +++ b/account_ecotax_sale/i18n/fr.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_fr_ecotaxe_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-03-01 13:01+0000\n" +"PO-Revision-Date: 2022-03-01 13:01+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order__amount_ecotaxe +msgid "Included Ecotaxe" +msgstr "Ecotaxe Incluse" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model,name:l10n_fr_ecotaxe_sale.model_sale_order +msgid "Sales Order" +msgstr "Bon de commande" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model,name:l10n_fr_ecotaxe_sale.model_sale_order_line +msgid "Sales Order Line" +msgstr "Ligne de bons de commande" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order_line__subtotal_ecotaxe +msgid "Subtotal Ecotaxe" +msgstr "Sous-total Ecotaxe" + +#. module: l10n_fr_ecotaxe_sale +#: model:ir.model.fields,field_description:l10n_fr_ecotaxe_sale.field_sale_order_line__unit_ecotaxe_amount +msgid "ecotaxe Unit." +msgstr "Ecotaxe par Unité" diff --git a/account_ecotax_sale/models/__init__.py b/account_ecotax_sale/models/__init__.py new file mode 100644 index 000000000..e95c7e574 --- /dev/null +++ b/account_ecotax_sale/models/__init__.py @@ -0,0 +1,3 @@ +from . import sale_order_line_ecotax +from . import sale_order_line +from . import sale_order diff --git a/account_ecotax_sale/models/sale_order.py b/account_ecotax_sale/models/sale_order.py new file mode 100644 index 000000000..2b930c623 --- /dev/null +++ b/account_ecotax_sale/models/sale_order.py @@ -0,0 +1,25 @@ +# © 2015 -2023 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class SaleOrder(models.Model): + + _inherit = "sale.order" + + amount_ecotax = fields.Float( + digits="Ecotaxe", + string="Included Ecotaxe", + store=True, + compute="_compute_ecotax", + ) + + @api.depends("order_line.subtotal_ecotax") + def _compute_ecotax(self): + for order in self: + val_ecotax = 0.0 + for line in order.order_line: + val_ecotax += line.subtotal_ecotax + order.amount_ecotax = val_ecotax diff --git a/account_ecotax_sale/models/sale_order_line.py b/account_ecotax_sale/models/sale_order_line.py new file mode 100644 index 000000000..5b512907f --- /dev/null +++ b/account_ecotax_sale/models/sale_order_line.py @@ -0,0 +1,105 @@ +# © 2015 -2023 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import Command, api, fields, models + + +class SaleOrderLine(models.Model): + + _inherit = "sale.order.line" + + ecotax_line_ids = fields.One2many( + "sale.order.line.ecotax", + "sale_order_line_id", + compute="_compute_ecotax_line_ids", + store=True, + readonly=False, + string="Ecotax lines", + copy=True, + ) + subtotal_ecotax = fields.Float( + string="Ecotax", digits="Ecotax", store=True, compute="_compute_ecotax" + ) + ecotax_amount_unit = fields.Float( + digits="Ecotax", + string="Ecotax Unit", + store=True, + compute="_compute_ecotax", + ) + + def _get_ecotax_amounts(self): + self.ensure_one() + unit = sum(self.ecotax_line_ids.mapped("amount_unit")) + subtotal_ecotax = sum(self.ecotax_line_ids.mapped("amount_total")) + return unit, subtotal_ecotax + + @api.depends( + "currency_id", + "ecotax_line_ids.amount_unit", + "ecotax_line_ids.amount_total", + ) + def _compute_ecotax(self): + for line in self: + amount_unit, subtotal = line._get_ecotax_amounts() + line.subtotal_ecotax = subtotal + line.ecotax_amount_unit = amount_unit + + def _get_new_vals_list(self): + self.ensure_one() + new_vals_list = [ + Command.create( + { + "classification_id": ecotaxline_prod.classification_id.id, + "force_amount_unit": ecotaxline_prod.force_amount, + } + ) + for ecotaxline_prod in self.product_id.all_ecotax_line_product_ids + ] + return new_vals_list + + @api.depends("product_id") + def _compute_ecotax_line_ids(self): + """Unlink and recreate ecotax_lines when modifying the product_id.""" + for line in self: + delete_vals_list = [ + Command.delete(taxline.id) for taxline in line.ecotax_line_ids + ] + new_vals_list = line._get_new_vals_list() + update = new_vals_list + delete_vals_list + line.ecotax_line_ids = update + + def edit_ecotax_lines(self): + view = { + "name": ("Ecotax classification"), + "view_type": "form", + "view_mode": "form", + "res_model": "sale.order.line", + "view_id": self.env.ref( + "account_ecotax_sale.view_sale_line_ecotax_form" + ).id, + "type": "ir.actions.act_window", + "target": "new", + "res_id": self.id, + } + return view + + def _prepare_invoice_line(self, **optional_values): + """Create equivalente ecotax_line_ids for account move line + from sale order line ecotax_line_ids . + """ + res = super()._prepare_invoice_line(**optional_values) + ecotax_cls_vals = [] + for ecotaxline in self.ecotax_line_ids: + ecotax_cls_vals.append( + ( + 0, + 0, + { + "classification_id": ecotaxline.classification_id.id, + "force_amount_unit": ecotaxline.force_amount_unit, + }, + ) + ) + res["ecotax_line_ids"] = ecotax_cls_vals + return res diff --git a/account_ecotax_sale/models/sale_order_line_ecotax.py b/account_ecotax_sale/models/sale_order_line_ecotax.py new file mode 100644 index 000000000..7e604197d --- /dev/null +++ b/account_ecotax_sale/models/sale_order_line_ecotax.py @@ -0,0 +1,28 @@ +# © 2014-2023 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class SaleOrderLineEcotaxe(models.Model): + _name = "sale.order.line.ecotax" + _inherit = "ecotax.line.mixin" + _description = "Sale order line ecotax" + + sale_order_line_id = fields.Many2one( + comodel_name="sale.order.line", + string="Sale line", + required=True, + readonly=True, + index=True, + auto_join=True, + ondelete="cascade", + ) + product_id = fields.Many2one( + "product.product", related="sale_order_line_id.product_id", readonly=True + ) + quantity = fields.Float(related="sale_order_line_id.product_uom_qty", readonly=True) + currency_id = fields.Many2one( + related="sale_order_line_id.currency_id", readonly=True + ) diff --git a/account_ecotax_sale/readme/CONTRIBUTORS.rst b/account_ecotax_sale/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..934f6e19b --- /dev/null +++ b/account_ecotax_sale/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Mourad EL HADJ MIMOUNE +* Florian DA COSTA + diff --git a/account_ecotax_sale/readme/DESCRIPTION.rst b/account_ecotax_sale/readme/DESCRIPTION.rst new file mode 100644 index 000000000..72cb84d5e --- /dev/null +++ b/account_ecotax_sale/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module is an extension of the module *l10n_fr_ecotax* for sale orders. Please refer to the README of the module *account_ecotax* for more info about ecotax management. diff --git a/account_ecotax_sale/security/ir.model.access.csv b/account_ecotax_sale/security/ir.model.access.csv new file mode 100644 index 000000000..4bf00332b --- /dev/null +++ b/account_ecotax_sale/security/ir.model.access.csv @@ -0,0 +1,4 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_ecotax_line_product_sale_readonly,ecotax.line.product readonly,account_ecotax.model_ecotax_line_product,sales_team.group_sale_salesman,1,0,0,0 +access_account_move_line_ecotax_readonly_sale_user,account.move.line.ecotax readonly sale user,account_ecotax.model_account_move_line_ecotax,sales_team.group_sale_salesman,1,0,0,0 +ir_model_access_sale_order_line_ecotax_group_sale_salesman,Read Full acess to model_sale_order_line_ecotax to group sale_salesman,model_sale_order_line_ecotax,sales_team.group_sale_salesman,1,1,1,1 diff --git a/account_ecotax_sale/static/description/icon.png b/account_ecotax_sale/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_ecotax_sale/static/description/icon.png differ diff --git a/account_ecotax_sale/static/description/index.html b/account_ecotax_sale/static/description/index.html new file mode 100644 index 000000000..5093f8750 --- /dev/null +++ b/account_ecotax_sale/static/description/index.html @@ -0,0 +1,426 @@ + + + + + +sale Ecotax Management + + + +
+

sale Ecotax Management

+ + +

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

+

This module is an extension of the module l10n_fr_ecotax for sale orders. Please refer to the README of the module account_ecotax for more info about ecotax management.

+

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

+
    +
  • Akretion
  • +
+
+
+

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 maintainers:

+

mourad-ehm florian-dacosta

+

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

+

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

+
+
+
+ + diff --git a/account_ecotax_sale/tests/__init__.py b/account_ecotax_sale/tests/__init__.py new file mode 100644 index 000000000..809acf6a1 --- /dev/null +++ b/account_ecotax_sale/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_ecotax diff --git a/account_ecotax_sale/tests/test_sale_ecotax.py b/account_ecotax_sale/tests/test_sale_ecotax.py new file mode 100644 index 000000000..7fd8a648f --- /dev/null +++ b/account_ecotax_sale/tests/test_sale_ecotax.py @@ -0,0 +1,115 @@ +# © 2021-2023 Akretion (http://www.akretion.com) +# @author Mourad EL HADJ MIMOUNE +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import Form + +from odoo.addons.account_ecotax.tests.test_ecotax import TestInvoiceEcotaxCommon + + +class TestsaleEcotaxCommon(TestInvoiceEcotaxCommon): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product_a = cls.env["product.product"].create( + { + "name": "product_a", + "uom_id": cls.env.ref("uom.product_uom_unit").id, + "weight": 100, + "list_price": 200, + } + ) + cls.product_b = cls.env["product.product"].create( + { + "name": "product_b", + "uom_id": cls.env.ref("uom.product_uom_unit").id, + "list_price": 200, + "weight": 400, + } + ) + + cls.product_a.ecotax_line_product_ids = [ + ( + 0, + 0, + { + # 2.4 + "classification_id": cls.ecotax_fixed.id, + }, + ) + ] + cls.product_b.ecotax_line_product_ids = [ + ( + 0, + 0, + { + "classification_id": cls.ecotax_weight.id, + }, + ) + ] + + def create_sale_partner(self, partner_id, products_and_qty): + sale_form = Form(self.env["sale.order"]) + sale_form.partner_id = partner_id + + for product, qty in products_and_qty: + with sale_form.order_line.new() as line_form: + line_form.product_id = product + line_form.product_uom_qty = qty + + sale = sale_form.save() + + return sale + + def _test_01_classification_weight_based_ecotax(self): + """Tests with weight based ecotaxs""" + # in order to test the correct assignment of weight ecotax + # I create a customer sale. + partner12 = self.env.ref("base.res_partner_12") + self.sale = self.create_sale_partner( + partner_id=partner12, products_and_qty=[(self.product_b, 1.0)] + ) + self.assertEqual(self.product_b.ecotax_amount, 16) + so_form = Form(self.sale) + with so_form.order_line.edit(0) as line: + line.product_uom_qty = 3.0 + so_form.save() + self.assertEqual(self.sale.order_line.ecotax_amount_unit, 16) + self.assertEqual(self.sale.order_line.subtotal_ecotax, 48) + self.assertEqual(self.sale.amount_total, 600) + self.assertEqual(self.sale.amount_ecotax, 48) + + def _test_02_classification_ecotax(self): + """Tests multiple lines with mixed ecotaxs""" + # in order to test the correct assignment of fixed ecotax and weight ecotax + # I create a customer sale. + partner12 = self.env.ref("base.res_partner_12") + self.sale = self.create_sale_partner( + partner_id=partner12, + products_and_qty=[(self.product_a, 1.0), (self.product_b, 2.0)], + ) + # I assign a product with fixed ecotaxte to sale line + sale_line1 = self.sale.order_line[0] + # make sure to have 1 tax and fix tax rate + sale_line2 = self.sale.order_line[1] + # make sure to have 1 tax and fix tax rate + self.assertEqual(self.product_a.ecotax_amount, 5.0) + so_form = Form(self.sale) + with so_form.order_line.edit(0) as line: + line.product_uom_qty = 3.0 + so_form.save() + + self.assertEqual(sale_line1.ecotax_amount_unit, 5.0) + self.assertAlmostEqual(sale_line1.subtotal_ecotax, 15.0) + self.assertEqual(sale_line2.ecotax_amount_unit, 16) + self.assertEqual(sale_line2.subtotal_ecotax, 32) + self.assertEqual(self.sale.amount_total, 1000.0) + self.assertEqual(self.sale.amount_ecotax, 47.0) + + +class TestsaleEcotax(TestsaleEcotaxCommon): + def test_01_classification_weight_based_ecotax(self): + self._test_01_classification_weight_based_ecotax() + + def test_02_classification_ecotax(self): + self._test_02_classification_ecotax() diff --git a/account_ecotax_sale/views/sale_view.xml b/account_ecotax_sale/views/sale_view.xml new file mode 100644 index 000000000..b5162cf8a --- /dev/null +++ b/account_ecotax_sale/views/sale_view.xml @@ -0,0 +1,161 @@ + + + + + sale.order + + + + + + + + + + + + + + + + + + + + + +