From 9dd9e19caeccbd89cd058c44c458ba3b70a2827a Mon Sep 17 00:00:00 2001 From: David Date: Thu, 22 Aug 2019 14:24:14 +0200 Subject: [PATCH 1/5] [ADD][11.0] account_global_discount: New Module --- account_global_discount/README.rst | 96 +++++++ account_global_discount/__init__.py | 1 + account_global_discount/__manifest__.py | 23 ++ account_global_discount/i18n/.empty | 0 .../i18n/account_global_discount.pot | 153 +++++++++++ account_global_discount/models/__init__.py | 3 + .../models/account_invoice.py | 237 ++++++++++++++++++ .../models/account_move_line.py | 13 + .../models/global_discount.py | 24 ++ .../readme/CONTRIBUTORS.rst | 6 + .../readme/DESCRIPTION.rst | 1 + account_global_discount/readme/USAGE.rst | 14 ++ .../security/ir.model.access.csv | 3 + account_global_discount/security/security.xml | 16 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/icon.svg | 79 ++++++ .../static/description/index.html | 124 +++++++++ account_global_discount/tests/__init__.py | 1 + .../tests/test_global_discount.py | 131 ++++++++++ .../views/account_invoice_views.xml | 39 +++ .../views/global_discount_views.xml | 33 +++ 21 files changed, 997 insertions(+) create mode 100644 account_global_discount/README.rst create mode 100644 account_global_discount/__init__.py create mode 100644 account_global_discount/__manifest__.py create mode 100644 account_global_discount/i18n/.empty create mode 100644 account_global_discount/i18n/account_global_discount.pot create mode 100644 account_global_discount/models/__init__.py create mode 100644 account_global_discount/models/account_invoice.py create mode 100644 account_global_discount/models/account_move_line.py create mode 100644 account_global_discount/models/global_discount.py create mode 100644 account_global_discount/readme/CONTRIBUTORS.rst create mode 100644 account_global_discount/readme/DESCRIPTION.rst create mode 100644 account_global_discount/readme/USAGE.rst create mode 100644 account_global_discount/security/ir.model.access.csv create mode 100644 account_global_discount/security/security.xml create mode 100644 account_global_discount/static/description/icon.png create mode 100644 account_global_discount/static/description/icon.svg create mode 100644 account_global_discount/static/description/index.html create mode 100644 account_global_discount/tests/__init__.py create mode 100644 account_global_discount/tests/test_global_discount.py create mode 100644 account_global_discount/views/account_invoice_views.xml create mode 100644 account_global_discount/views/global_discount_views.xml diff --git a/account_global_discount/README.rst b/account_global_discount/README.rst new file mode 100644 index 00000000000..c872aab27cf --- /dev/null +++ b/account_global_discount/README.rst @@ -0,0 +1,96 @@ +======================= +Account Global Discount +======================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/11.0/account_global_discount + :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-11-0/account-invoicing-11-0-account_global_discount + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/95/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Apply global discounts to invoices + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to *Settings > Parameters > Global Discounts* +#. Add a new discount that can be either by percentage or fixed amount. +#. Choose the discount scope (sales or purchases). +#. You can also restrict it to a certain company if needed. + +You can assign global discounts to partners as well: + +#. Go to a partner that is a company. +#. Go to the *Sales & Purchases* tab. +#. In section sale (if the partner is a customer), you can set sale discounts. +#. In section purchase (if the partner is a supplier), you can set purchase + discounts. + +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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_ + + * Pedro M. Baeza + * David Vidal + * Carlos Dauden + * Rafael Blasco + +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. + +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_global_discount/__init__.py b/account_global_discount/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/account_global_discount/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_global_discount/__manifest__.py b/account_global_discount/__manifest__.py new file mode 100644 index 00000000000..6d159693144 --- /dev/null +++ b/account_global_discount/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright 2019 Tecnativa S.L. - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': 'Account Global Discount', + 'version': '11.0.1.0.0', + 'category': 'Accounting', + 'author': 'Tecnativa,' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/server-backend', + 'license': 'AGPL-3', + 'depends': [ + 'account', + 'base_global_discount', + ], + 'data': [ + 'security/ir.model.access.csv', + 'security/security.xml', + 'views/account_invoice_views.xml', + 'views/global_discount_views.xml', + ], + 'application': False, + 'installable': True, +} diff --git a/account_global_discount/i18n/.empty b/account_global_discount/i18n/.empty new file mode 100644 index 00000000000..e69de29bb2d diff --git a/account_global_discount/i18n/account_global_discount.pot b/account_global_discount/i18n/account_global_discount.pot new file mode 100644 index 00000000000..ab367aef676 --- /dev/null +++ b/account_global_discount/i18n/account_global_discount.pot @@ -0,0 +1,153 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_global_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.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_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_account_id +#: model:ir.model.fields,field_description:account_global_discount.field_global_discount_account_id +msgid "Account" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_amount_untaxed_before_global_discounts +msgid "Amount Untaxed Before Discounts" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_account_analytic_id +#: model:ir.model.fields,field_description:account_global_discount.field_global_discount_account_analytic_id +msgid "Analytic account" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_base +msgid "Base discounted" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_company_id +msgid "Company" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_create_uid +msgid "Created by" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_create_date +msgid "Created on" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_currency_id +msgid "Currency" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_display +msgid "Discount" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_name +msgid "Discount Name" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_amount +msgid "Discounted Amount" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_base_discounted +msgid "Discounted amount" +msgstr "" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Discounts..." +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_display_name +msgid "Display Name" +msgstr "" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_global_discount_id +#: model:ir.model.fields,field_description:account_global_discount.field_account_move_line_global_discount_id +msgid "Global Discount" +msgstr "" + +#. module: account_global_discount +#: model:ir.ui.menu,name:account_global_discount.menu_account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Global Discounts" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_id +msgid "ID" +msgstr "" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_invoice +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_invoice_id +msgid "Invoice" +msgstr "" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_invoice_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_invoice_global_discount_ids +msgid "Invoice Global Discount" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_ids +msgid "Invoice Global Discounts" +msgstr "" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount___last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_amount_global_discount +msgid "Total Global Discounts" +msgstr "" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Untaxed Amount Before Disc." +msgstr "" + diff --git a/account_global_discount/models/__init__.py b/account_global_discount/models/__init__.py new file mode 100644 index 00000000000..3c75f36efd7 --- /dev/null +++ b/account_global_discount/models/__init__.py @@ -0,0 +1,3 @@ +from . import account_invoice +from . import account_move_line +from . import global_discount diff --git a/account_global_discount/models/account_invoice.py b/account_global_discount/models/account_invoice.py new file mode 100644 index 00000000000..dc77d8b3d85 --- /dev/null +++ b/account_global_discount/models/account_invoice.py @@ -0,0 +1,237 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import api, fields, models +from odoo.addons import decimal_precision as dp + + +class AccountInvoice(models.Model): + _inherit = 'account.invoice' + + global_discount_ids = fields.Many2many( + comodel_name='global.discount', + column1='invoice_id', + column2='global_discount_id', + string='Invoice Global Discounts', + domain="[('discount_scope', 'in', {" + " 'out_invoice': ['sale'], " + " 'out_refund': ['sale'], " + " 'in_refund': ['purchase'], " + " 'in_invoice': ['purchase']" + "}.get(type, [])), ('account_id', '!=', False), '|', " + "('company_id', '=', company_id), ('company_id', '=', False)]", + ) + amount_global_discount = fields.Monetary( + string='Total Global Discounts', + compute='_compute_amount', + currency_field='currency_id', + readonly=True, + ) + amount_untaxed_before_global_discounts = fields.Monetary( + string='Amount Untaxed Before Discounts', + compute='_compute_amount', + currency_field='currency_id', + readonly=True, + ) + invoice_global_discount_ids = fields.One2many( + comodel_name='account.invoice.global.discount', + inverse_name='invoice_id', + ) + + def _set_global_discounts(self): + """Get global discounts in order and apply them in chain. They will be + fetched in their sequence order """ + for inv in self: + if inv.amount_untaxed_before_global_discounts: + base = inv.amount_untaxed_before_global_discounts + else: + base = inv.amount_untaxed + invoice_global_discounts = ( + self.env['account.invoice.global.discount']) + for global_discount in inv.global_discount_ids: + discount = global_discount._get_global_discount_vals(base) + invoice_global_discounts += invoice_global_discounts.new({ + 'name': global_discount.display_name, + 'invoice_id': inv.id, + 'global_discount_id': global_discount.id, + 'discount': global_discount.discount, + 'base': base, + 'base_discounted': discount['base_discounted'], + 'account_id': global_discount.account_id.id, + }) + base = discount['base_discounted'] + inv.invoice_global_discount_ids = invoice_global_discounts + # Recompute line taxes according to global discounts + taxes_grouped = inv.get_taxes_values() + tax_lines = inv.tax_line_ids.filtered('manual') + for tax in taxes_grouped.values(): + tax_lines += tax_lines.new(tax) + inv.tax_line_ids = tax_lines + + @api.onchange('invoice_line_ids') + def _onchange_invoice_line_ids(self): + self._set_global_discounts() + return super()._onchange_invoice_line_ids() + + @api.onchange('partner_id', 'company_id') + def _onchange_partner_id(self): + res = super()._onchange_partner_id() + if (self.type in ['out_invoice', 'out_refund'] and + self.partner_id.customer_global_discount_ids): + self.global_discount_ids = ( + self.partner_id.customer_global_discount_ids) + elif (self.type in ['in_refund', 'in_invoice'] and + self.partner_id.supplier_global_discount_ids): + self.global_discount_ids = ( + self.partner_id.supplier_global_discount_ids) + self._set_global_discounts() + return res + + @api.onchange('global_discount_ids') + def _onchange_global_discount_ids(self): + """Trigger global discount lines to recompute all""" + self._set_global_discounts() + return + + @api.depends('invoice_line_ids.price_subtotal', 'tax_line_ids.amount', + 'tax_line_ids.amount_rounding', 'currency_id', 'company_id', + 'date_invoice', 'type', + 'invoice_global_discount_ids', 'global_discount_ids') + def _compute_amount(self): + super()._compute_amount() + if not self.invoice_global_discount_ids: + return + round_curr = self.currency_id.round + self.amount_global_discount = sum( + round_curr(discount.discount_amount) * - 1 + for discount in self.invoice_global_discount_ids) + self.amount_untaxed_before_global_discounts = self.amount_untaxed + self.amount_untaxed = ( + self.amount_untaxed + self.amount_global_discount) + self.amount_total = self.amount_untaxed + self.amount_tax + amount_total_company_signed = self.amount_total + amount_untaxed_signed = self.amount_untaxed + if (self.currency_id and self.company_id and + self.currency_id != self.company_id.currency_id): + currency_id = self.currency_id.with_context(date=self.date_invoice) + amount_total_company_signed = currency_id.compute( + self.amount_total, self.company_id.currency_id) + amount_untaxed_signed = currency_id.compute( + self.amount_untaxed, self.company_id.currency_id) + sign = self.type in ['in_refund', 'out_refund'] and -1 or 1 + self.amount_total_company_signed = amount_total_company_signed * sign + self.amount_total_signed = self.amount_total * sign + self.amount_untaxed_signed = amount_untaxed_signed * sign + + def get_taxes_values(self): + round_curr = self.currency_id.round + tax_grouped = super().get_taxes_values() + for key in tax_grouped.keys(): + base = tax_grouped[key]['base'] + amount = tax_grouped[key]['amount'] + for discount in self.global_discount_ids: + base = discount._get_global_discount_vals( + base)['base_discounted'] + amount = discount._get_global_discount_vals( + amount)['base_discounted'] + tax_grouped[key]['base'] = round_curr(base) + tax_grouped[key]['amount'] = round_curr(amount) + return tax_grouped + + @api.model + def invoice_line_move_line_get(self): + """Append global discounts move lines""" + res = super().invoice_line_move_line_get() + for discount in self.invoice_global_discount_ids: + if not discount.discount: + continue + res.append({ + 'invoice_global_discount_id': discount.id, + 'global_discount_id': discount.global_discount_id.id, + 'type': 'global_discount', + 'name': discount.name, + 'price_unit': discount.discount_amount * -1, + 'quantity': 1, + 'price': discount.discount_amount * -1, + 'account_id': discount.account_id.id, + 'account_analytic_id': discount.account_analytic_id.id, + 'invoice_id': self.id, + }) + return res + + +class AccountInvoiceGlobalDiscount(models.Model): + _name = "account.invoice.global.discount" + _description = "Invoice Global Discount" + + name = fields.Char( + string='Discount Name', + required=True, + ) + invoice_id = fields.Many2one( + 'account.invoice', + string='Invoice', + ondelete='cascade', + index=True, + readonly=True, + ) + global_discount_id = fields.Many2one( + comodel_name='global.discount', + string='Global Discount', + readonly=True, + ) + discount = fields.Float( + string='Discount', + readonly=True, + ) + discount_display = fields.Char( + compute='_compute_discount_display', + readonly=True, + string="Discount", + ) + base = fields.Float( + string='Base discounted', + digits=dp.get_precision('Product Price'), + readonly=True, + ) + base_discounted = fields.Float( + string='Discounted amount', + digits=dp.get_precision('Product Price'), + readonly=True, + ) + currency_id = fields.Many2one( + related='invoice_id.currency_id', + readonly=True, + ) + discount_amount = fields.Monetary( + string='Discounted Amount', + compute='_compute_discount_amount', + currency_field='currency_id', + readonly=True, + ) + account_id = fields.Many2one( + comodel_name='account.account', + required=True, + string='Account', + domain="[('user_type_id.type', 'not in', ['receivable', 'payable'])]", + ) + account_analytic_id = fields.Many2one( + comodel_name='account.analytic.account', + string='Analytic account', + ) + company_id = fields.Many2one( + related='invoice_id.company_id', + readonly=True, + ) + + def _compute_discount_display(self): + """Given a discount type, we need to render a different symbol""" + for one in self: + precision = self.env['decimal.precision'].precision_get('Discount') + one.discount_display = '{0:.{1}f}%'.format( + one.discount * -1, precision) + + @api.depends('base', 'base_discounted') + def _compute_discount_amount(self): + """Compute the amount discounted""" + for one in self: + one.discount_amount = one.base - one.base_discounted diff --git a/account_global_discount/models/account_move_line.py b/account_global_discount/models/account_move_line.py new file mode 100644 index 00000000000..60fb6944c58 --- /dev/null +++ b/account_global_discount/models/account_move_line.py @@ -0,0 +1,13 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class AccountMoveLine(models.Model): + _inherit = 'account.move.line' + + global_discount_id = fields.Many2one( + comodel_name='global.discount', + string='Global Discount', + ondelete='restrict', + ) diff --git a/account_global_discount/models/global_discount.py b/account_global_discount/models/global_discount.py new file mode 100644 index 00000000000..a36f9a6f1e7 --- /dev/null +++ b/account_global_discount/models/global_discount.py @@ -0,0 +1,24 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class GlobalDiscount(models.Model): + _inherit = 'global.discount' + + account_id = fields.Many2one( + comodel_name='account.account', + string='Account', + domain="[('user_type_id.type', 'not in', ['receivable', 'payable'])]", + ) + account_analytic_id = fields.Many2one( + comodel_name='account.analytic.account', + string='Analytic account', + ) + + def _get_global_discount_vals(self, base, account_id=False, **kwargs): + """Return account as well if passed""" + res = super()._get_global_discount_vals(base) + if account_id: + res.update({'account_id': account_id}) + return res diff --git a/account_global_discount/readme/CONTRIBUTORS.rst b/account_global_discount/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..7b1dda35578 --- /dev/null +++ b/account_global_discount/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* `Tecnativa `_ + + * Pedro M. Baeza + * David Vidal + * Carlos Dauden + * Rafael Blasco diff --git a/account_global_discount/readme/DESCRIPTION.rst b/account_global_discount/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..1b2a3d1ac43 --- /dev/null +++ b/account_global_discount/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Apply global discounts to invoices diff --git a/account_global_discount/readme/USAGE.rst b/account_global_discount/readme/USAGE.rst new file mode 100644 index 00000000000..7ef8742387e --- /dev/null +++ b/account_global_discount/readme/USAGE.rst @@ -0,0 +1,14 @@ +To use this module, you need to: + +#. Go to *Settings > Parameters > Global Discounts* +#. Add a new discount that can be either by percentage or fixed amount. +#. Choose the discount scope (sales or purchases). +#. You can also restrict it to a certain company if needed. + +You can assign global discounts to partners as well: + +#. Go to a partner that is a company. +#. Go to the *Sales & Purchases* tab. +#. In section sale (if the partner is a customer), you can set sale discounts. +#. In section purchase (if the partner is a supplier), you can set purchase + discounts. diff --git a/account_global_discount/security/ir.model.access.csv b/account_global_discount/security/ir.model.access.csv new file mode 100644 index 00000000000..8ace5a399ff --- /dev/null +++ b/account_global_discount/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_invoice_global_discount_user,Invoice Global Discount Users,model_account_invoice_global_discount,base.group_user,1,0,0,0 +access_invoice_global_discount_partner_manager,Invoice Global Discount Partner Manager,model_account_invoice_global_discount,account.group_account_invoice,1,1,1,1 diff --git a/account_global_discount/security/security.xml b/account_global_discount/security/security.xml new file mode 100644 index 00000000000..e2e0ca7b775 --- /dev/null +++ b/account_global_discount/security/security.xml @@ -0,0 +1,16 @@ + + + + + + Global Discount multi-company + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + + + + diff --git a/account_global_discount/static/description/icon.png b/account_global_discount/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_global_discount/static/description/icon.svg b/account_global_discount/static/description/icon.svg new file mode 100644 index 00000000000..a7a26d0932a --- /dev/null +++ b/account_global_discount/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/account_global_discount/static/description/index.html b/account_global_discount/static/description/index.html new file mode 100644 index 00000000000..27f067420c2 --- /dev/null +++ b/account_global_discount/static/description/index.html @@ -0,0 +1,124 @@ +
+
+
+

Module name

+

This module was written to extend the functionality of ... to support ... and allow you to ...

+
+
+
+ +
+
+
+

Installation

+
+
+

To install this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Configuration

+
+
+

To configure this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Usage

+
+
+

To use this module, you need to: +

    +
  • ...
    • +
+

+

For further information, please visit: +

+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Known issues / Roadmap

+
+
+

+

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Credits

+
+
+

Contributors

+ +
+
+

Maintainer

+

+ This module is maintained by the OCA.
+ 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.
+ To contribute to this module, please visit http://odoo-community.org.
+ +

+
+
+
diff --git a/account_global_discount/tests/__init__.py b/account_global_discount/tests/__init__.py new file mode 100644 index 00000000000..e9199cd7e61 --- /dev/null +++ b/account_global_discount/tests/__init__.py @@ -0,0 +1 @@ +from . import test_global_discount diff --git a/account_global_discount/tests/test_global_discount.py b/account_global_discount/tests/test_global_discount.py new file mode 100644 index 00000000000..e794d5fbdd3 --- /dev/null +++ b/account_global_discount/tests/test_global_discount.py @@ -0,0 +1,131 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo.tests import common + + +class TestGlobalDiscount(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.account_type = cls.env['account.account.type'].create({ + 'name': 'Test', + 'type': 'receivable', + }) + cls.account = cls.env['account.account'].create({ + 'name': 'Test account', + 'code': 'TEST', + 'user_type_id': cls.account_type.id, + 'reconcile': True, + }) + cls.global_discount_obj = cls.env['global.discount'] + cls.global_discount_1 = cls.global_discount_obj.create({ + 'name': 'Test Discount 1', + 'discount_scope': 'sale', + 'discount': 20, + 'account_id': cls.account.id, + }) + cls.global_discount_2 = cls.global_discount_obj.create({ + 'name': 'Test Discount 2', + 'discount_scope': 'purchase', + 'discount': 30, + 'account_id': cls.account.id, + }) + cls.global_discount_3 = cls.global_discount_obj.create({ + 'name': 'Test Discount 3', + 'discount_scope': 'purchase', + 'discount': 50, + 'account_id': cls.account.id, + }) + cls.partner_1 = cls.env['res.partner'].create({ + 'name': 'Mr. Odoo', + }) + cls.partner_2 = cls.env['res.partner'].create({ + 'name': 'Mrs. Odoo', + }) + cls.partner_2.supplier_global_discount_ids = cls.global_discount_2 + cls.tax = cls.env['account.tax'].create({ + 'name': 'TAX 15%', + 'amount_type': 'percent', + 'type_tax_use': 'purchase', + 'amount': 15.0, + }) + cls.invoice = cls.env['account.invoice'].create({ + 'name': "Test Customer Invoice", + 'journal_id': cls.env['account.journal'].search( + [('type', '=', 'sale')])[0].id, + 'partner_id': cls.partner_1.id, + 'account_id': cls.account.id, + 'type': 'in_invoice', + }) + cls.invoice_line = cls.env['account.invoice.line'] + cls.invoice_line1 = cls.invoice_line.create({ + 'invoice_id': cls.invoice.id, + 'name': 'Line 1', + 'price_unit': 200.0, + 'account_id': cls.account.id, + 'invoice_line_tax_ids': [(6, 0, [cls.tax.id])], + 'quantity': 1, + }) + cls.invoice._onchange_invoice_line_ids() + + def test_01_global_invoice_succesive_discounts(self): + """Add global discounts to the invoice""" + self.assertAlmostEqual(self.invoice.amount_total, 230) + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 200.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 30.0) + # Global discounts are applied to the base and taxes are recomputed: + # 200 - 50% (global disc. 1) = 100 + self.invoice.global_discount_ids = self.global_discount_3 + self.invoice._onchange_global_discount_ids() + self.assertEqual(len(self.invoice.invoice_global_discount_ids), 1) + precision = self.env['decimal.precision'].precision_get('Discount') + self.assertEqual( + self.invoice.invoice_global_discount_ids.discount_display, + '-50.{}%'.format('0' * precision)) + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 100.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 15.0) + self.assertAlmostEqual(self.invoice.amount_untaxed, 100.0) + self.assertAlmostEqual(self.invoice.amount_total, 115.0) + self.assertAlmostEqual(self.invoice.amount_global_discount, -100.0) + # Global discounts are computed succecively: + # 200 - 50% (global disc. 1) = 100 + # 100 - 30% (global disc. 2) = 70 + # The global discounts amount is then 200 - 70 = 130 + self.invoice.global_discount_ids += self.global_discount_2 + self.invoice._onchange_global_discount_ids() + self.assertEqual(len(self.invoice.invoice_global_discount_ids), 2) + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 70.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 10.5) + self.assertAlmostEqual(self.invoice.amount_untaxed, 70.0) + self.assertAlmostEqual(self.invoice.amount_total, 80.5) + self.assertAlmostEqual(self.invoice.amount_global_discount, -130.0) + # Line discounts apply before global ones so: + # 200 - 20% (line discount) = 160 + # 160 - 50% (global disc. 1) = 80 + # 80 - 30% (global disc. 2) = 56 + # The global discounts amount is then 160 - 56 = 104 + self.invoice_line1.discount = 20 + self.invoice._onchange_invoice_line_ids() + self.assertEqual(len(self.invoice.invoice_global_discount_ids), 2) + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 56.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 8.4) + self.assertAlmostEqual(self.invoice.amount_untaxed, 56.0) + self.assertAlmostEqual(self.invoice.amount_total, 64.4) + self.assertAlmostEqual(self.invoice.amount_global_discount, -104.0) + + def test_02_global_invoice_discounts_from_partner(self): + """Change the partner and his global discounts go to the invoice""" + self.assertAlmostEqual(self.invoice.amount_total, 230) + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 200.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 30.0) + # When we change the parter, his global discounts are fetched depending + # on the type of the invoice. In this case, we fetch the supplier + # global discounts + self.invoice.partner_id = self.partner_2 + self.invoice._onchange_partner_id() + self.assertAlmostEqual(self.invoice.tax_line_ids.base, 140.0) + self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 21.0) + self.assertAlmostEqual(self.invoice.amount_untaxed, 140.0) + self.assertAlmostEqual(self.invoice.amount_total, 161.0) + self.assertAlmostEqual(self.invoice.amount_global_discount, -60.0) diff --git a/account_global_discount/views/account_invoice_views.xml b/account_global_discount/views/account_invoice_views.xml new file mode 100644 index 00000000000..180fb039815 --- /dev/null +++ b/account_global_discount/views/account_invoice_views.xml @@ -0,0 +1,39 @@ + + + + + + account.invoice + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/account_global_discount/views/global_discount_views.xml b/account_global_discount/views/global_discount_views.xml new file mode 100644 index 00000000000..18b91c0abb8 --- /dev/null +++ b/account_global_discount/views/global_discount_views.xml @@ -0,0 +1,33 @@ + + + + + + global.discount + + + + + + + + + + + global.discount + + + + + + + + + + + + From 8e620a5101cc32b8cc4c80d8f1234e7fa0ad7364 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 9 Apr 2020 13:50:07 +0200 Subject: [PATCH 2/5] [IMP] account_global_discount: Discounts in invoice report Give discounts info in the invoice report. --- account_global_discount/__manifest__.py | 3 +- .../i18n/account_global_discount.pot | 10 ++ account_global_discount/i18n/es.po | 165 ++++++++++++++++++ .../views/report_account_invoice.xml | 26 +++ 4 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 account_global_discount/i18n/es.po create mode 100644 account_global_discount/views/report_account_invoice.xml diff --git a/account_global_discount/__manifest__.py b/account_global_discount/__manifest__.py index 6d159693144..3db98ebfdc1 100644 --- a/account_global_discount/__manifest__.py +++ b/account_global_discount/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Global Discount', - 'version': '11.0.1.0.0', + 'version': '11.0.1.1.0', 'category': 'Accounting', 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', @@ -17,6 +17,7 @@ 'security/security.xml', 'views/account_invoice_views.xml', 'views/global_discount_views.xml', + 'views/report_account_invoice.xml', ], 'application': False, 'installable': True, diff --git a/account_global_discount/i18n/account_global_discount.pot b/account_global_discount/i18n/account_global_discount.pot index ab367aef676..7b87dfee84a 100644 --- a/account_global_discount/i18n/account_global_discount.pot +++ b/account_global_discount/i18n/account_global_discount.pot @@ -13,6 +13,16 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.report_invoice_document +msgid "Global Discounts
" +msgstr "" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.report_invoice_document +msgid "Subtotal w/o disc." +msgstr "" + #. module: account_global_discount #: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_account_id #: model:ir.model.fields,field_description:account_global_discount.field_global_discount_account_id diff --git a/account_global_discount/i18n/es.po b/account_global_discount/i18n/es.po new file mode 100644 index 00000000000..362f9e2b3e5 --- /dev/null +++ b/account_global_discount/i18n/es.po @@ -0,0 +1,165 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_global_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-04-09 13:24+0000\n" +"PO-Revision-Date: 2020-04-09 13:24+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: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.report_invoice_document +msgid "Global Discounts
" +msgstr "Descuento Global" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.report_invoice_document +msgid "Subtotal w/o disc." +msgstr "Subtotal sin desc." + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_account_id +#: model:ir.model.fields,field_description:account_global_discount.field_global_discount_account_id +msgid "Account" +msgstr "Cuenta" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_amount_untaxed_before_global_discounts +msgid "Amount Untaxed Before Discounts" +msgstr "Base Imponible sin Descuentos" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_account_analytic_id +#: model:ir.model.fields,field_description:account_global_discount.field_global_discount_account_analytic_id +msgid "Analytic account" +msgstr "Cuenta analítica" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_base +msgid "Base discounted" +msgstr "Base descontada" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_company_id +msgid "Company" +msgstr "Compañía" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_create_date +msgid "Created on" +msgstr "Creado en" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_currency_id +msgid "Currency" +msgstr "Moneda" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_display +msgid "Discount" +msgstr "Descuento" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_name +msgid "Discount Name" +msgstr "Nombre del descuento" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_amount +msgid "Discounted Amount" +msgstr "Importe Descontado" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_base_discounted +msgid "Discounted amount" +msgstr "Importe Descontado" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Discounts..." +msgstr "Descuentos..." + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_display_name +msgid "Display Name" +msgstr "Nombre mostrado" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_global_discount_id +#: model:ir.model.fields,field_description:account_global_discount.field_account_move_line_global_discount_id +msgid "Global Discount" +msgstr "Descuento Global" + +#. module: account_global_discount +#: model:ir.ui.menu,name:account_global_discount.menu_account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Global Discounts" +msgstr "Descuentos Globales" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_id +msgid "ID" +msgstr "ID (identificación)" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_invoice +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_invoice_id +msgid "Invoice" +msgstr "Factura" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_invoice_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_invoice_global_discount_ids +msgid "Invoice Global Discount" +msgstr "Descuento Global en Factura" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_ids +msgid "Invoice Global Discounts" +msgstr "Descuentos Globales en Factura" + +#. module: account_global_discount +#: model:ir.model,name:account_global_discount.model_account_move_line +msgid "Journal Item" +msgstr "Apunte contable" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount___last_update +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_write_uid +msgid "Last Updated by" +msgstr "Última actualización de" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_write_date +msgid "Last Updated on" +msgstr "Última actualización en" + +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_amount_global_discount +msgid "Total Global Discounts" +msgstr "Total Descuentos Globales" + +#. module: account_global_discount +#: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view +msgid "Untaxed Amount Before Disc." +msgstr "Base Imponible Antes Desc." diff --git a/account_global_discount/views/report_account_invoice.xml b/account_global_discount/views/report_account_invoice.xml new file mode 100644 index 00000000000..43150536a24 --- /dev/null +++ b/account_global_discount/views/report_account_invoice.xml @@ -0,0 +1,26 @@ + + + + + + From 7078ba070f274d67cb71aa167eba6c8bedf6a861 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 30 Jun 2020 12:14:55 +0200 Subject: [PATCH 3/5] [FIX] account_global_discount: link line taxes to discount move line --- account_global_discount/README.rst | 7 ++++ .../models/account_invoice.py | 33 +++++++++++-------- .../models/account_move_line.py | 4 +++ account_global_discount/readme/ROADMAP.rst | 3 ++ 4 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 account_global_discount/readme/ROADMAP.rst diff --git a/account_global_discount/README.rst b/account_global_discount/README.rst index c872aab27cf..921301286ac 100644 --- a/account_global_discount/README.rst +++ b/account_global_discount/README.rst @@ -50,6 +50,13 @@ You can assign global discounts to partners as well: #. In section purchase (if the partner is a supplier), you can set purchase discounts. +Known issues / Roadmap +====================== + +* Global Discount move lines are created for a common base amount. If that + wasn't the case, we should split discount move lines between bases and + assign proper taxes accordingly. + Bug Tracker =========== diff --git a/account_global_discount/models/account_invoice.py b/account_global_discount/models/account_invoice.py index dc77d8b3d85..11784e56aa9 100644 --- a/account_global_discount/models/account_invoice.py +++ b/account_global_discount/models/account_invoice.py @@ -37,29 +37,32 @@ class AccountInvoice(models.Model): inverse_name='invoice_id', ) - def _set_global_discounts(self): - """Get global discounts in order and apply them in chain. They will be - fetched in their sequence order """ - for inv in self: - if inv.amount_untaxed_before_global_discounts: - base = inv.amount_untaxed_before_global_discounts - else: - base = inv.amount_untaxed - invoice_global_discounts = ( - self.env['account.invoice.global.discount']) - for global_discount in inv.global_discount_ids: + def _set_global_discounts_by_tax(self): + """Create invoice global discount lines by tax and discount""" + self.ensure_one() + invoice_global_discounts = self.env['account.invoice.global.discount'] + for tax_line in self.tax_line_ids: + base = tax_line.base + for global_discount in self.global_discount_ids: discount = global_discount._get_global_discount_vals(base) invoice_global_discounts += invoice_global_discounts.new({ 'name': global_discount.display_name, - 'invoice_id': inv.id, + 'invoice_id': self.id, 'global_discount_id': global_discount.id, 'discount': global_discount.discount, 'base': base, 'base_discounted': discount['base_discounted'], 'account_id': global_discount.account_id.id, + 'tax_id': tax_line.tax_id.id, }) base = discount['base_discounted'] - inv.invoice_global_discount_ids = invoice_global_discounts + self.invoice_global_discount_ids = invoice_global_discounts + + def _set_global_discounts(self): + """Get global discounts in order and apply them in chain. They will be + fetched in their sequence order """ + for inv in self: + inv._set_global_discounts_by_tax() # Recompute line taxes according to global discounts taxes_grouped = inv.get_taxes_values() tax_lines = inv.tax_line_ids.filtered('manual') @@ -154,6 +157,7 @@ def invoice_line_move_line_get(self): 'price': discount.discount_amount * -1, 'account_id': discount.account_id.id, 'account_analytic_id': discount.account_analytic_id.id, + 'tax_ids': discount.tax_id.id, 'invoice_id': self.id, }) return res @@ -208,6 +212,9 @@ class AccountInvoiceGlobalDiscount(models.Model): currency_field='currency_id', readonly=True, ) + tax_id = fields.Many2one( + comodel_name='account.tax', + ) account_id = fields.Many2one( comodel_name='account.account', required=True, diff --git a/account_global_discount/models/account_move_line.py b/account_global_discount/models/account_move_line.py index 60fb6944c58..e21ce40ad51 100644 --- a/account_global_discount/models/account_move_line.py +++ b/account_global_discount/models/account_move_line.py @@ -11,3 +11,7 @@ class AccountMoveLine(models.Model): string='Global Discount', ondelete='restrict', ) + invoice_global_discount_id = fields.Many2one( + comodel_name='account.invoice.global.discount', + string='Invoice Global Discount', + ) diff --git a/account_global_discount/readme/ROADMAP.rst b/account_global_discount/readme/ROADMAP.rst new file mode 100644 index 00000000000..e16b0b610dc --- /dev/null +++ b/account_global_discount/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +* Global Discount move lines are created for a common base amount. If that + wasn't the case, we should split discount move lines between bases and + assign proper taxes accordingly. From 1cfcda0de24f76fa1288865a8313ec9d3af1887b Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 3 Jul 2020 11:53:32 +0200 Subject: [PATCH 4/5] [FIX] account_global_discount: More on global discount/taxes link - We need to take into account invoice lines with multiple taxes, so the link should be m2m. - Migration scripts for preserving the best information on existing installations. - Tests for checking new conditions. - Perform sanity check for not ending in an incompatible situation. - Some refactor done on onchanges for avoiding duplicating operations. - Adjust UI for not allowing to edit computed invoice global discounts. --- account_global_discount/README.rst | 7 +- account_global_discount/__manifest__.py | 3 +- .../migrations/11.0.2.0.0/post-migration.py | 55 +++++++++ .../migrations/11.0.2.0.0/pre-migration.py | 11 ++ .../models/account_invoice.py | 83 +++++++++---- .../models/account_move_line.py | 5 - account_global_discount/readme/ROADMAP.rst | 7 +- .../tests/test_global_discount.py | 109 ++++++++++++++++++ .../views/account_invoice_views.xml | 3 +- 9 files changed, 250 insertions(+), 33 deletions(-) create mode 100644 account_global_discount/migrations/11.0.2.0.0/post-migration.py create mode 100644 account_global_discount/migrations/11.0.2.0.0/pre-migration.py diff --git a/account_global_discount/README.rst b/account_global_discount/README.rst index 921301286ac..9e2d63b57aa 100644 --- a/account_global_discount/README.rst +++ b/account_global_discount/README.rst @@ -53,9 +53,10 @@ You can assign global discounts to partners as well: Known issues / Roadmap ====================== -* Global Discount move lines are created for a common base amount. If that - wasn't the case, we should split discount move lines between bases and - assign proper taxes accordingly. +* Not all the taxes combination can be compatible with global discounts, as + the generated journal items won't be correct for taxes declarations. An error + is raised in that cases. +* Currently, taxes in invoice lines are mandatory with global discounts. Bug Tracker =========== diff --git a/account_global_discount/__manifest__.py b/account_global_discount/__manifest__.py index 3db98ebfdc1..2a8400d9c23 100644 --- a/account_global_discount/__manifest__.py +++ b/account_global_discount/__manifest__.py @@ -1,8 +1,9 @@ # Copyright 2019 Tecnativa S.L. - David Vidal +# Copyright 2020 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Global Discount', - 'version': '11.0.1.1.0', + 'version': '11.0.2.0.0', 'category': 'Accounting', 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', diff --git a/account_global_discount/migrations/11.0.2.0.0/post-migration.py b/account_global_discount/migrations/11.0.2.0.0/post-migration.py new file mode 100644 index 00000000000..facd0c0500a --- /dev/null +++ b/account_global_discount/migrations/11.0.2.0.0/post-migration.py @@ -0,0 +1,55 @@ +# Copyright 2020 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade # pylint: disable=W7936 +from psycopg2 import sql + + +@openupgrade.migrate() +def migrate(env, version): + # Link the new field that points to the invoice global discount instead + # of the global discount definition + openupgrade.logged_query( + env.cr, sql.SQL(""" + UPDATE account_move_line aml + SET invoice_global_discount_id = aigd.id + FROM account_invoice_global_discount aigd + WHERE aigd.invoice_id = aml.invoice_id + AND aigd.global_discount_id = aml.{} + """).format( + sql.Identifier(openupgrade.get_legacy_name("global_discount_id")) + ) + ) + # Link to existing global discount records, all the invoice taxes as best + # effort + openupgrade.logged_query( + env.cr, """ + INSERT INTO account_invoice_global_discount_account_tax_rel + (account_invoice_global_discount_id, account_tax_id) + SELECT aigd.id, ailt.tax_id + FROM account_invoice_global_discount aigd + JOIN account_invoice_line ail ON aigd.invoice_id = ail.invoice_id + JOIN account_invoice_line_tax ailt ON ailt.invoice_line_id = ail.id + GROUP BY aigd.id, ailt.tax_id""" + ) + # Delete in prevention of manual manipulations existing tax lines linked + # to global discount journal items + openupgrade.logged_query( + env.cr, """ + DELETE FROM account_move_line_account_tax_rel rel + USING account_move_line aml + WHERE rel.account_move_line_id = aml.id + AND aml.invoice_global_discount_id IS NOT NULL""" + ) + # Link all invoice taxes in global discount existing journal items as best + # effort + openupgrade.logged_query( + env.cr, """ + INSERT INTO account_move_line_account_tax_rel + (account_move_line_id, account_tax_id) + SELECT aml.id, rel.account_tax_id + FROM account_move_line aml + JOIN account_invoice_global_discount_account_tax_rel rel + ON rel.account_invoice_global_discount_id = + aml.invoice_global_discount_id""" + ) diff --git a/account_global_discount/migrations/11.0.2.0.0/pre-migration.py b/account_global_discount/migrations/11.0.2.0.0/pre-migration.py new file mode 100644 index 00000000000..d3b95329df0 --- /dev/null +++ b/account_global_discount/migrations/11.0.2.0.0/pre-migration.py @@ -0,0 +1,11 @@ +# Copyright 2020 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade # pylint: disable=W7936 + + +@openupgrade.migrate() +def migrate(env, version): + openupgrade.rename_columns( + env.cr, {"account_move_line": [("global_discount_id", None)]} + ) diff --git a/account_global_discount/models/account_invoice.py b/account_global_discount/models/account_invoice.py index 11784e56aa9..f026a35945a 100644 --- a/account_global_discount/models/account_invoice.py +++ b/account_global_discount/models/account_invoice.py @@ -1,6 +1,7 @@ # Copyright 2019 Tecnativa - David Vidal +# Copyright 2020 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import _, api, exceptions, fields, models from odoo.addons import decimal_precision as dp @@ -35,14 +36,45 @@ class AccountInvoice(models.Model): invoice_global_discount_ids = fields.One2many( comodel_name='account.invoice.global.discount', inverse_name='invoice_id', + readonly=True, ) def _set_global_discounts_by_tax(self): - """Create invoice global discount lines by tax and discount""" + """Create invoice global discount lines by taxes combinations and + discounts. + """ self.ensure_one() + if not self.global_discount_ids: + return invoice_global_discounts = self.env['account.invoice.global.discount'] + taxes_keys = {} + # Perform a sanity check for discarding cases that will lead to + # incorrect data in discounts + for inv_line in self.invoice_line_ids: + if not inv_line.invoice_line_tax_ids: + raise exceptions.UserError(_( + "With global discounts, taxes in lines are required." + )) + for key in taxes_keys: + if key == inv_line.invoice_line_tax_ids: + break + elif key & inv_line.invoice_line_tax_ids: + raise exceptions.UserError(_( + "Incompatible taxes found for global discounts." + )) + else: + taxes_keys[inv_line.invoice_line_tax_ids] = True for tax_line in self.tax_line_ids: - base = tax_line.base + key = [] + to_create = True + for key in taxes_keys: + if tax_line.tax_id in key: + to_create = taxes_keys[key] + taxes_keys[key] = False # mark for not duplicating + break # we leave in key variable the proper taxes value + if not to_create: + continue + base = tax_line.base_before_global_discounts or tax_line.base for global_discount in self.global_discount_ids: discount = global_discount._get_global_discount_vals(base) invoice_global_discounts += invoice_global_discounts.new({ @@ -53,7 +85,7 @@ def _set_global_discounts_by_tax(self): 'base': base, 'base_discounted': discount['base_discounted'], 'account_id': global_discount.account_id.id, - 'tax_id': tax_line.tax_id.id, + 'tax_ids': [(4, x.id) for x in key], }) base = discount['base_discounted'] self.invoice_global_discount_ids = invoice_global_discounts @@ -63,17 +95,12 @@ def _set_global_discounts(self): fetched in their sequence order """ for inv in self: inv._set_global_discounts_by_tax() - # Recompute line taxes according to global discounts - taxes_grouped = inv.get_taxes_values() - tax_lines = inv.tax_line_ids.filtered('manual') - for tax in taxes_grouped.values(): - tax_lines += tax_lines.new(tax) - inv.tax_line_ids = tax_lines @api.onchange('invoice_line_ids') def _onchange_invoice_line_ids(self): + res = super()._onchange_invoice_line_ids() self._set_global_discounts() - return super()._onchange_invoice_line_ids() + return res @api.onchange('partner_id', 'company_id') def _onchange_partner_id(self): @@ -86,14 +113,12 @@ def _onchange_partner_id(self): self.partner_id.supplier_global_discount_ids): self.global_discount_ids = ( self.partner_id.supplier_global_discount_ids) - self._set_global_discounts() return res @api.onchange('global_discount_ids') def _onchange_global_discount_ids(self): """Trigger global discount lines to recompute all""" - self._set_global_discounts() - return + return self._onchange_invoice_line_ids() @api.depends('invoice_line_ids.price_subtotal', 'tax_line_ids.amount', 'tax_line_ids.amount_rounding', 'currency_id', 'company_id', @@ -126,10 +151,12 @@ def _compute_amount(self): self.amount_untaxed_signed = amount_untaxed_signed * sign def get_taxes_values(self): + """Override this computation for adding global discount to taxes.""" round_curr = self.currency_id.round tax_grouped = super().get_taxes_values() for key in tax_grouped.keys(): base = tax_grouped[key]['base'] + tax_grouped[key]['base_before_global_discounts'] = base amount = tax_grouped[key]['amount'] for discount in self.global_discount_ids: base = discount._get_global_discount_vals( @@ -147,22 +174,38 @@ def invoice_line_move_line_get(self): for discount in self.invoice_global_discount_ids: if not discount.discount: continue - res.append({ + # Traverse upstream result for taking existing dictionary vals + inv_lines = self.invoice_line_ids.filtered( + lambda x: x.invoice_line_tax_ids == discount.tax_ids) + discount_dict = {} + for move_line_dict in res: + if move_line_dict.get("invl_id", 0) in inv_lines.ids: + discount_dict.update(move_line_dict) + # Change needed values for the global discount + discount_dict.update({ 'invoice_global_discount_id': discount.id, - 'global_discount_id': discount.global_discount_id.id, 'type': 'global_discount', - 'name': discount.name, + 'name': "%s - %s" % ( + discount.name, ", ".join(discount.tax_ids.mapped("name"))), 'price_unit': discount.discount_amount * -1, 'quantity': 1, 'price': discount.discount_amount * -1, 'account_id': discount.account_id.id, 'account_analytic_id': discount.account_analytic_id.id, - 'tax_ids': discount.tax_id.id, - 'invoice_id': self.id, }) + res.append(discount_dict) return res +class AccountInvoiceTax(models.Model): + _inherit = "account.invoice.tax" + + base_before_global_discounts = fields.Monetary( + string='Amount Untaxed Before Discounts', + readonly=True, + ) + + class AccountInvoiceGlobalDiscount(models.Model): _name = "account.invoice.global.discount" _description = "Invoice Global Discount" @@ -212,7 +255,7 @@ class AccountInvoiceGlobalDiscount(models.Model): currency_field='currency_id', readonly=True, ) - tax_id = fields.Many2one( + tax_ids = fields.Many2many( comodel_name='account.tax', ) account_id = fields.Many2one( diff --git a/account_global_discount/models/account_move_line.py b/account_global_discount/models/account_move_line.py index e21ce40ad51..5116ebd8cdb 100644 --- a/account_global_discount/models/account_move_line.py +++ b/account_global_discount/models/account_move_line.py @@ -6,11 +6,6 @@ class AccountMoveLine(models.Model): _inherit = 'account.move.line' - global_discount_id = fields.Many2one( - comodel_name='global.discount', - string='Global Discount', - ondelete='restrict', - ) invoice_global_discount_id = fields.Many2one( comodel_name='account.invoice.global.discount', string='Invoice Global Discount', diff --git a/account_global_discount/readme/ROADMAP.rst b/account_global_discount/readme/ROADMAP.rst index e16b0b610dc..68997140579 100644 --- a/account_global_discount/readme/ROADMAP.rst +++ b/account_global_discount/readme/ROADMAP.rst @@ -1,3 +1,4 @@ -* Global Discount move lines are created for a common base amount. If that - wasn't the case, we should split discount move lines between bases and - assign proper taxes accordingly. +* Not all the taxes combination can be compatible with global discounts, as + the generated journal items won't be correct for taxes declarations. An error + is raised in that cases. +* Currently, taxes in invoice lines are mandatory with global discounts. diff --git a/account_global_discount/tests/test_global_discount.py b/account_global_discount/tests/test_global_discount.py index e794d5fbdd3..a51b21f0405 100644 --- a/account_global_discount/tests/test_global_discount.py +++ b/account_global_discount/tests/test_global_discount.py @@ -1,5 +1,7 @@ # Copyright 2019 Tecnativa - David Vidal +# Copyright 2020 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import exceptions from odoo.tests import common @@ -123,9 +125,116 @@ def test_02_global_invoice_discounts_from_partner(self): # on the type of the invoice. In this case, we fetch the supplier # global discounts self.invoice.partner_id = self.partner_2 + # trigger onchanges mimicking UI self.invoice._onchange_partner_id() + self.invoice._onchange_global_discount_ids() self.assertAlmostEqual(self.invoice.tax_line_ids.base, 140.0) self.assertAlmostEqual(self.invoice.tax_line_ids.amount, 21.0) self.assertAlmostEqual(self.invoice.amount_untaxed, 140.0) self.assertAlmostEqual(self.invoice.amount_total, 161.0) self.assertAlmostEqual(self.invoice.amount_global_discount, -60.0) + + def test_03_multiple_taxes_multi_line(self): + tax2 = self.env['account.tax'].create({ + 'name': 'TAX 20%', + 'amount_type': 'percent', + 'type_tax_use': 'purchase', + 'amount': 20.0, + }) + self.invoice_line.create({ + 'invoice_id': self.invoice.id, + 'name': 'Line 2', + 'price_unit': 100.0, + 'account_id': self.account.id, + 'invoice_line_tax_ids': [(6, 0, [tax2.id])], + 'quantity': 1, + }) + self.invoice.global_discount_ids = self.global_discount_1 + self.invoice._onchange_global_discount_ids() + # Global discounts are applied to the base and taxes are recomputed: + # 300 - 20% (global disc. 1) = 240 + self.assertEqual(len(self.invoice.invoice_global_discount_ids), 2) + discount_tax_15 = self.invoice.invoice_global_discount_ids.filtered( + lambda x: x.tax_ids == self.tax) + discount_tax_20 = self.invoice.invoice_global_discount_ids.filtered( + lambda x: x.tax_ids == tax2) + self.assertAlmostEqual(discount_tax_15.discount_amount, 40) + self.assertAlmostEqual(discount_tax_20.discount_amount, 20) + tax_line_15 = self.invoice.tax_line_ids.filtered( + lambda x: x.tax_id == self.tax) + tax_line_20 = self.invoice.tax_line_ids.filtered( + lambda x: x.tax_id == tax2) + self.assertAlmostEqual(tax_line_15.base, 160) + self.assertAlmostEqual(tax_line_15.amount, 24) + self.assertAlmostEqual(tax_line_20.base, 80.0) + self.assertAlmostEqual(tax_line_20.amount, 16) + self.assertAlmostEqual(self.invoice.amount_untaxed, 240.0) + self.assertAlmostEqual(self.invoice.amount_total, 280) + self.assertAlmostEqual(self.invoice.amount_global_discount, -60.0) + # Validate invoice for seeing result + self.invoice.action_invoice_open() + self.assertEqual(len(self.invoice.move_id.line_ids), 7) + + def test_04_multiple_taxes_same_line(self): + tax2 = self.env['account.tax'].create({ + 'name': 'Retention 20%', + 'amount_type': 'percent', + 'type_tax_use': 'purchase', + 'amount': -20.0, # negative for testing more use cases + }) + self.invoice_line1.invoice_line_tax_ids = [(4, tax2.id)] + self.invoice.global_discount_ids = self.global_discount_1 + self.invoice._onchange_global_discount_ids() + # Global discounts are applied to the base and taxes are recomputed: + # 300 - 20% (global disc. 1) = 240 + self.assertEqual(len(self.invoice.invoice_global_discount_ids), 1) + self.assertAlmostEqual( + self.invoice.invoice_global_discount_ids.discount_amount, 40) + self.assertEqual( + self.invoice.invoice_global_discount_ids.tax_ids, self.tax + tax2) + tax_line_15 = self.invoice.tax_line_ids.filtered( + lambda x: x.tax_id == self.tax) + tax_line_20 = self.invoice.tax_line_ids.filtered( + lambda x: x.tax_id == tax2) + self.assertAlmostEqual(tax_line_15.base, 160) + self.assertAlmostEqual(tax_line_15.amount, 24) + self.assertAlmostEqual(tax_line_20.base, 160.0) + self.assertAlmostEqual(tax_line_20.amount, -32) + self.assertAlmostEqual(self.invoice.amount_untaxed, 160.0) + self.assertAlmostEqual(self.invoice.amount_total, 152) + self.assertAlmostEqual(self.invoice.amount_global_discount, -40.0) + # Validate invoice for seeing result + self.invoice.action_invoice_open() + move = self.invoice.move_id + self.assertEqual(len(move.line_ids), 5) + line = move.line_ids.filtered(lambda x: "Test Discount 1" in x.name) + self.assertEqual(line.tax_ids, self.tax + tax2) + + def test_05_incompatible_taxes(self): + # Line 1 with tax and tax2 + # Line 2 with only tax2 + tax2 = self.env['account.tax'].create({ + 'name': 'Retention 20%', + 'amount_type': 'percent', + 'type_tax_use': 'purchase', + 'amount': -20.0, # negative for testing more use cases + }) + self.invoice_line1.invoice_line_tax_ids = [ + (4, tax2.id), (4, self.tax.id)] + self.invoice_line.create({ + 'invoice_id': self.invoice.id, + 'name': 'Line 2', + 'price_unit': 100.0, + 'account_id': self.account.id, + 'invoice_line_tax_ids': [(6, 0, [tax2.id])], + 'quantity': 1, + }) + self.invoice.global_discount_ids = self.global_discount_1 + with self.assertRaises(exceptions.UserError): + self.invoice._onchange_global_discount_ids() + + def test_06_no_taxes(self): + self.invoice_line1.invoice_line_tax_ids = False + self.invoice.global_discount_ids = self.global_discount_1 + with self.assertRaises(exceptions.UserError): + self.invoice._onchange_global_discount_ids() diff --git a/account_global_discount/views/account_invoice_views.xml b/account_global_discount/views/account_invoice_views.xml index 180fb039815..a65bc43b109 100644 --- a/account_global_discount/views/account_invoice_views.xml +++ b/account_global_discount/views/account_invoice_views.xml @@ -16,7 +16,7 @@ - + @@ -27,6 +27,7 @@ + From f59aaca84b699f2752f35e2e79d52bc49f95bcdb Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 8 Jul 2020 11:07:47 +0200 Subject: [PATCH 5/5] [MIG] acount_global_discount: Migration to 12.0 - Standard procedure - Make test more resilient --- account_global_discount/README.rst | 10 +- account_global_discount/__manifest__.py | 2 +- .../i18n/account_global_discount.pot | 7 +- account_global_discount/i18n/es.po | 15 +- .../models/account_invoice.py | 2 +- .../static/description/index.html | 578 ++++++++++++++---- .../tests/test_global_discount.py | 8 +- oca_dependencies.txt | 1 + 8 files changed, 483 insertions(+), 140 deletions(-) diff --git a/account_global_discount/README.rst b/account_global_discount/README.rst index 9e2d63b57aa..b815bac018d 100644 --- a/account_global_discount/README.rst +++ b/account_global_discount/README.rst @@ -14,13 +14,13 @@ Account Global Discount :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/11.0/account_global_discount + :target: https://github.com/OCA/account-invoicing/tree/12.0/account_global_discount :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-11-0/account-invoicing-11-0-account_global_discount + :target: https://translation.odoo-community.org/projects/account-invoicing-12-0/account-invoicing-12-0-account_global_discount :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/95/11.0 + :target: https://runbot.odoo-community.org/runbot/95/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -64,7 +64,7 @@ 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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -99,6 +99,6 @@ 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. -This module is part of the `OCA/account-invoicing `_ project on GitHub. +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_global_discount/__manifest__.py b/account_global_discount/__manifest__.py index 2a8400d9c23..a9f76e9e0d5 100644 --- a/account_global_discount/__manifest__.py +++ b/account_global_discount/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Global Discount', - 'version': '11.0.2.0.0', + 'version': '12.0.1.0.0', 'category': 'Accounting', 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', diff --git a/account_global_discount/i18n/account_global_discount.pot b/account_global_discount/i18n/account_global_discount.pot index 7b87dfee84a..596f98354d7 100644 --- a/account_global_discount/i18n/account_global_discount.pot +++ b/account_global_discount/i18n/account_global_discount.pot @@ -66,11 +66,15 @@ msgid "Currency" msgstr "" #. module: account_global_discount -#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount #: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_display msgid "Discount" msgstr "" +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount +msgid "Discount (number)" +msgstr "" + #. module: account_global_discount #: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_name msgid "Discount Name" @@ -160,4 +164,3 @@ msgstr "" #: model:ir.ui.view,arch_db:account_global_discount.account_invoice_form_view msgid "Untaxed Amount Before Disc." msgstr "" - diff --git a/account_global_discount/i18n/es.po b/account_global_discount/i18n/es.po index 362f9e2b3e5..bb94f0724b4 100644 --- a/account_global_discount/i18n/es.po +++ b/account_global_discount/i18n/es.po @@ -6,15 +6,16 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-09 13:24+0000\n" -"PO-Revision-Date: 2020-04-09 13:24+0000\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2020-07-08 11:07+0200\n" "Last-Translator: <>\n" "Language-Team: \n" -"Language: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" +"X-Generator: Poedit 2.3\n" #. module: account_global_discount #: model:ir.ui.view,arch_db:account_global_discount.report_invoice_document @@ -69,11 +70,15 @@ msgid "Currency" msgstr "Moneda" #. module: account_global_discount -#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount #: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount_display msgid "Discount" msgstr "Descuento" +#. module: account_global_discount +#: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_discount +msgid "Discount (number)" +msgstr "Descuento (número)" + #. module: account_global_discount #: model:ir.model.fields,field_description:account_global_discount.field_account_invoice_global_discount_name msgid "Discount Name" diff --git a/account_global_discount/models/account_invoice.py b/account_global_discount/models/account_invoice.py index f026a35945a..df24247c1a8 100644 --- a/account_global_discount/models/account_invoice.py +++ b/account_global_discount/models/account_invoice.py @@ -227,7 +227,7 @@ class AccountInvoiceGlobalDiscount(models.Model): readonly=True, ) discount = fields.Float( - string='Discount', + string='Discount (number)', readonly=True, ) discount_display = fields.Char( diff --git a/account_global_discount/static/description/index.html b/account_global_discount/static/description/index.html index 27f067420c2..e7b6d9d7b93 100644 --- a/account_global_discount/static/description/index.html +++ b/account_global_discount/static/description/index.html @@ -1,124 +1,454 @@ -
-
-
-

Module name

-

This module was written to extend the functionality of ... to support ... and allow you to ...

-
-
-
- -
-
-
-

Installation

-
-
-

To install this module, you need to: -

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Configuration

-
-
-

To configure this module, you need to: -

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Usage

-
-
-

To use this module, you need to: -

    -
  • ...
    • -
-

-

For further information, please visit: -

-

-
-
-
- - - -
-
-
-
- -
-
-
-

Known issues / Roadmap

-
-
-

-

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Credits

-
-
-

Contributors

- -
-
-

Maintainer

-

- This module is maintained by the OCA.
- 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.
- To contribute to this module, please visit http://odoo-community.org.
- -

-
-
-
+ + + + + + +Account Global Discount + + + +
+

Account Global Discount

+ + +

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

+

Apply global discounts to invoices

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Settings > Parameters > Global Discounts
    2. +
  2. Add a new discount that can be either by percentage or fixed amount.
    3. +
  3. Choose the discount scope (sales or purchases).
    4. +
  4. You can also restrict it to a certain company if needed.
    5. +
+

You can assign global discounts to partners as well:

+
    +
  1. Go to a partner that is a company.
    2. +
  2. Go to the Sales & Purchases tab.
    3. +
  3. In section sale (if the partner is a customer), you can set sale discounts.
    4. +
  4. In section purchase (if the partner is a supplier), you can set purchase +discounts.
    5. +
+
+
+

Known issues / Roadmap

+
    +
  • Not all the taxes combination can be compatible with global discounts, as +the generated journal items won’t be correct for taxes declarations. An error +is raised in that cases.
    • +
  • Currently, taxes in invoice lines are mandatory with global discounts.
    • +
+
+
+

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 smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Tecnativa
      +
    • Pedro M. Baeza
      • +
    • David Vidal
      • +
    • Carlos Dauden
      • +
    • Rafael Blasco
      • +
    +
    • +
+
+
+

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.

+

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_global_discount/tests/test_global_discount.py b/account_global_discount/tests/test_global_discount.py index a51b21f0405..f55ffab849d 100644 --- a/account_global_discount/tests/test_global_discount.py +++ b/account_global_discount/tests/test_global_discount.py @@ -52,10 +52,14 @@ def setUpClass(cls): 'type_tax_use': 'purchase', 'amount': 15.0, }) + cls.journal = cls.env["account.journal"].create({ + "name": "Test purchase journal", + "code": "TPUR", + "type": "purchase", + }) cls.invoice = cls.env['account.invoice'].create({ 'name': "Test Customer Invoice", - 'journal_id': cls.env['account.journal'].search( - [('type', '=', 'sale')])[0].id, + 'journal_id': cls.journal.id, 'partner_id': cls.partner_1.id, 'account_id': cls.account.id, 'type': 'in_invoice', diff --git a/oca_dependencies.txt b/oca_dependencies.txt index 37dcaf348a5..1fad10c45b2 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -3,4 +3,5 @@ product-attribute purchase-workflow queue brand +server-backend stock-logistics-workflow