From 8bce7462cc665b65ca0cf5163c2a3799901c45e0 Mon Sep 17 00:00:00 2001 From: lreficent Date: Tue, 2 Jan 2018 13:53:01 +0100 Subject: [PATCH 01/14] [10.0][ADD] stock_orderpoint_manual_procurement_uom --- .../README.rst | 56 ++++++++ .../__init__.py | 5 + .../__manifest__.py | 23 +++ .../models/__init__.py | 4 + .../models/stock_warehouse_orderpoint.py | 22 +++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + ...est_stock_orderpoint_manual_procurement.py | 133 ++++++++++++++++++ .../wizards/__init__.py | 4 + .../wizards/make_procurement_orderpoint.py | 32 +++++ 10 files changed, 283 insertions(+) create mode 100644 stock_orderpoint_manual_procurement_uom/README.rst create mode 100644 stock_orderpoint_manual_procurement_uom/__init__.py create mode 100644 stock_orderpoint_manual_procurement_uom/__manifest__.py create mode 100644 stock_orderpoint_manual_procurement_uom/models/__init__.py create mode 100644 stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py create mode 100644 stock_orderpoint_manual_procurement_uom/static/description/icon.png create mode 100644 stock_orderpoint_manual_procurement_uom/tests/__init__.py create mode 100644 stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py create mode 100644 stock_orderpoint_manual_procurement_uom/wizards/__init__.py create mode 100644 stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py diff --git a/stock_orderpoint_manual_procurement_uom/README.rst b/stock_orderpoint_manual_procurement_uom/README.rst new file mode 100644 index 000000000..3b52a3dcb --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/README.rst @@ -0,0 +1,56 @@ +.. 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 + +======================================= +Stock Orderpoint Manual Procurement UoM +======================================= + +Glue module for ``stock_orderpoint_uom`` and +``stock_orderpoint_manual_procurement`` + +Usage +===== + +The recommended quantity to procure is adjusted to the procurement unit of +measure indicated in the reordering rule. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/153/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 smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Lois Rilo Antelo + +Maintainer +---------- + +.. 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. diff --git a/stock_orderpoint_manual_procurement_uom/__init__.py b/stock_orderpoint_manual_procurement_uom/__init__.py new file mode 100644 index 000000000..fbe944470 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import models +from . import wizards diff --git a/stock_orderpoint_manual_procurement_uom/__manifest__.py b/stock_orderpoint_manual_procurement_uom/__manifest__.py new file mode 100644 index 000000000..c253712c0 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/__manifest__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +{ + "name": "Stock Orderpoint Manual Procurement UoM", + "summary": "Glue module for stock_orderpoint_uom and " + "stock_orderpoint_manual_procurement", + "version": "10.0.1.0.0", + "author": "Eficent, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-warehouse", + "category": "Warehouse Management", + "depends": [ + "stock_orderpoint_uom", + "stock_orderpoint_manual_procurement", + ], + "data": [], + "license": "AGPL-3", + 'installable': True, + 'application': False, + 'auto-install': True, +} diff --git a/stock_orderpoint_manual_procurement_uom/models/__init__.py b/stock_orderpoint_manual_procurement_uom/models/__init__.py new file mode 100644 index 000000000..6654fecb0 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import stock_warehouse_orderpoint diff --git a/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py b/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py new file mode 100644 index 000000000..bd0499452 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class StockWarehouseOrderpoint(models.Model): + _inherit = 'stock.warehouse.orderpoint' + + @api.multi + def _get_procure_recommended_qty(self, virtual_qty, op_qtys): + procure_recommended_qty = \ + super(StockWarehouseOrderpoint, self)._get_procure_recommended_qty( + virtual_qty, op_qtys) + if self.procure_uom_id: + product_qty = self.product_id.uom_id._compute_quantity( + procure_recommended_qty, self.procure_uom_id) + else: + product_qty = procure_recommended_qty + return product_qty diff --git a/stock_orderpoint_manual_procurement_uom/static/description/icon.png b/stock_orderpoint_manual_procurement_uom/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/stock_orderpoint_manual_procurement_uom/tests/__init__.py b/stock_orderpoint_manual_procurement_uom/tests/__init__.py new file mode 100644 index 000000000..87fd3dfb9 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import test_stock_orderpoint_manual_procurement diff --git a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py new file mode 100644 index 000000000..62c4634dc --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestStockWarehouseOrderpoint(common.TransactionCase): + + def setUp(self): + super(TestStockWarehouseOrderpoint, self).setUp() + + # Refs + self.group_stock_manager = self.env.ref('stock.group_stock_manager') + self.group_change_procure_qty = self.env.ref( + 'stock_orderpoint_manual_procurement.' + 'group_change_orderpoint_procure_qty') + self.company1 = self.env.ref('base.main_company') + + # Get required Model + self.reordering_rule_model = self.env['stock.warehouse.orderpoint'] + self.product_model = self.env['product.product'] + self.user_model = self.env['res.users'] + self.product_ctg_model = self.env['product.category'] + self.stock_change_model = self.env['stock.change.product.qty'] + self.make_procurement_orderpoint_model =\ + self.env['make.procurement.orderpoint'] + + # Create users + self.user = self._create_user('user_1', + [self.group_stock_manager, + self.group_change_procure_qty], + self.company1) + # Get required Model data + self.product_uom = self.env.ref('product.product_uom_unit') + self.location = self.env.ref('stock.stock_location_stock') + self.product = self.env.ref('product.product_product_7') + self.dozen = self.env.ref('product.product_uom_dozen') + + # Create Product category and Product + self.product_ctg = self._create_product_category() + self.product = self._create_product() + + # Add default quantity + quantity = 20.00 + self._update_product_qty(self.product, self.location, quantity) + + # Create Reordering Rule + self.reorder = self.create_orderpoint() + + def _create_user(self, login, groups, company): + """ Create a user.""" + group_ids = [group.id for group in groups] + user = \ + self.user_model.with_context({'no_reset_password': True}).create({ + 'name': 'Test User', + 'login': login, + 'password': 'demo', + 'email': 'test@yourcompany.com', + 'company_id': company.id, + 'company_ids': [(4, company.id)], + 'groups_id': [(6, 0, group_ids)] + }) + return user + + def _create_product_category(self): + """Create a Product Category.""" + product_ctg = self.product_ctg_model.create({ + 'name': 'test_product_ctg', + 'type': 'normal', + }) + return product_ctg + + def _create_product(self): + """Create a Product.""" + product = self.product_model.create({ + 'name': 'Test Product', + 'categ_id': self.product_ctg.id, + 'type': 'product', + 'uom_id': self.product_uom.id, + }) + return product + + def _update_product_qty(self, product, location, quantity): + """Update Product quantity.""" + change_product_qty = self.stock_change_model.create({ + 'location_id': location.id, + 'product_id': product.id, + 'new_quantity': quantity, + }) + change_product_qty.change_product_qty() + return change_product_qty + + def create_orderpoint(self): + """Create a Reordering Rule""" + reorder = self.reordering_rule_model.sudo(self.user).create({ + 'name': 'Order-point', + 'product_id': self.product.id, + 'product_min_qty': 100.0, + 'product_max_qty': 500.0, + 'qty_multiple': 1.0, + 'procure_uom_id': self.dozen.id, + }) + return reorder + + def create_orderpoint_procurement(self): + """Make Procurement from Reordering Rule""" + context = { + 'active_model': 'stock.warehouse.orderpoint', + 'active_ids': self.reorder.ids, + 'active_id': self.reorder.id + } + wizard = self.make_procurement_orderpoint_model.sudo(self.user).\ + with_context(context).create({}) + wizard.make_procurement() + return wizard + + def test_security(self): + """Test Manual Procurement created from Order-Point""" + + # Create Manual Procurement from order-point procured quantity + self.create_orderpoint_procurement() + + # Assert that Procurement is created with the desired quantity + self.assertTrue(self.reorder.procurement_ids) + self.assertEqual(self.reorder.product_id.id, + self.reorder.procurement_ids.product_id.id) + self.assertEqual(self.reorder.name, + self.reorder.procurement_ids.origin) + self.assertNotEqual(self.reorder.procure_recommended_qty, + self.reorder.procurement_ids.product_qty) + self.assertEqual(self.reorder.procurement_ids.product_qty, 40) diff --git a/stock_orderpoint_manual_procurement_uom/wizards/__init__.py b/stock_orderpoint_manual_procurement_uom/wizards/__init__.py new file mode 100644 index 000000000..aa5d94a56 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/wizards/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import make_procurement_orderpoint diff --git a/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py b/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py new file mode 100644 index 000000000..04de14f8d --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class MakeProcurementOrderpoint(models.TransientModel): + _inherit = 'make.procurement.orderpoint' + + @api.model + def _prepare_item(self, orderpoint): + vals = super(MakeProcurementOrderpoint, self)._prepare_item(orderpoint) + if orderpoint.procure_uom_id: + product_uom = orderpoint.procure_uom_id + vals['uom_id'] = product_uom.id + return vals + + +class MakeProcurementOrderpointItem(models.TransientModel): + _inherit = 'make.procurement.orderpoint.item' + + @api.multi + @api.onchange('uom_id') + def onchange_uom_id(self): + for rec in self: + uom = rec.orderpoint_id.procure_uom_id or \ + rec.orderpoint_id.product_uom + rec.qty = uom._compute_quantity( + rec.orderpoint_id.procure_recommended_qty, + rec.uom_id) From f8d9d34d82e35e14a1653b4728da7089c129087a Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Tue, 27 Feb 2018 22:25:41 +0530 Subject: [PATCH 02/14] [MIG] stock_orderpoint_manual_procurement_uom: Migration to 11.0 --- .../README.rst | 3 +- .../__init__.py | 1 - .../__manifest__.py | 4 +-- .../models/__init__.py | 1 - .../models/stock_warehouse_orderpoint.py | 7 ++--- .../tests/__init__.py | 1 - ...est_stock_orderpoint_manual_procurement.py | 30 +++++++++++++------ .../wizards/__init__.py | 1 - .../wizards/make_procurement_orderpoint.py | 1 - 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/stock_orderpoint_manual_procurement_uom/README.rst b/stock_orderpoint_manual_procurement_uom/README.rst index 3b52a3dcb..4a3ecb35f 100644 --- a/stock_orderpoint_manual_procurement_uom/README.rst +++ b/stock_orderpoint_manual_procurement_uom/README.rst @@ -17,7 +17,7 @@ measure indicated in the reordering rule. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/153/10.0 + :target: https://runbot.odoo-community.org/runbot/153/11.0 Bug Tracker =========== @@ -39,6 +39,7 @@ Contributors ------------ * Lois Rilo Antelo +* Bhavesh Odedra Maintainer ---------- diff --git a/stock_orderpoint_manual_procurement_uom/__init__.py b/stock_orderpoint_manual_procurement_uom/__init__.py index fbe944470..e1e144406 100644 --- a/stock_orderpoint_manual_procurement_uom/__init__.py +++ b/stock_orderpoint_manual_procurement_uom/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import models diff --git a/stock_orderpoint_manual_procurement_uom/__manifest__.py b/stock_orderpoint_manual_procurement_uom/__manifest__.py index c253712c0..641fa2ea9 100644 --- a/stock_orderpoint_manual_procurement_uom/__manifest__.py +++ b/stock_orderpoint_manual_procurement_uom/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). @@ -6,7 +5,7 @@ "name": "Stock Orderpoint Manual Procurement UoM", "summary": "Glue module for stock_orderpoint_uom and " "stock_orderpoint_manual_procurement", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "author": "Eficent, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-warehouse", @@ -19,5 +18,4 @@ "license": "AGPL-3", 'installable': True, 'application': False, - 'auto-install': True, } diff --git a/stock_orderpoint_manual_procurement_uom/models/__init__.py b/stock_orderpoint_manual_procurement_uom/models/__init__.py index 6654fecb0..14b7c7a48 100644 --- a/stock_orderpoint_manual_procurement_uom/models/__init__.py +++ b/stock_orderpoint_manual_procurement_uom/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import stock_warehouse_orderpoint diff --git a/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py b/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py index bd0499452..82f04be16 100644 --- a/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py +++ b/stock_orderpoint_manual_procurement_uom/models/stock_warehouse_orderpoint.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). @@ -11,12 +10,10 @@ class StockWarehouseOrderpoint(models.Model): @api.multi def _get_procure_recommended_qty(self, virtual_qty, op_qtys): - procure_recommended_qty = \ + product_qty = \ super(StockWarehouseOrderpoint, self)._get_procure_recommended_qty( virtual_qty, op_qtys) if self.procure_uom_id: product_qty = self.product_id.uom_id._compute_quantity( - procure_recommended_qty, self.procure_uom_id) - else: - product_qty = procure_recommended_qty + product_qty, self.procure_uom_id) return product_qty diff --git a/stock_orderpoint_manual_procurement_uom/tests/__init__.py b/stock_orderpoint_manual_procurement_uom/tests/__init__.py index 87fd3dfb9..7d9283684 100644 --- a/stock_orderpoint_manual_procurement_uom/tests/__init__.py +++ b/stock_orderpoint_manual_procurement_uom/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import test_stock_orderpoint_manual_procurement diff --git a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py index 62c4634dc..ea920773c 100644 --- a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py +++ b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). @@ -13,6 +12,10 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): # Refs self.group_stock_manager = self.env.ref('stock.group_stock_manager') + self.group_purchase_manager = self.env.ref( + 'purchase.group_purchase_manager') + self.vendor = self.env.ref( + 'stock_orderpoint_manual_procurement.product_supplierinfo_product_7') # noqa self.group_change_procure_qty = self.env.ref( 'stock_orderpoint_manual_procurement.' 'group_change_orderpoint_procure_qty') @@ -21,6 +24,8 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): # Get required Model self.reordering_rule_model = self.env['stock.warehouse.orderpoint'] self.product_model = self.env['product.product'] + self.purchase_model = self.env['purchase.order'] + self.purchase_line_model = self.env['purchase.order.line'] self.user_model = self.env['res.users'] self.product_ctg_model = self.env['product.category'] self.stock_change_model = self.env['stock.change.product.qty'] @@ -30,7 +35,8 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): # Create users self.user = self._create_user('user_1', [self.group_stock_manager, - self.group_change_procure_qty], + self.group_change_procure_qty, + self.group_purchase_manager], self.company1) # Get required Model data self.product_uom = self.env.ref('product.product_uom_unit') @@ -68,7 +74,6 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): """Create a Product Category.""" product_ctg = self.product_ctg_model.create({ 'name': 'test_product_ctg', - 'type': 'normal', }) return product_ctg @@ -79,6 +84,7 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): 'categ_id': self.product_ctg.id, 'type': 'product', 'uom_id': self.product_uom.id, + 'variant_seller_ids': [(6, 0, [self.vendor.id])], }) return product @@ -122,12 +128,18 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): # Create Manual Procurement from order-point procured quantity self.create_orderpoint_procurement() + # As per route configuration, it will create Purchase order # Assert that Procurement is created with the desired quantity - self.assertTrue(self.reorder.procurement_ids) + purchase = self.purchase_model.search( + [('origin', 'ilike', self.reorder.name)]) + self.assertEquals(len(purchase), 1) + purchase_line = self.purchase_line_model.search( + [('orderpoint_id', '=', self.reorder.id), + ('order_id', '=', purchase.id)]) + self.assertEquals(len(purchase_line), 1) self.assertEqual(self.reorder.product_id.id, - self.reorder.procurement_ids.product_id.id) - self.assertEqual(self.reorder.name, - self.reorder.procurement_ids.origin) + purchase_line.product_id.id) + self.assertEqual(self.reorder.name, purchase.origin) self.assertNotEqual(self.reorder.procure_recommended_qty, - self.reorder.procurement_ids.product_qty) - self.assertEqual(self.reorder.procurement_ids.product_qty, 40) + purchase_line.product_qty) + self.assertEqual(purchase_line.product_qty, 40) diff --git a/stock_orderpoint_manual_procurement_uom/wizards/__init__.py b/stock_orderpoint_manual_procurement_uom/wizards/__init__.py index aa5d94a56..79fe40f10 100644 --- a/stock_orderpoint_manual_procurement_uom/wizards/__init__.py +++ b/stock_orderpoint_manual_procurement_uom/wizards/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import make_procurement_orderpoint diff --git a/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py b/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py index 04de14f8d..d97ad2207 100644 --- a/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py +++ b/stock_orderpoint_manual_procurement_uom/wizards/make_procurement_orderpoint.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). From 5f47ee90a01e470d181ae3202e318d4c341faf1e Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 23 Mar 2018 13:59:04 +0100 Subject: [PATCH 03/14] [11.0][MIG] stock_orderpoint_manual_procurement_uom: update tests --- .../tests/test_stock_orderpoint_manual_procurement.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py index ea920773c..75e494d45 100644 --- a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py +++ b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py @@ -139,7 +139,13 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): self.assertEquals(len(purchase_line), 1) self.assertEqual(self.reorder.product_id.id, purchase_line.product_id.id) - self.assertEqual(self.reorder.name, purchase.origin) + # it could be using an existing PO, thus there could be more origins. + self.assertTrue(self.reorder.name in purchase.origin) self.assertNotEqual(self.reorder.procure_recommended_qty, purchase_line.product_qty) - self.assertEqual(purchase_line.product_qty, 40) + if self.reorder.procure_uom_id == self.reorder.product_id.uom_po_id: + # Our PO unit of measure is also dozens (procure uom) + self.assertEqual(purchase_line.product_qty, 40) + else: + # PO unit of measure is units, not the same as procure uom. + self.assertEqual(purchase_line.product_qty, 480) From e3ac1b816bf4be6ecb7bdee230a40419c24445fd Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 21 Jun 2018 13:48:16 +0000 Subject: [PATCH 04/14] [UPD] Update stock_orderpoint_manual_procurement_uom.pot --- ...tock_orderpoint_manual_procurement_uom.pot | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot diff --git a/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot new file mode 100644 index 000000000..1ceb3187d --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_orderpoint_manual_procurement_uom +# +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: stock_orderpoint_manual_procurement_uom +#: model:ir.model,name:stock_orderpoint_manual_procurement_uom.model_make_procurement_orderpoint_item +msgid "Make Procurements from Orderpoint Item" +msgstr "" + +#. module: stock_orderpoint_manual_procurement_uom +#: model:ir.model,name:stock_orderpoint_manual_procurement_uom.model_make_procurement_orderpoint +msgid "Make Procurements from Orderpoints" +msgstr "" + +#. module: stock_orderpoint_manual_procurement_uom +#: model:ir.model,name:stock_orderpoint_manual_procurement_uom.model_stock_warehouse_orderpoint +msgid "Minimum Inventory Rule" +msgstr "" + From 04f03167713a664c0026254a1ce153fc6d00b778 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Tue, 9 Apr 2019 16:23:31 +0700 Subject: [PATCH 05/14] [12.0][MIG] stock_orderpoint_manual_procurement_uom --- .../README.rst | 67 ++- .../__manifest__.py | 3 +- ...tock_orderpoint_manual_procurement_uom.pot | 4 +- .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 2 + .../readme/USAGE.rst | 2 + .../static/description/index.html | 428 ++++++++++++++++++ ...est_stock_orderpoint_manual_procurement.py | 6 +- 8 files changed, 489 insertions(+), 26 deletions(-) create mode 100644 stock_orderpoint_manual_procurement_uom/readme/CONTRIBUTORS.rst create mode 100644 stock_orderpoint_manual_procurement_uom/readme/DESCRIPTION.rst create mode 100644 stock_orderpoint_manual_procurement_uom/readme/USAGE.rst create mode 100644 stock_orderpoint_manual_procurement_uom/static/description/index.html diff --git a/stock_orderpoint_manual_procurement_uom/README.rst b/stock_orderpoint_manual_procurement_uom/README.rst index 4a3ecb35f..411613789 100644 --- a/stock_orderpoint_manual_procurement_uom/README.rst +++ b/stock_orderpoint_manual_procurement_uom/README.rst @@ -1,57 +1,82 @@ -.. 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 - ======================================= Stock Orderpoint Manual Procurement UoM ======================================= +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fstock--logistics--warehouse-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_orderpoint_manual_procurement_uom + :alt: OCA/stock-logistics-warehouse +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_orderpoint_manual_procurement_uom + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/153/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + Glue module for ``stock_orderpoint_uom`` and ``stock_orderpoint_manual_procurement`` +**Table of contents** + +.. contents:: + :local: + Usage ===== The recommended quantity to procure is adjusted to the procurement unit of measure indicated in the reordering rule. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/153/11.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 smashing it by providing a detailed and welcomed feedback. +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 `_. +* Eficent Contributors ------------- +~~~~~~~~~~~~ * Lois Rilo Antelo * Bhavesh Odedra +* Kitti Upariphutthiphong -Maintainer ----------- +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/stock-logistics-warehouse `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_orderpoint_manual_procurement_uom/__manifest__.py b/stock_orderpoint_manual_procurement_uom/__manifest__.py index 641fa2ea9..69eaefe97 100644 --- a/stock_orderpoint_manual_procurement_uom/__manifest__.py +++ b/stock_orderpoint_manual_procurement_uom/__manifest__.py @@ -5,7 +5,7 @@ "name": "Stock Orderpoint Manual Procurement UoM", "summary": "Glue module for stock_orderpoint_uom and " "stock_orderpoint_manual_procurement", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Eficent, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-warehouse", @@ -14,7 +14,6 @@ "stock_orderpoint_uom", "stock_orderpoint_manual_procurement", ], - "data": [], "license": "AGPL-3", 'installable': True, 'application': False, diff --git a/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot index 1ceb3187d..32e2d5fd1 100644 --- a/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot +++ b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-16 07:12+0000\n" +"PO-Revision-Date: 2019-03-16 07:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/stock_orderpoint_manual_procurement_uom/readme/CONTRIBUTORS.rst b/stock_orderpoint_manual_procurement_uom/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..da3985eca --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Lois Rilo Antelo +* Bhavesh Odedra +* Kitti Upariphutthiphong diff --git a/stock_orderpoint_manual_procurement_uom/readme/DESCRIPTION.rst b/stock_orderpoint_manual_procurement_uom/readme/DESCRIPTION.rst new file mode 100644 index 000000000..7311361bf --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Glue module for ``stock_orderpoint_uom`` and +``stock_orderpoint_manual_procurement`` diff --git a/stock_orderpoint_manual_procurement_uom/readme/USAGE.rst b/stock_orderpoint_manual_procurement_uom/readme/USAGE.rst new file mode 100644 index 000000000..2088fa8ac --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/readme/USAGE.rst @@ -0,0 +1,2 @@ +The recommended quantity to procure is adjusted to the procurement unit of +measure indicated in the reordering rule. diff --git a/stock_orderpoint_manual_procurement_uom/static/description/index.html b/stock_orderpoint_manual_procurement_uom/static/description/index.html new file mode 100644 index 000000000..4be05c3b4 --- /dev/null +++ b/stock_orderpoint_manual_procurement_uom/static/description/index.html @@ -0,0 +1,428 @@ + + + + + + +Stock Orderpoint Manual Procurement UoM + + + +
+

Stock Orderpoint Manual Procurement UoM

+ + +

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runbot

+

Glue module for stock_orderpoint_uom and +stock_orderpoint_manual_procurement

+

Table of contents

+ +
+

Usage

+

The recommended quantity to procure is adjusted to the procurement unit of +measure indicated in the reordering rule.

+
+
+

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

+
    +
  • Eficent
    • +
+
+
+

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/stock-logistics-warehouse project on GitHub.

+

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

+
+
+
+ + diff --git a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py index 75e494d45..5192dd1f6 100644 --- a/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py +++ b/stock_orderpoint_manual_procurement_uom/tests/test_stock_orderpoint_manual_procurement.py @@ -39,10 +39,10 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): self.group_purchase_manager], self.company1) # Get required Model data - self.product_uom = self.env.ref('product.product_uom_unit') + self.product_uom = self.env.ref('uom.product_uom_unit') self.location = self.env.ref('stock.stock_location_stock') self.product = self.env.ref('product.product_product_7') - self.dozen = self.env.ref('product.product_uom_dozen') + self.dozen = self.env.ref('uom.product_uom_dozen') # Create Product category and Product self.product_ctg = self._create_product_category() @@ -119,6 +119,8 @@ class TestStockWarehouseOrderpoint(common.TransactionCase): } wizard = self.make_procurement_orderpoint_model.sudo(self.user).\ with_context(context).create({}) + for line in wizard.item_ids: + line.onchange_uom_id() wizard.make_procurement() return wizard From db0b63293f4293743bb3397300d0a97c30877f37 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 26 Apr 2019 17:12:08 +0000 Subject: [PATCH 06/14] [UPD] Update stock_orderpoint_manual_procurement_uom.pot --- .../i18n/stock_orderpoint_manual_procurement_uom.pot | 2 -- 1 file changed, 2 deletions(-) diff --git a/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot index 32e2d5fd1..a019c7e00 100644 --- a/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot +++ b/stock_orderpoint_manual_procurement_uom/i18n/stock_orderpoint_manual_procurement_uom.pot @@ -6,8 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-16 07:12+0000\n" -"PO-Revision-Date: 2019-03-16 07:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" From 05dc4bb0565b6602c95a1c1a894c05fcc531bd91 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:43:10 +0000 Subject: [PATCH 07/14] [UPD] README.rst --- .../static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_orderpoint_manual_procurement_uom/static/description/index.html b/stock_orderpoint_manual_procurement_uom/static/description/index.html index 4be05c3b4..4ca8d27c2 100644 --- a/stock_orderpoint_manual_procurement_uom/static/description/index.html +++ b/stock_orderpoint_manual_procurement_uom/static/description/index.html @@ -3,7 +3,7 @@ - + Stock Orderpoint Manual Procurement UoM