From 083108a624ed3f3018a4ff2d5226bece96032934 Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Wed, 7 May 2014 18:59:51 +0200
Subject: [PATCH] [IMP] delivery,stock,mrp: minor
cleanup/spellchecking/nit-picking while reviewing
bzr revid: odo@openerp.com-20140507165951-th4iqsrp6l67dvve
---
addons/delivery/delivery_view.xml | 4 ++--
addons/delivery/stock.py | 19 ++++++++++---------
addons/mrp/stock.py | 9 ++++-----
addons/mrp/tests/test_multicompany.py | 8 ++++----
addons/mrp/wizard/mrp_product_produce.py | 12 ++++++------
addons/mrp/wizard/stock_move.py | 18 ------------------
addons/stock/stock.py | 13 +++++--------
7 files changed, 31 insertions(+), 52 deletions(-)
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 9c40bf4f180..31c0e08b093 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -101,7 +101,7 @@
UPS Express, UPS Standard) with a set of pricing rules attached
to each method.
- These methods allows to automaticaly compute the delivery price
+ These methods allow to automatically compute the delivery price
according to your settings; on the sales order (based on the
quotation) or the invoice (based on the delivery orders).
@@ -224,7 +224,7 @@
-
+
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index f59af980a2d..38f8d0769fc 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -67,7 +67,7 @@ class stock_picking(osv.osv):
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of measurement for Weight",),
- }
+ }
def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):
"""Prepare the invoice line to add to the shipping costs to the shipping's
@@ -119,8 +119,6 @@ class stock_picking(osv.osv):
}
def _create_invoice_from_picking(self, cr, uid, picking, vals, context=None):
- ''' This function simply creates the invoice from the given values. It is overriden in delivery module to add the delivery costs. picking is a browse_record
- '''
invoice_line_obj = self.pool.get('account.invoice.line')
invoice_id = super(stock_picking, self)._create_invoice_from_picking(cr, uid, picking, vals, context=context)
invoice = self.browse(cr, uid, invoice_id, context=context)
@@ -129,11 +127,12 @@ class stock_picking(osv.osv):
invoice_line_obj.create(cr, uid, invoice_line)
return invoice_id
- def _get_default_uom(self, cr, uid, c):
- uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+ def _get_default_uom(self, cr, uid, context=None):
+ uom_categ_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'product.product_uom_categ_kgm')
return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id), ('factor', '=', 1)])[0]
+
_defaults = {
- 'weight_uom_id': lambda self, cr, uid, c: self._get_default_uom(cr, uid, c)
+ 'weight_uom_id': lambda self, cr, uid, c: self._get_default_uom(cr, uid, c),
}
@@ -173,11 +172,13 @@ class stock_move(osv.osv):
}),
'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
}
- def _get_default_uom(self,cr,uid,c):
- uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+
+ def _get_default_uom(self, cr, uid, context=None):
+ uom_categ_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'product.product_uom_categ_kgm')
return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
+
_defaults = {
- 'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
+ 'weight_uom_id': lambda self, cr, uid, c: self._get_default_uom(cr, uid, c),
}
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index d0592128908..59c4e3d637f 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -19,12 +19,13 @@
#
##############################################################################
+import time
+
from openerp.osv import fields
from openerp.osv import osv
from openerp.tools.translate import _
from openerp import SUPERUSER_ID
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-import time
class StockMove(osv.osv):
_inherit = 'stock.move'
@@ -69,8 +70,6 @@ class StockMove(osv.osv):
"""
bom_obj = self.pool.get('mrp.bom')
move_obj = self.pool.get('stock.move')
- procurement_obj = self.pool.get('procurement.order')
- product_obj = self.pool.get('product.product')
to_explode_again_ids = []
processed_ids = []
bis = self._check_phantom_bom(cr, uid, move, context=context)
@@ -140,9 +139,9 @@ class StockMove(osv.osv):
ids2 = []
for move in self.browse(cr, uid, ids, context=context):
if move.state == 'draft':
- ids2.extend(self.action_confirm(cr, uid, [move.id], context=context))
+ ids2.extend(self.action_confirm(cr, uid, [move.id], context=context))
else:
- ids2.append(move.id)
+ ids2.append(move.id)
for move in self.browse(cr, uid, ids2, context=context):
move_qty = move.product_qty
diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py
index 1996136130d..82093c75407 100644
--- a/addons/mrp/tests/test_multicompany.py
+++ b/addons/mrp/tests/test_multicompany.py
@@ -33,9 +33,9 @@ class TestMrpMulticompany(common.TransactionCase):
self.res_users = self.registry('res.users')
self.stock_location = self.registry('stock.location')
- model, group_user_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
- model, group_stock_manager_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'group_stock_manager')
- model, company_2_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'stock', 'res_company_1')
+ group_user_id = self.registry('ir.model.data').xmlid_to_res_id(cr, uid, 'base.group_user')
+ group_stock_manager_id = self.registry('ir.model.data').xmlid_to_res_id(cr, uid, 'stock.group_stock_manager')
+ company_2_id = self.registry('ir.model.data').xmlid_to_res_id(cr, uid, 'stock.res_company_1')
self.multicompany_user_id = self.res_users.create(cr, uid,
{'name': 'multicomp', 'login': 'multicomp',
'groups_id': [(6, 0, [group_user_id, group_stock_manager_id])],
@@ -47,7 +47,7 @@ class TestMrpMulticompany(common.TransactionCase):
cr, uid, context = self.cr, self.multicompany_user_id, {}
fields = ['location_src_id', 'location_dest_id']
defaults = self.stock_location.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
- for field in fields:
+ for field in fields:
if defaults.get(field):
try:
self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 97ce85be457..890ec211b07 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -28,12 +28,12 @@ class mrp_product_produce_line(osv.osv_memory):
_description = "Product Produce Consume lines"
_columns = {
- 'product_id': fields.many2one('product.product', 'Product'),
- 'product_qty': fields.float('Quantity (in default UoM)'),
- 'lot_id': fields.many2one('stock.production.lot', 'Lot'),
- 'produce_id': fields.many2one('mrp.product.produce'),
- 'track_production': fields.related('product_id', 'track_production', type='boolean')
- }
+ 'product_id': fields.many2one('product.product', 'Product'),
+ 'product_qty': fields.float('Quantity (in default UoM)'),
+ 'lot_id': fields.many2one('stock.production.lot', 'Lot'),
+ 'produce_id': fields.many2one('mrp.product.produce'),
+ 'track_production': fields.related('product_id', 'track_production', type='boolean'),
+ }
class mrp_product_produce(osv.osv_memory):
_name = "mrp.product.produce"
diff --git a/addons/mrp/wizard/stock_move.py b/addons/mrp/wizard/stock_move.py
index f779916ae87..9d87dd1cf01 100644
--- a/addons/mrp/wizard/stock_move.py
+++ b/addons/mrp/wizard/stock_move.py
@@ -37,14 +37,6 @@ class stock_move_consume(osv.osv_memory):
#TOFIX: product_uom should not have different category of default UOM of product. Qty should be convert into UOM of original move line before going in consume and scrap
def default_get(self, cr, uid, fields, context=None):
- """ Get default values
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for default value
- @param context: A standard dictionary
- @return: default values of fields
- """
if context is None:
context = {}
res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
@@ -62,14 +54,6 @@ class stock_move_consume(osv.osv_memory):
def do_move_consume(self, cr, uid, ids, context=None):
- """ To move consumed products
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
- @return:
- """
if context is None:
context = {}
move_obj = self.pool.get('stock.move')
@@ -80,5 +64,3 @@ class stock_move_consume(osv.osv_memory):
context=context)
return {'type': 'ir.actions.act_window_close'}
-
-
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9131200ceee..754188ed5ad 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -4098,20 +4098,17 @@ class stock_picking_type(osv.osv):
return False
obj_data = self.pool.get('ir.model.data')
- stock_loc = obj_data.get_object_reference(cr, uid, 'stock','stock_location_stock')[1]
+ stock_loc = obj_data.xmlid_to_res_id(cr, uid, 'stock.stock_location_stock')
result = {
'default_location_src_id': stock_loc,
'default_location_dest_id': stock_loc,
}
if picking_code == 'incoming':
- result['default_location_src_id'] = obj_data.get_object_reference(cr, uid, 'stock','stock_location_suppliers')[1]
- return {'value': result}
- if picking_code == 'outgoing':
- result['default_location_dest_id'] = obj_data.get_object_reference(cr, uid, 'stock','stock_location_customers')[1]
- return {'value': result}
- else:
- return {'value': result}
+ result['default_location_src_id'] = obj_data.xmlid_to_res_id(cr, uid, 'stock.stock_location_suppliers')
+ elif picking_code == 'outgoing':
+ result['default_location_dest_id'] = obj_data.xmlid_to_res_id(cr, uid, 'stock.stock_location_customers')
+ return {'value': result}
def _get_name(self, cr, uid, ids, field_names, arg, context=None):
return dict(self.name_get(cr, uid, ids, context=context))