From d264dc4f6886742fc85d58d3171a27c871bd3ea5 Mon Sep 17 00:00:00 2001 From: "sergio.teruel" Date: Wed, 5 Sep 2018 13:47:31 +0200 Subject: [PATCH 01/47] [11.0][NEW] sale_order_secondary_unit: New module for sale in a secondary product unit --- sale_order_secondary_unit/README.rst | 86 ++++ sale_order_secondary_unit/__init__.py | 2 + sale_order_secondary_unit/__manifest__.py | 22 + sale_order_secondary_unit/i18n/es.po | 33 ++ .../i18n/sale_order_secondary_unit.pot | 30 ++ sale_order_secondary_unit/models/__init__.py | 2 + .../models/sale_order.py | 65 +++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 2 + sale_order_secondary_unit/readme/USAGE.rst | 7 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 433 ++++++++++++++++++ sale_order_secondary_unit/tests/__init__.py | 2 + .../tests/test_sale_order_secondary_unit.py | 80 ++++ .../views/sale_order_views.xml | 29 ++ 15 files changed, 795 insertions(+) create mode 100644 sale_order_secondary_unit/README.rst create mode 100644 sale_order_secondary_unit/__init__.py create mode 100644 sale_order_secondary_unit/__manifest__.py create mode 100644 sale_order_secondary_unit/i18n/es.po create mode 100644 sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot create mode 100644 sale_order_secondary_unit/models/__init__.py create mode 100644 sale_order_secondary_unit/models/sale_order.py create mode 100644 sale_order_secondary_unit/readme/CONTRIBUTORS.rst create mode 100644 sale_order_secondary_unit/readme/DESCRIPTION.rst create mode 100644 sale_order_secondary_unit/readme/USAGE.rst create mode 100644 sale_order_secondary_unit/static/description/icon.png create mode 100644 sale_order_secondary_unit/static/description/index.html create mode 100644 sale_order_secondary_unit/tests/__init__.py create mode 100644 sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py create mode 100755 sale_order_secondary_unit/views/sale_order_views.xml diff --git a/sale_order_secondary_unit/README.rst b/sale_order_secondary_unit/README.rst new file mode 100644 index 00000000000..8c970752e93 --- /dev/null +++ b/sale_order_secondary_unit/README.rst @@ -0,0 +1,86 @@ +========================= +Sale Order Secondary Unit +========================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fsale--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/sale-workflow/tree/11.0/sale_order_secondary_unit + :alt: OCA/sale-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-workflow-11-0/sale-workflow-11-0-sale_order_secondary_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/167/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of sale orders to allow sale products in +secondary unit of distinct category. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module you need to: + +#. Go to a *Product > General Information tab*. +#. Create any record in "Secondary unit of measure". +#. Set the conversion factor. +#. Go to *Sales > Quotation > Create*. +#. Change quantities in line and secondary unit (produc_qty will be change). + +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 +~~~~~~~~~~~~ + +* Carlos Dauden +* Sergio Teruel + +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/sale-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_secondary_unit/__init__.py b/sale_order_secondary_unit/__init__.py new file mode 100644 index 00000000000..3275ac2adf3 --- /dev/null +++ b/sale_order_secondary_unit/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import models diff --git a/sale_order_secondary_unit/__manifest__.py b/sale_order_secondary_unit/__manifest__.py new file mode 100644 index 00000000000..6145ae03359 --- /dev/null +++ b/sale_order_secondary_unit/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2018 Tecnativa - Carlos Dauden +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + 'name': 'Sale Order Secondary Unit', + 'summary': 'Sale product in a secondary unit', + 'version': '11.0.1.0.0', + 'development_status': 'Beta', + 'category': 'Sale', + 'website': 'https://github.com/OCA/sale-workflow', + 'author': 'Tecnativa, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'application': False, + 'installable': True, + 'auto_install': True, + 'depends': [ + 'sale', + 'product_secondary_unit', + ], + 'data': [ + 'views/sale_order_views.xml', + ], +} diff --git a/sale_order_secondary_unit/i18n/es.po b/sale_order_secondary_unit/i18n/es.po new file mode 100644 index 00000000000..cc1c43e2cf7 --- /dev/null +++ b/sale_order_secondary_unit/i18n/es.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-09-05 10:13+0000\n" +"PO-Revision-Date: 2018-09-05 12:16+0200\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: es_ES\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" + +#. module: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea de pedido" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_qty +msgid "Secondary Qty" +msgstr "Cta. Ud. secundaria" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_id +msgid "Secondary uom" +msgstr "Unidad Secundaria" diff --git a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot new file mode 100644 index 00000000000..87098226a47 --- /dev/null +++ b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_secondary_unit +# +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: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_qty +msgid "Secondary Qty" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_id +msgid "Secondary uom" +msgstr "" + diff --git a/sale_order_secondary_unit/models/__init__.py b/sale_order_secondary_unit/models/__init__.py new file mode 100644 index 00000000000..49fac809e34 --- /dev/null +++ b/sale_order_secondary_unit/models/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import sale_order diff --git a/sale_order_secondary_unit/models/sale_order.py b/sale_order_secondary_unit/models/sale_order.py new file mode 100644 index 00000000000..75bd9fc71c9 --- /dev/null +++ b/sale_order_secondary_unit/models/sale_order.py @@ -0,0 +1,65 @@ +# Copyright 2018 Tecnativa - Carlos Dauden +# 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 +from odoo.tools.float_utils import float_compare, float_round + + +class SaleOrderLine(models.Model): + _inherit = 'sale.order.line' + + secondary_uom_qty = fields.Float( + string='Secondary Qty', + digits=dp.get_precision('Product Unit of Measure'), + ) + secondary_uom_id = fields.Many2one( + comodel_name='product.secondary.unit', + string='Secondary uom', + ondelete='restrict', + ) + + @api.onchange('secondary_uom_id', 'secondary_uom_qty') + def onchange_secondary_uom(self): + if not self.secondary_uom_id: + return + factor = self.secondary_uom_id.factor * self.product_uom.factor + qty = float_round( + self.secondary_uom_qty * factor, + precision_rounding=self.product_uom.rounding + ) + if float_compare( + self.product_uom_qty, qty, + precision_rounding=self.product_uom.rounding) != 0: + self.product_uom_qty = qty + + @api.onchange('product_uom_qty') + def onchange_secondary_unit_product_uom_qty(self): + if not self.secondary_uom_id: + return + factor = self.secondary_uom_id.factor * self.product_uom.factor + qty = float_round( + self.product_uom_qty / (factor or 1.0), + precision_rounding=self.secondary_uom_id.uom_id.rounding + ) + if float_compare( + self.secondary_uom_qty, qty, + precision_rounding=self.secondary_uom_id.uom_id.rounding) != 0: + self.secondary_uom_qty = qty + + @api.onchange('product_uom') + def onchange_product_uom_for_secondary(self): + if not self.secondary_uom_id: + return + factor = self.product_uom.factor * self.secondary_uom_id.factor + qty = float_round( + self.product_uom_qty / (factor or 1.0), + precision_rounding=self.product_uom.rounding + ) + if float_compare( + self.secondary_uom_qty, qty, + precision_rounding=self.product_uom.rounding) != 0: + self.secondary_uom_qty = qty + + @api.onchange('product_id') + def onchange_secondary_unit_product_id(self): + self.secondary_uom_id = self.product_id.sale_secondary_uom_id diff --git a/sale_order_secondary_unit/readme/CONTRIBUTORS.rst b/sale_order_secondary_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..b919cb776aa --- /dev/null +++ b/sale_order_secondary_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Carlos Dauden +* Sergio Teruel diff --git a/sale_order_secondary_unit/readme/DESCRIPTION.rst b/sale_order_secondary_unit/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..e7ffecea142 --- /dev/null +++ b/sale_order_secondary_unit/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the functionality of sale orders to allow sale products in +secondary unit of distinct category. diff --git a/sale_order_secondary_unit/readme/USAGE.rst b/sale_order_secondary_unit/readme/USAGE.rst new file mode 100644 index 00000000000..bd5f56e4784 --- /dev/null +++ b/sale_order_secondary_unit/readme/USAGE.rst @@ -0,0 +1,7 @@ +To use this module you need to: + +#. Go to a *Product > General Information tab*. +#. Create any record in "Secondary unit of measure". +#. Set the conversion factor. +#. Go to *Sales > Quotation > Create*. +#. Change quantities in line and secondary unit (produc_qty will be change). diff --git a/sale_order_secondary_unit/static/description/icon.png b/sale_order_secondary_unit/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/sale_order_secondary_unit/static/description/index.html b/sale_order_secondary_unit/static/description/index.html new file mode 100644 index 00000000000..a5a0c3a7cd3 --- /dev/null +++ b/sale_order_secondary_unit/static/description/index.html @@ -0,0 +1,433 @@ + + + + + + +Sale Order Secondary Unit + + + +
+

Sale Order Secondary Unit

+ + +

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

+

This module extends the functionality of sale orders to allow sale products in +secondary unit of distinct category.

+

Table of contents

+ +
+

Usage

+

To use this module you need to:

+
    +
  1. Go to a Product > General Information tab.
    2. +
  2. Create any record in “Secondary unit of measure”.
    3. +
  3. Set the conversion factor.
    4. +
  4. Go to Sales > Quotation > Create.
    5. +
  5. Change quantities in line and secondary unit (produc_qty will be change).
    6. +
+
+
+

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

+

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

+
+
+
+ + diff --git a/sale_order_secondary_unit/tests/__init__.py b/sale_order_secondary_unit/tests/__init__.py new file mode 100644 index 00000000000..35138db2f89 --- /dev/null +++ b/sale_order_secondary_unit/tests/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import test_sale_order_secondary_unit diff --git a/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py b/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py new file mode 100644 index 00000000000..3790cc471ee --- /dev/null +++ b/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py @@ -0,0 +1,80 @@ +# Copyright 2018 Tecnativa - Carlos Dauden +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.tests import SavepointCase + + +class TestSaleOrderSecondaryUnit(SavepointCase): + at_install = False + post_install = True + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product_uom_kg = cls.env.ref('product.product_uom_kgm') + cls.product_uom_gram = cls.env.ref('product.product_uom_gram') + cls.product_uom_unit = cls.env.ref('product.product_uom_unit') + cls.product = cls.env['product.product'].create({ + 'name': 'test', + 'uom_id': cls.product_uom_kg.id, + 'uom_po_id': cls.product_uom_kg.id, + 'secondary_uom_ids': [ + (0, 0, { + 'name': 'unit-700', + 'uom_id': cls.product_uom_unit.id, + 'factor': 0.7, + })], + }) + cls.secondary_unit = cls.env['product.secondary.unit'].search([ + ('product_tmpl_id', '=', cls.product.product_tmpl_id.id), + ]) + cls.product.sale_secondary_uom_id = cls.secondary_unit.id + cls.partner = cls.env['res.partner'].create({ + 'name': 'test - partner', + }) + so = cls.env['sale.order'].new({ + 'partner_id': cls.partner.id, + 'order_line': [(0, 0, { + 'name': cls.product.name, + 'product_id': cls.product.id, + 'product_uom_qty': 1, + 'product_uom': cls.product.uom_id.id, + 'price_unit': 1000.00, + })], + 'pricelist_id': cls.env.ref('product.list0').id, + }) + so.onchange_partner_id() + cls.order = cls.env['sale.order'].create( + so._convert_to_write(so._cache)) + + def test_onchange_secondary_uom(self): + self.order.order_line.write({ + 'secondary_uom_id': self.secondary_unit.id, + 'secondary_uom_qty': 5, + }) + self.order.order_line.onchange_secondary_uom() + self.assertEqual( + self.order.order_line.product_uom_qty, 3.5) + + def test_onchange_secondary_unit_product_uom_qty(self): + self.order.order_line.update({ + 'secondary_uom_id': self.secondary_unit.id, + 'product_uom_qty': 3.5, + }) + self.order.order_line.onchange_secondary_unit_product_uom_qty() + self.assertEqual( + self.order.order_line.secondary_uom_qty, 5.0) + + def test_default_secondary_unit(self): + self.order.order_line.onchange_secondary_unit_product_id() + self.assertEqual( + self.order.order_line.secondary_uom_id, self.secondary_unit) + + def test_onchange_order_product_uom(self): + self.order.order_line.update({ + 'secondary_uom_id': self.secondary_unit.id, + 'product_uom': self.product_uom_gram.id, + 'product_uom_qty': 3500.00, + }) + self.order.order_line.onchange_product_uom_for_secondary() + self.assertEqual( + self.order.order_line.secondary_uom_qty, 5.0) diff --git a/sale_order_secondary_unit/views/sale_order_views.xml b/sale_order_secondary_unit/views/sale_order_views.xml new file mode 100755 index 00000000000..cfef6834d6e --- /dev/null +++ b/sale_order_secondary_unit/views/sale_order_views.xml @@ -0,0 +1,29 @@ + + + + + + Sale Order Secondary Unit + sale.order + + + + + + + + + + + + + + + From 85dc1b13bbebbb41937927b3026b4b82307bf144 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Fri, 26 Oct 2018 10:40:30 +0200 Subject: [PATCH 02/47] [11.0][FIX] sale_order_secondary_unit: define sale secondary uom in this module instead of product_secondary_unit --- sale_order_secondary_unit/__manifest__.py | 3 ++- sale_order_secondary_unit/i18n/es.po | 11 ++++++++++ .../i18n/sale_order_secondary_unit.pot | 11 ++++++++++ sale_order_secondary_unit/models/__init__.py | 1 + .../models/product_template.py | 12 +++++++++++ .../views/product_views.xml | 20 +++++++++++++++++++ 6 files changed, 57 insertions(+), 1 deletion(-) create mode 100755 sale_order_secondary_unit/models/product_template.py create mode 100755 sale_order_secondary_unit/views/product_views.xml diff --git a/sale_order_secondary_unit/__manifest__.py b/sale_order_secondary_unit/__manifest__.py index 6145ae03359..9a0a96d585e 100644 --- a/sale_order_secondary_unit/__manifest__.py +++ b/sale_order_secondary_unit/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Sale Order Secondary Unit', 'summary': 'Sale product in a secondary unit', - 'version': '11.0.1.0.0', + 'version': '11.0.1.0.1', 'development_status': 'Beta', 'category': 'Sale', 'website': 'https://github.com/OCA/sale-workflow', @@ -17,6 +17,7 @@ 'product_secondary_unit', ], 'data': [ + 'views/product_views.xml', 'views/sale_order_views.xml', ], } diff --git a/sale_order_secondary_unit/i18n/es.po b/sale_order_secondary_unit/i18n/es.po index cc1c43e2cf7..a752b7fc4ff 100644 --- a/sale_order_secondary_unit/i18n/es.po +++ b/sale_order_secondary_unit/i18n/es.po @@ -17,6 +17,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_product_sale_secondary_uom_id +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_template_sale_secondary_uom_id +msgid "Default unit sale" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_product_template +msgid "Product Template" +msgstr "" + #. module: sale_order_secondary_unit #: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line msgid "Sales Order Line" diff --git a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot index 87098226a47..989c67e7ad3 100644 --- a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot +++ b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot @@ -13,6 +13,17 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_product_sale_secondary_uom_id +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_template_sale_secondary_uom_id +msgid "Default unit sale" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_product_template +msgid "Product Template" +msgstr "" + #. module: sale_order_secondary_unit #: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line msgid "Sales Order Line" diff --git a/sale_order_secondary_unit/models/__init__.py b/sale_order_secondary_unit/models/__init__.py index 49fac809e34..f4b27e67842 100644 --- a/sale_order_secondary_unit/models/__init__.py +++ b/sale_order_secondary_unit/models/__init__.py @@ -1,2 +1,3 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import product_template from . import sale_order diff --git a/sale_order_secondary_unit/models/product_template.py b/sale_order_secondary_unit/models/product_template.py new file mode 100755 index 00000000000..14adc539ac4 --- /dev/null +++ b/sale_order_secondary_unit/models/product_template.py @@ -0,0 +1,12 @@ +# Copyright 2018 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + sale_secondary_uom_id = fields.Many2one( + comodel_name='product.secondary.unit', + string='Default unit sale', + ) diff --git a/sale_order_secondary_unit/views/product_views.xml b/sale_order_secondary_unit/views/product_views.xml new file mode 100755 index 00000000000..1adf7cd7025 --- /dev/null +++ b/sale_order_secondary_unit/views/product_views.xml @@ -0,0 +1,20 @@ + + + + + + Product template Secondary Unit + product.template + + + + + + + + + + From 60040b026f0f4ee6b0cea0dfe1cc618f10d40b41 Mon Sep 17 00:00:00 2001 From: joezsweet Date: Mon, 7 Jan 2019 10:33:44 +0100 Subject: [PATCH 03/47] [11.0][IMP/FIX] sale_secondary_unit limit secondary uom in order line Added domain to limit `secondary_uom_id` to the one defined in product template --- sale_order_secondary_unit/views/sale_order_views.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sale_order_secondary_unit/views/sale_order_views.xml b/sale_order_secondary_unit/views/sale_order_views.xml index cfef6834d6e..be65d5c1dbb 100755 --- a/sale_order_secondary_unit/views/sale_order_views.xml +++ b/sale_order_secondary_unit/views/sale_order_views.xml @@ -13,6 +13,7 @@ From c56aaa843c40ce8c1b0de23c766077c6c4e03411 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Fri, 18 Jan 2019 13:29:00 +0100 Subject: [PATCH 04/47] [11.0][IMP] sale_secondary_unit: Set secondary uom quantity as 1.0 by default --- sale_order_secondary_unit/i18n/es.po | 6 +++--- .../i18n/sale_order_secondary_unit.pot | 2 +- .../models/product_template.py | 2 +- sale_order_secondary_unit/models/sale_order.py | 13 ++++++++++++- .../tests/test_sale_order_secondary_unit.py | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sale_order_secondary_unit/i18n/es.po b/sale_order_secondary_unit/i18n/es.po index a752b7fc4ff..830fe280482 100644 --- a/sale_order_secondary_unit/i18n/es.po +++ b/sale_order_secondary_unit/i18n/es.po @@ -20,13 +20,13 @@ msgstr "" #. module: sale_order_secondary_unit #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_product_sale_secondary_uom_id #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_template_sale_secondary_uom_id -msgid "Default unit sale" -msgstr "" +msgid "Default secondary unit for sales" +msgstr "Ud de venta secundaria por defecto" #. module: sale_order_secondary_unit #: model:ir.model,name:sale_order_secondary_unit.model_product_template msgid "Product Template" -msgstr "" +msgstr "Plantilla de producto" #. module: sale_order_secondary_unit #: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line diff --git a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot index 989c67e7ad3..9857e1ac51e 100644 --- a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot +++ b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot @@ -16,7 +16,7 @@ msgstr "" #. module: sale_order_secondary_unit #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_product_sale_secondary_uom_id #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_template_sale_secondary_uom_id -msgid "Default unit sale" +msgid "Default secondary unit for sales" msgstr "" #. module: sale_order_secondary_unit diff --git a/sale_order_secondary_unit/models/product_template.py b/sale_order_secondary_unit/models/product_template.py index 14adc539ac4..d3908451d30 100755 --- a/sale_order_secondary_unit/models/product_template.py +++ b/sale_order_secondary_unit/models/product_template.py @@ -8,5 +8,5 @@ class ProductTemplate(models.Model): sale_secondary_uom_id = fields.Many2one( comodel_name='product.secondary.unit', - string='Default unit sale', + string='Default secondary unit for sales', ) diff --git a/sale_order_secondary_unit/models/sale_order.py b/sale_order_secondary_unit/models/sale_order.py index 75bd9fc71c9..b8f9b858ec4 100644 --- a/sale_order_secondary_unit/models/sale_order.py +++ b/sale_order_secondary_unit/models/sale_order.py @@ -61,5 +61,16 @@ def onchange_product_uom_for_secondary(self): self.secondary_uom_qty = qty @api.onchange('product_id') - def onchange_secondary_unit_product_id(self): + def product_id_change(self): + """ + If default sales secondary unit set on product, put on secondary + quantity 1 for being the default quantity. We override this method, + that is the one that sets by default 1 on the other quantity with that + purpose. + """ + res = super(SaleOrderLine, self).product_id_change() self.secondary_uom_id = self.product_id.sale_secondary_uom_id + if self.secondary_uom_id: + self.secondary_uom_qty = 1.0 + self.onchange_secondary_uom() + return res diff --git a/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py b/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py index 3790cc471ee..f9fe2a06d9e 100644 --- a/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py +++ b/sale_order_secondary_unit/tests/test_sale_order_secondary_unit.py @@ -65,7 +65,7 @@ def test_onchange_secondary_unit_product_uom_qty(self): self.order.order_line.secondary_uom_qty, 5.0) def test_default_secondary_unit(self): - self.order.order_line.onchange_secondary_unit_product_id() + self.order.order_line.product_id_change() self.assertEqual( self.order.order_line.secondary_uom_id, self.secondary_unit) From 75c87fc184e27f227082f6986858f4e08cb93312 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Mon, 15 Apr 2019 13:04:09 +0200 Subject: [PATCH 05/47] [11.0][IMP] sale_order_secondary_unit: Add security group --- sale_order_secondary_unit/__manifest__.py | 2 +- .../migrations/11.0.1.0.2/post-migration.py | 23 +++++++++++++++++++ .../views/product_views.xml | 2 +- .../views/sale_order_views.xml | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 sale_order_secondary_unit/migrations/11.0.1.0.2/post-migration.py diff --git a/sale_order_secondary_unit/__manifest__.py b/sale_order_secondary_unit/__manifest__.py index 9a0a96d585e..c9a88735598 100644 --- a/sale_order_secondary_unit/__manifest__.py +++ b/sale_order_secondary_unit/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Sale Order Secondary Unit', 'summary': 'Sale product in a secondary unit', - 'version': '11.0.1.0.1', + 'version': '11.0.1.0.2', 'development_status': 'Beta', 'category': 'Sale', 'website': 'https://github.com/OCA/sale-workflow', diff --git a/sale_order_secondary_unit/migrations/11.0.1.0.2/post-migration.py b/sale_order_secondary_unit/migrations/11.0.1.0.2/post-migration.py new file mode 100644 index 00000000000..6791a8cb033 --- /dev/null +++ b/sale_order_secondary_unit/migrations/11.0.1.0.2/post-migration.py @@ -0,0 +1,23 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl +from openupgradelib import openupgrade + + +@openupgrade.migrate(use_env=True) +def migrate(env, version): + # Remove old security group_uom from product template view because now has + # a new group for secondary units + group_uom = env.ref('product.group_uom') + view_product_template = env.ref( + 'sale_order_secondary_unit.product_template_form_view') + view_product_template.write({ + 'groups_id': [(3, group_uom.id)] + }) + + # Remove old security group_uom from sale order view because now has a + # new group for secondary units + view_product_template = env.ref( + 'sale_order_secondary_unit.view_order_form') + view_product_template.write({ + 'groups_id': [(3, group_uom.id)] + }) diff --git a/sale_order_secondary_unit/views/product_views.xml b/sale_order_secondary_unit/views/product_views.xml index 1adf7cd7025..4bebf45cabe 100755 --- a/sale_order_secondary_unit/views/product_views.xml +++ b/sale_order_secondary_unit/views/product_views.xml @@ -7,7 +7,7 @@ Product template Secondary Unit product.template - + Sale Order Secondary Unit sale.order - + Date: Thu, 7 Mar 2019 18:11:05 +0100 Subject: [PATCH 06/47] [11.0][IMP] sale_order_secondary_unit: add secondary unit to sale report --- sale_order_secondary_unit/__manifest__.py | 1 + sale_order_secondary_unit/i18n/es.po | 9 +++++++-- .../i18n/sale_order_secondary_unit.pot | 5 +++++ .../report/sale_report_templates.xml | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 sale_order_secondary_unit/report/sale_report_templates.xml diff --git a/sale_order_secondary_unit/__manifest__.py b/sale_order_secondary_unit/__manifest__.py index c9a88735598..e6e06810635 100644 --- a/sale_order_secondary_unit/__manifest__.py +++ b/sale_order_secondary_unit/__manifest__.py @@ -19,5 +19,6 @@ 'data': [ 'views/product_views.xml', 'views/sale_order_views.xml', + 'report/sale_report_templates.xml', ], } diff --git a/sale_order_secondary_unit/i18n/es.po b/sale_order_secondary_unit/i18n/es.po index 830fe280482..12de87b239b 100644 --- a/sale_order_secondary_unit/i18n/es.po +++ b/sale_order_secondary_unit/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-05 10:13+0000\n" -"PO-Revision-Date: 2018-09-05 12:16+0200\n" +"POT-Creation-Date: 2019-03-07 17:08+0000\n" +"PO-Revision-Date: 2019-03-07 18:09+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: es_ES\n" @@ -33,6 +33,11 @@ msgstr "Plantilla de producto" msgid "Sales Order Line" msgstr "Línea de pedido" +#. module: sale_order_secondary_unit +#: model:ir.ui.view,arch_db:sale_order_secondary_unit.report_saleorder_document +msgid "Second. Qty" +msgstr "Ud. Secundaria" + #. module: sale_order_secondary_unit #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_qty msgid "Secondary Qty" diff --git a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot index 9857e1ac51e..7bc5db2c8aa 100644 --- a/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot +++ b/sale_order_secondary_unit/i18n/sale_order_secondary_unit.pot @@ -29,6 +29,11 @@ msgstr "" msgid "Sales Order Line" msgstr "" +#. module: sale_order_secondary_unit +#: model:ir.ui.view,arch_db:sale_order_secondary_unit.report_saleorder_document +msgid "Second. Qty" +msgstr "" + #. module: sale_order_secondary_unit #: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_qty msgid "Secondary Qty" diff --git a/sale_order_secondary_unit/report/sale_report_templates.xml b/sale_order_secondary_unit/report/sale_report_templates.xml new file mode 100644 index 00000000000..4c106cf74cc --- /dev/null +++ b/sale_order_secondary_unit/report/sale_report_templates.xml @@ -0,0 +1,18 @@ + + + + + + From e563c4f1f6a20eadcf50450095245785eb7160a1 Mon Sep 17 00:00:00 2001 From: Maria Sparenberg Date: Mon, 15 Jul 2019 11:29:10 +0000 Subject: [PATCH 07/47] Added translation using Weblate (German) --- sale_order_secondary_unit/i18n/de.po | 46 +++++++++++++++++++ .../static/description/index.html | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 sale_order_secondary_unit/i18n/de.po diff --git a/sale_order_secondary_unit/i18n/de.po b/sale_order_secondary_unit/i18n/de.po new file mode 100644 index 00000000000..c023f2a85d9 --- /dev/null +++ b/sale_order_secondary_unit/i18n/de.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_product_sale_secondary_uom_id +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_product_template_sale_secondary_uom_id +msgid "Default secondary unit for sales" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_product_template +msgid "Product Template" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model,name:sale_order_secondary_unit.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.ui.view,arch_db:sale_order_secondary_unit.report_saleorder_document +msgid "Second. Qty" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_qty +msgid "Secondary Qty" +msgstr "" + +#. module: sale_order_secondary_unit +#: model:ir.model.fields,field_description:sale_order_secondary_unit.field_sale_order_line_secondary_uom_id +msgid "Secondary uom" +msgstr "" diff --git a/sale_order_secondary_unit/static/description/index.html b/sale_order_secondary_unit/static/description/index.html index a5a0c3a7cd3..177f1ea97ae 100644 --- a/sale_order_secondary_unit/static/description/index.html +++ b/sale_order_secondary_unit/static/description/index.html @@ -3,7 +3,7 @@ - + Sale Order Secondary Unit