diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 5c7fd3c9472..a8327e50d0f 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -40,7 +40,6 @@ class stock_partial_move(osv.osv_memory):
if m.state in ('done', 'cancel'):
raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
-
if 'move%s_product_id'%(m.id) not in self._columns:
self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
if 'move%s_product_qty'%(m.id) not in self._columns:
@@ -52,9 +51,9 @@ class stock_partial_move(osv.osv_memory):
if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
if 'move%s_product_price'%(m.id) not in self._columns:
- self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+ self._columns['move%s_product_price'%(m.id)] = fields.float("Cost", help="Unit Cost for this product line")
if 'move%s_product_currency'%(m.id) not in self._columns:
- self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+ self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed")
return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
@@ -109,14 +108,15 @@ class stock_partial_move(osv.osv_memory):
if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
_moves_fields.update({
'move%s_product_price'%(m.id) : {
- 'string': _('Price'),
+ 'string': _('Cost'),
'type' : 'float',
+ 'help': _('Unit Cost for this product line'),
},
'move%s_product_currency'%(m.id): {
'string': _('Currency'),
- 'type' : 'float',
'type' : 'many2one',
'relation': 'res.currency',
+ 'help': _("Currency in which Unit Cost is expressed"),
}
})
_moves_arch_lst += """
@@ -162,8 +162,6 @@ class stock_partial_move(osv.osv_memory):
if m.state in ('done', 'cancel'):
continue
res['type'] = m.picking_id and m.picking_id.type or ''
-
-
if 'move%s_product_id'%(m.id) in fields:
res['move%s_product_id'%(m.id)] = m.product_id.id
if 'move%s_product_qty'%(m.id) in fields:
@@ -171,10 +169,12 @@ class stock_partial_move(osv.osv_memory):
if 'move%s_product_uom'%(m.id) in fields:
res['move%s_product_uom'%(m.id)] = m.product_uom.id
if 'move%s_prodlot_id'%(m.id) in fields:
- res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
- if m.product_id.cost_method == 'average' :
+ res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
+ if m.picking_id.type == 'in' and m.product_id.cost_method == 'average':
+ # Always use default product cost and currency from Product Form,
+ # which belong to the Company owning the product
+ currency = m.product_id.company_id.currency_id.id
price = m.product_id.standard_price
- currency = False
if 'move%s_product_price'%(m.id) in fields:
res['move%s_product_price'%(m.id)] = price
if 'move%s_product_currency'%(m.id) in fields:
@@ -204,7 +204,7 @@ class stock_partial_move(osv.osv_memory):
'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id,
- 'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
+ 'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
}
if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 2d9ec901a8d..1b746f230b5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -35,8 +35,8 @@ class stock_partial_picking(osv.osv_memory):
pick_obj = self.pool.get('stock.picking')
if not context:
context={}
- moveids = []
for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+ need_product_cost = (pick.type == 'in')
for m in pick.move_lines:
if m.state in ('done', 'cancel'):
continue
@@ -49,11 +49,11 @@ class stock_partial_picking(osv.osv_memory):
if 'move%s_prodlot_id'%(m.id) not in self._columns:
self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
- if (m.product_id.cost_method == 'average'):
+ if (need_product_cost and m.product_id.cost_method == 'average'):
if 'move%s_product_price'%(m.id) not in self._columns:
- self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+ self._columns['move%s_product_price'%(m.id)] = fields.float("Cost", help="Unit Cost for this product line")
if 'move%s_product_currency'%(m.id) not in self._columns:
- self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+ self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed")
return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
@@ -70,6 +70,7 @@ class stock_partial_picking(osv.osv_memory):
_moves_fields = result['fields']
if picking_ids and view_type in ['form']:
for pick in pick_obj.browse(cr, uid, picking_ids, context):
+ need_product_cost = (pick.type == 'in')
for m in pick.move_lines:
if m.state in ('done', 'cancel'):
continue
@@ -107,17 +108,19 @@ class stock_partial_picking(osv.osv_memory):
"""%(m.id, m.id, m.id, m.id,m.id)
- if (m.product_id.cost_method == 'average'):
+
+ if (need_product_cost and m.product_id.cost_method == 'average'):
_moves_fields.update({
'move%s_product_price'%(m.id) : {
- 'string': _('Price'),
+ 'string': _('Cost'),
'type' : 'float',
+ 'help': _('Unit Cost for this product line'),
},
'move%s_product_currency'%(m.id): {
'string': _('Currency'),
- 'type' : 'float',
'type' : 'many2one',
'relation': 'res.currency',
+ 'help': _("Currency in which Unit Cost is expressed"),
}
})
_moves_arch_lst += """
@@ -155,10 +158,10 @@ class stock_partial_picking(osv.osv_memory):
pick_obj = self.pool.get('stock.picking')
if not context:
context={}
- moveids = []
if 'date' in fields:
res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+ need_product_cost = (pick.type == 'in')
for m in pick.move_lines:
if m.state in ('done', 'cancel'):
continue
@@ -170,8 +173,10 @@ class stock_partial_picking(osv.osv_memory):
res['move%s_product_uom'%(m.id)] = m.product_uom.id
if 'move%s_prodlot_id'%(m.id) in fields:
res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
- if (m.product_id.cost_method == 'average'):
- currency = False
+ if (need_product_cost and m.product_id.cost_method == 'average'):
+ # Always use default product cost and currency from Product Form,
+ # which belong to the Company owning the product
+ currency = m.product_id.company_id.currency_id.id
price = m.product_id.standard_price
if 'move%s_product_price'%(m.id) in fields:
res['move%s_product_price'%(m.id)] = price
@@ -195,6 +200,7 @@ class stock_partial_picking(osv.osv_memory):
'delivery_date' : partial.date
}
for pick in pick_obj.browse(cr, uid, picking_ids):
+ need_product_cost = (pick.type == 'in')
for m in pick.move_lines:
if m.state in ('done', 'cancel'):
continue
@@ -205,12 +211,12 @@ class stock_partial_picking(osv.osv_memory):
'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
}
- if (m.product_id.cost_method == 'average'):
+ if (need_product_cost and m.product_id.cost_method == 'average'):
partial_datas['move%s'%(m.id)].update({
'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
})
- res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+ pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
return {}
stock_partial_picking()