diff --git a/oca_dependencies.txt b/oca_dependencies.txt index d9e0cd6649d..eb3eb63a286 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1,3 +1,4 @@ +account-invoicing server-tools product-attribute server-ux diff --git a/purchase_triple_discount/README.rst b/purchase_triple_discount/README.rst index 4f88069330e..3758da6f254 100644 --- a/purchase_triple_discount/README.rst +++ b/purchase_triple_discount/README.rst @@ -1,14 +1,38 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -======================== -Purchase Triple Discount -======================== +=============================== +Account Invoice Triple 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%2Fpurchase--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/purchase-workflow/tree/11.0/purchase_triple_discount + :alt: OCA/purchase-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/purchase-workflow-11-0/purchase-workflow-11-0-purchase_triple_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/142/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to have three successive discounts on every purchase order line. +**Table of contents** + +.. contents:: + :local: + Usage ===== @@ -30,47 +54,56 @@ Unit price: 600.00 -> - Disc. 1 = 50% -> Amount = 300.00 - Disc. 2 = -5% -> Amount = 315.00 -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/142/10.0 - -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 smash it by providing detailed and welcomed feedback. +* When the purchase order is validated, the discounts will be added to the + corresponding vendor pricelist. +* Vendor pricelists can be edited as well with their corresponding new second + and third discounts. +* A default second or third discount can be set in every vendor + *Sale & Purchases* tab. Known issues / Roadmap ====================== * Include second and third discount in purchase order report. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ -* David Vidal +* `Tecnativa `_: -Maintainer ----------- + * David Vidal + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -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 https://odoo-community.org. +This module is part of the `OCA/purchase-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_triple_discount/__init__.py b/purchase_triple_discount/__init__.py index cde864bae21..0650744f6bc 100644 --- a/purchase_triple_discount/__init__.py +++ b/purchase_triple_discount/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/purchase_triple_discount/__manifest__.py b/purchase_triple_discount/__manifest__.py index 7736ff5f17d..3054422fdaa 100644 --- a/purchase_triple_discount/__manifest__.py +++ b/purchase_triple_discount/__manifest__.py @@ -1,21 +1,22 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Account Invoice Triple Discount', - 'version': '10.0.1.1.0', + 'version': '11.0.1.0.0', 'category': 'Purchase Management', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', - 'website': 'https://tecnativa.com', + 'website': 'https://github.com/OCA/purchase-workflow', 'license': 'AGPL-3', 'summary': 'Manage triple discount on purchase order lines', 'depends': [ - 'purchase_discount', + 'product_supplierinfo_discount', 'account_invoice_triple_discount', ], 'data': [ + 'views/product_supplierinfo_view.xml', 'views/purchase_view.xml', + 'views/res_partner_view.xml', ], 'installable': True, } diff --git a/purchase_triple_discount/models/__init__.py b/purchase_triple_discount/models/__init__.py index c72976ae1ea..42194fa4c43 100644 --- a/purchase_triple_discount/models/__init__.py +++ b/purchase_triple_discount/models/__init__.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- - from . import account_invoice +from . import procurement_rule +from . import product_supplierinfo from . import purchase_order +from . import res_partner diff --git a/purchase_triple_discount/models/account_invoice.py b/purchase_triple_discount/models/account_invoice.py index 18cb43c3a37..8c2e650addd 100644 --- a/purchase_triple_discount/models/account_invoice.py +++ b/purchase_triple_discount/models/account_invoice.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/purchase_triple_discount/models/procurement_rule.py b/purchase_triple_discount/models/procurement_rule.py new file mode 100644 index 00000000000..75ef03cada9 --- /dev/null +++ b/purchase_triple_discount/models/procurement_rule.py @@ -0,0 +1,25 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class ProcurementRule(models.Model): + _inherit = 'procurement.rule' + + def _prepare_purchase_order_line(self, product_id, product_qty, + product_uom, values, po, supplier): + """Apply the discount to the created purchase order""" + res = super(ProcurementRule, self)._prepare_purchase_order_line( + product_id, product_qty, product_uom, values, po, supplier) + date = None + if po.date_order: + date = fields.Date.to_string( + fields.Date.from_string(po.date_order)) + seller = product_id._select_seller( + partner_id=supplier.name, + quantity=product_qty, + date=date, uom_id=product_uom) + if seller: + res['discount2'] = seller.discount2 + res['discount3'] = seller.discount3 + return res diff --git a/purchase_triple_discount/models/product_supplierinfo.py b/purchase_triple_discount/models/product_supplierinfo.py new file mode 100644 index 00000000000..353007eea5b --- /dev/null +++ b/purchase_triple_discount/models/product_supplierinfo.py @@ -0,0 +1,43 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import models, fields, api +import odoo.addons.decimal_precision as dp + + +class ProductSupplierInfo(models.Model): + _inherit = 'product.supplierinfo' + + discount2 = fields.Float( + string='Discount 2 (%)', + digits=dp.get_precision('Discount'), + ) + discount3 = fields.Float( + string='Discount 3 (%)', + digits=dp.get_precision('Discount'), + ) + + @api.onchange('name') + def onchange_name(self): + """Apply the default supplier discounts of the selected supplier""" + for supplierinfo in self.filtered('name'): + supplierinfo.discount2 = ( + supplierinfo.name.default_supplierinfo_discount2) + supplierinfo.discount3 = ( + supplierinfo.name.default_supplierinfo_discount3) + return super().onchange_name() + + @api.model + def create(self, vals): + """Insert discounts 2 and 3 from context from purchase.order's + _add_supplier_to_product method""" + if ('discount2_map' in self.env.context and + not vals.get('discount2') and + vals['product_tmpl_id'] in self.env.context['discount2_map']): + vals['discount2'] = self.env.context['discount2_map'][ + vals['product_tmpl_id']] + if ('discount3_map' in self.env.context and + not vals.get('discount3') and + vals['product_tmpl_id'] in self.env.context['discount3_map']): + vals['discount3'] = self.env.context['discount3_map'][ + vals['product_tmpl_id']] + return super(ProductSupplierInfo, self).create(vals) diff --git a/purchase_triple_discount/models/purchase_order.py b/purchase_triple_discount/models/purchase_order.py index c2b2d363952..90fecd8fd1b 100644 --- a/purchase_triple_discount/models/purchase_order.py +++ b/purchase_triple_discount/models/purchase_order.py @@ -1,11 +1,27 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Tecnativa - David Vidal +# Copyright 2017-19 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - from odoo import api, fields, models from odoo.addons import decimal_precision as dp +class PurchaseOrder(models.Model): + _inherit = 'purchase.order' + + def _add_supplier_to_product(self): + """Insert a mapping of products to discounts to be picked up + in supplierinfo's create()""" + self.ensure_one() + discount2_map = dict( + [(line.product_id.product_tmpl_id.id, line.discount2) + for line in self.order_line.filtered('discount2')]) + discount3_map = dict( + [(line.product_id.product_tmpl_id.id, line.discount3) + for line in self.order_line.filtered('discount3')]) + return super(PurchaseOrder, self.with_context( + discount2_map=discount2_map, discount3_map=discount3_map) + )._add_supplier_to_product() + + class PurchaseOrderLine(models.Model): _inherit = "purchase.order.line" @@ -16,13 +32,11 @@ def _compute_amount(self): discount2 = fields.Float( 'Disc. 2 (%)', digits=dp.get_precision('Discount'), - default=0.0, ) discount3 = fields.Float( 'Disc. 3 (%)', digits=dp.get_precision('Discount'), - default=0.0, ) _sql_constraints = [ @@ -40,3 +54,23 @@ def _get_discounted_price_unit(self): if self.discount3: price_unit *= (1 - self.discount3 / 100.0) return price_unit + + @api.onchange('product_qty', 'product_uom') + def _onchange_quantity(self): + """ + Check if a discount is defined into the supplier info and if so then + apply it to the current purchase order line + """ + res = super(PurchaseOrderLine, self)._onchange_quantity() + if self.product_id: + date = None + if self.order_id.date_order: + date = fields.Date.to_string( + fields.Date.from_string(self.order_id.date_order)) + product_supplierinfo = self.product_id._select_seller( + partner_id=self.partner_id, quantity=self.product_qty, + date=date, uom_id=self.product_uom) + if product_supplierinfo: + self.discount2 = product_supplierinfo.discount2 + self.discount3 = product_supplierinfo.discount3 + return res diff --git a/purchase_triple_discount/models/res_partner.py b/purchase_triple_discount/models/res_partner.py new file mode 100644 index 00000000000..6e64e7977f2 --- /dev/null +++ b/purchase_triple_discount/models/res_partner.py @@ -0,0 +1,21 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import models, fields +from odoo.addons import decimal_precision as dp + + +class ResPartner(models.Model): + _inherit = "res.partner" + + default_supplierinfo_discount2 = fields.Float( + string='Default Supplier Discount 2 (%)', + digits=dp.get_precision('Discount'), + help="This value will be used as the default one, for each new " + "supplierinfo line depending on that supplier.", + ) + default_supplierinfo_discount3 = fields.Float( + string='Default Supplier Discount 3 (%)', + digits=dp.get_precision('Discount'), + help="This value will be used as the default one, for each new " + "supplierinfo line depending on that supplier.", + ) diff --git a/purchase_triple_discount/readme/CONTRIBUTORS.rst b/purchase_triple_discount/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..0ff1feb5358 --- /dev/null +++ b/purchase_triple_discount/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + + * David Vidal diff --git a/purchase_triple_discount/readme/DESCRIPTION.rst b/purchase_triple_discount/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..1e65e34ddb3 --- /dev/null +++ b/purchase_triple_discount/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows to have three successive discounts on every purchase order +line. diff --git a/purchase_triple_discount/readme/ROADMAP.rst b/purchase_triple_discount/readme/ROADMAP.rst new file mode 100644 index 00000000000..9747b4c7b17 --- /dev/null +++ b/purchase_triple_discount/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Include second and third discount in purchase order report. diff --git a/purchase_triple_discount/readme/USAGE.rst b/purchase_triple_discount/readme/USAGE.rst new file mode 100644 index 00000000000..00e0f487d7f --- /dev/null +++ b/purchase_triple_discount/readme/USAGE.rst @@ -0,0 +1,24 @@ +Create a new purchase order and add discounts in any of the three discount +fields given. They go in order of precedence so discount 2 will be calculated +over discount 1 and discount 3 over the result of discount 2. For example, +let's divide by two on every discount: + +Unit price: 600.00 -> + + - Disc. 1 = 50% -> Amount = 300.00 + - Disc. 2 = 50% -> Amount = 150.00 + - Disc. 3 = 50% -> Amount = 75.00 + +You can also use negative values to charge instead of discount: + +Unit price: 600.00 -> + + - Disc. 1 = 50% -> Amount = 300.00 + - Disc. 2 = -5% -> Amount = 315.00 + +* When the purchase order is validated, the discounts will be added to the + corresponding vendor pricelist. +* Vendor pricelists can be edited as well with their corresponding new second + and third discounts. +* A default second or third discount can be set in every vendor + *Sale & Purchases* tab. diff --git a/purchase_triple_discount/static/description/index.html b/purchase_triple_discount/static/description/index.html new file mode 100644 index 00000000000..090f2968d37 --- /dev/null +++ b/purchase_triple_discount/static/description/index.html @@ -0,0 +1,465 @@ + + + + + + +Account Invoice Triple Discount + + + +
+

Account Invoice Triple Discount

+ + +

Beta License: AGPL-3 OCA/purchase-workflow Translate me on Weblate Try me on Runbot

+

This module allows to have three successive discounts on every purchase order +line.

+

Table of contents

+ +
+

Usage

+

Create a new purchase order and add discounts in any of the three discount +fields given. They go in order of precedence so discount 2 will be calculated +over discount 1 and discount 3 over the result of discount 2. For example, +let’s divide by two on every discount:

+

Unit price: 600.00 ->

+
+
    +
  • Disc. 1 = 50% -> Amount = 300.00
    • +
  • Disc. 2 = 50% -> Amount = 150.00
    • +
  • Disc. 3 = 50% -> Amount = 75.00
    • +
+
+

You can also use negative values to charge instead of discount:

+

Unit price: 600.00 ->

+
+
    +
  • Disc. 1 = 50% -> Amount = 300.00
    • +
  • Disc. 2 = -5% -> Amount = 315.00
    • +
+
+
    +
  • When the purchase order is validated, the discounts will be added to the +corresponding vendor pricelist.
    • +
  • Vendor pricelists can be edited as well with their corresponding new second +and third discounts.
    • +
  • A default second or third discount can be set in every vendor +Sale & Purchases tab.
    • +
+
+
+

Known issues / Roadmap

+
    +
  • Include second and third discount in purchase order report.
    • +
+
+
+

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

+ +
+
+

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/purchase-workflow project on GitHub.

+

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

+
+
+
+ + diff --git a/purchase_triple_discount/tests/__init__.py b/purchase_triple_discount/tests/__init__.py index b8e666681b0..19588b827ca 100644 --- a/purchase_triple_discount/tests/__init__.py +++ b/purchase_triple_discount/tests/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import test_purchase_discount diff --git a/purchase_triple_discount/tests/test_purchase_discount.py b/purchase_triple_discount/tests/test_purchase_discount.py index ac4f0b3e73d..ba126d8639f 100644 --- a/purchase_triple_discount/tests/test_purchase_discount.py +++ b/purchase_triple_discount/tests/test_purchase_discount.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Tecnativa - David Vidal +# Copyright 2017-19 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tests import common @@ -10,9 +9,13 @@ class TestPurchaseOrder(common.SavepointCase): @classmethod def setUpClass(cls): super(TestPurchaseOrder, cls).setUpClass() + cls.supplierinfo_obj = cls.env['product.supplierinfo'] cls.partner = cls.env['res.partner'].create({ 'name': 'Mr. Odoo', }) + cls.partner2 = cls.env['res.partner'].create({ + 'name': 'Mrs. Odoo', + }) cls.product1 = cls.env['product.product'].create({ 'name': 'Test Product 1', 'purchase_method': 'purchase', @@ -21,6 +24,20 @@ def setUpClass(cls): 'name': 'Test Product 2', 'purchase_method': 'purchase', }) + cls.supplierinfo = cls.supplierinfo_obj.create({ + 'min_qty': 0.0, + 'name': cls.partner2.id, + 'product_tmpl_id': cls.product1.product_tmpl_id.id, + 'discount': 10, + 'discount2': 20, + 'discount3': 30, + }) + cls.supplierinfo2 = cls.supplierinfo_obj.create({ + 'min_qty': 10.0, + 'name': cls.partner2.id, + 'product_tmpl_id': cls.product1.product_tmpl_id.id, + 'discount3': 50, + }) cls.tax = cls.env['account.tax'].create({ 'name': 'TAX 15%', 'amount_type': 'percent', @@ -28,7 +45,10 @@ def setUpClass(cls): 'amount': 15.0, }) cls.order = cls.env['purchase.order'].create({ - 'partner_id': cls.partner.id + 'partner_id': cls.partner.id, + }) + cls.order2 = cls.env['purchase.order'].create({ + 'partner_id': cls.partner2.id, }) po_line = cls.env['purchase.order.line'] cls.po_line1 = po_line.create({ @@ -51,6 +71,16 @@ def setUpClass(cls): 'taxes_id': [(6, 0, [cls.tax.id])], 'price_unit': 60.0, }) + cls.po_line3 = po_line.create({ + 'order_id': cls.order2.id, + 'product_id': cls.product1.id, + 'date_planned': '2020-01-01 00:00:00', + 'name': 'Line 1', + 'product_qty': 1.0, + 'product_uom': cls.product1.uom_id.id, + 'taxes_id': [(6, 0, [cls.tax.id])], + 'price_unit': 600.0, + }) def test_01_purchase_order_classic_discount(self): """ Tests with single discount """ @@ -123,3 +153,52 @@ def test_04_purchase_order_triple_discount_invoicing(self): self.assertEqual(self.po_line2.discount3, self.invoice.invoice_line_ids[1].discount3) self.assertEqual(self.order.amount_total, self.invoice.amount_total) + + def test_05_purchase_order_default_discounts(self): + self.po_line3._onchange_quantity() + self.assertEquals(self.po_line3.discount, 10) + self.assertEquals(self.po_line3.discount2, 20) + self.assertEquals(self.po_line3.discount3, 30) + self.po_line3.product_qty = 10 + self.po_line3._onchange_quantity() + self.assertFalse(self.po_line3.discount) + self.assertFalse(self.po_line3.discount2) + self.assertEquals(self.po_line3.discount3, 50) + + def test_06_default_supplier_discounts(self): + self.partner2.default_supplierinfo_discount = 11 + self.partner2.default_supplierinfo_discount2 = 22 + self.partner2.default_supplierinfo_discount3 = 33 + supplierinfo = self.supplierinfo_obj.new({ + 'min_qty': 0.0, + 'name': self.partner2.id, + 'product_tmpl_id': self.product1.product_tmpl_id.id, + 'discount': 10, + }) + supplierinfo.onchange_name() + self.assertEquals(supplierinfo.discount, 11) + self.assertEquals(supplierinfo.discount2, 22) + self.assertEquals(supplierinfo.discount3, 33) + + def test_07_supplierinfo_from_purchaseorder(self): + self.order2.order_line.create({ + 'order_id': self.order2.id, + 'product_id': self.product2.id, + 'date_planned': '2020-01-01 00:00:00', + 'name': 'Line 2', + 'product_qty': 1.0, + 'product_uom': self.product2.uom_id.id, + 'taxes_id': [(6, 0, [self.tax.id])], + 'price_unit': 999.0, + 'discount': 11.11, + 'discount2': 22.22, + 'discount3': 33.33, + }) + self.order2.button_confirm() + seller = self.supplierinfo_obj.search([ + ('name', '=', self.partner2.id), + ('product_tmpl_id', '=', self.product2.product_tmpl_id.id)]) + self.assertTrue(seller) + self.assertEqual(seller.discount, 11.11) + self.assertEqual(seller.discount2, 22.22) + self.assertEqual(seller.discount3, 33.33) diff --git a/purchase_triple_discount/views/product_supplierinfo_view.xml b/purchase_triple_discount/views/product_supplierinfo_view.xml new file mode 100644 index 00000000000..d831be29771 --- /dev/null +++ b/purchase_triple_discount/views/product_supplierinfo_view.xml @@ -0,0 +1,25 @@ + + + + product.supplierinfo + + + + + + + + + + + product.supplierinfo + + + + + + + + + + diff --git a/purchase_triple_discount/views/res_partner_view.xml b/purchase_triple_discount/views/res_partner_view.xml new file mode 100644 index 00000000000..4e5c08b40f4 --- /dev/null +++ b/purchase_triple_discount/views/res_partner_view.xml @@ -0,0 +1,16 @@ + + + + res.partner + + + + + + + + + +