From 39351ce20504003f7a70a1a01a0445a5924ba0fb Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 27 Aug 2015 12:09:25 +0200
Subject: [PATCH] [IMP] procurement*: adaptation due to the new Sale module
Major changes:
- No use of UoS anymore
Reason: complete rewrite of the Sale module.
Responsible: fp, dbo, nim
---
addons/procurement/procurement.py | 12 +++++++-----
addons/procurement/procurement_view.xml | 5 -----
addons/procurement/test/procurement.yml | 2 --
addons/procurement_jit/test/procurement_jit.yml | 1 -
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 89ce89cc6bb5..a7adae93ebf5 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -4,6 +4,7 @@
import time
from psycopg2 import OperationalError
+from openerp import api
from openerp import SUPERUSER_ID
from openerp.osv import fields, osv
import openerp.addons.decimal_precision as dp
@@ -109,9 +110,6 @@ class procurement_order(osv.osv):
'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'confirmed': [('readonly', False)]}, readonly=True),
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'confirmed': [('readonly', False)]}, readonly=True),
- 'product_uos_qty': fields.float('UoS Quantity', states={'confirmed': [('readonly', False)]}, readonly=True),
- 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'confirmed': [('readonly', False)]}, readonly=True),
-
'state': fields.selection([
('cancel', 'Cancelled'),
('confirmed', 'Confirmed'),
@@ -154,7 +152,7 @@ class procurement_order(osv.osv):
return result
def onchange_product_id(self, cr, uid, ids, product_id, context=None):
- """ Finds UoM and UoS of changed product.
+ """ Finds UoM of changed product.
@param product_id: Changed id of product.
@return: Dictionary of values.
"""
@@ -162,7 +160,6 @@ class procurement_order(osv.osv):
w = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
v = {
'product_uom': w.uom_id.id,
- 'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
}
return {'value': v}
return {}
@@ -179,6 +176,11 @@ class procurement_order(osv.osv):
def reset_to_confirmed(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
+ @api.v8
+ def run(self, autocommit=False):
+ return self._model.run(self._cr, self._uid, self.ids, autocommit=False, context=self._context)
+
+ @api.v7
def run(self, cr, uid, ids, autocommit=False, context=None):
for procurement_id in ids:
#we intentionnaly do the browse under the for loop to avoid caching all ids which would be resource greedy
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 636d8fa2fc4c..f3b7f7d15063 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -47,11 +47,6 @@
<field name="product_uom" class="oe_inline" groups="product.group_uom"/>
</div>
</div>
- <label for="product_uos_qty" groups="product.group_uos"/>
- <div groups="product.group_uos">
- <field name="product_uos_qty" class="oe_inline"/>
- <field name="product_uos" class="oe_inline"/>
- </div>
</group>
<group name="scheduling" string="Scheduling">
<field name="date_planned"/>
diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml
index 353bcaff3e8d..f9774f70e7b0 100644
--- a/addons/procurement/test/procurement.yml
+++ b/addons/procurement/test/procurement.yml
@@ -7,8 +7,6 @@
product_id: product.product_product_32
product_qty: 15.0
product_uom: product.product_uom_unit
- product_uos_qty: 15.0
- product_uos: product.product_uom_unit
-
I run the scheduler.
-
diff --git a/addons/procurement_jit/test/procurement_jit.yml b/addons/procurement_jit/test/procurement_jit.yml
index 82a0c5ea4804..1be88c6a7dd0 100644
--- a/addons/procurement_jit/test/procurement_jit.yml
+++ b/addons/procurement_jit/test/procurement_jit.yml
@@ -9,7 +9,6 @@
product_id: product.product_product_16
product_qty: 10.0
product_uom: product.product_uom_unit
- product_uos_qty: 0.0
-
I check that the procurement is automatically in exception because nothing is configured to handle this procurement.
-
--
GitLab