From 282cffc7fd0f2db7bf189bb029983c362f582e08 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Mon, 5 Mar 2018 21:44:09 +0530 Subject: [PATCH] [CHG] website url and improve method --- stock_orderpoint_uom/__manifest__.py | 2 +- stock_orderpoint_uom/models/procurement_group.py | 10 ++++++---- .../tests/test_stock_orderpoint_procure_uom.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/stock_orderpoint_uom/__manifest__.py b/stock_orderpoint_uom/__manifest__.py index 6cc18006f..5903c8c8e 100644 --- a/stock_orderpoint_uom/__manifest__.py +++ b/stock_orderpoint_uom/__manifest__.py @@ -8,7 +8,7 @@ "version": "11.0.1.0.0", "author": "Eficent, " "Odoo Community Association (OCA)", - "website": "https://www.odoo-community.org", + "website": "https://github.com/OCA/stock-logistics-warehouse", "category": "Warehouse Management", "depends": ["purchase", "stock"], "data": ["views/stock_warehouse_orderpoint_view.xml"], diff --git a/stock_orderpoint_uom/models/procurement_group.py b/stock_orderpoint_uom/models/procurement_group.py index 622544e97..325b82563 100644 --- a/stock_orderpoint_uom/models/procurement_group.py +++ b/stock_orderpoint_uom/models/procurement_group.py @@ -13,9 +13,11 @@ class ProcurementGroup(models.Model): origin, values): if 'orderpoint_id' in values: orderpoint = values.get('orderpoint_id') - product_qty = orderpoint.product_uom._compute_quantity( - product_qty, orderpoint.procure_uom_id) + if orderpoint.procure_uom_id and \ + product_uom != orderpoint.procure_uom_id: + product_qty = product_uom._compute_quantity( + product_qty, orderpoint.procure_uom_id) + product_uom = orderpoint.procure_uom_id return super(ProcurementGroup, self).run(product_id, product_qty, - orderpoint.procure_uom_id, - location_id, + product_uom, location_id, name, origin, values) diff --git a/stock_orderpoint_uom/tests/test_stock_orderpoint_procure_uom.py b/stock_orderpoint_uom/tests/test_stock_orderpoint_procure_uom.py index ec370d43f..803679e5f 100644 --- a/stock_orderpoint_uom/tests/test_stock_orderpoint_procure_uom.py +++ b/stock_orderpoint_uom/tests/test_stock_orderpoint_procure_uom.py @@ -62,7 +62,7 @@ class TestStockOrderpointProcureUom(common.TransactionCase): self.assertEquals(len(purchase_line), 1) self.assertEqual(purchase_line.product_id, self.productA) self.assertEqual(purchase_line.product_uom, self.uom_dozen) - self.assertEqual(purchase_line.product_qty, 2.0) + self.assertEqual(purchase_line.product_qty, 2) def test_stock_orderpoint_wrong_uom(self):