[IMP] stock_landed_costs : If weight and volume is not there, then divide the cost equally among the lines.
bzr revid: mdi@tinyerp.com-20140411094843-o0ravoiyfw9mda0m
This commit is contained in:
parent
442a73af4e
commit
bd665fbada
|
@ -137,7 +137,6 @@ class stock_landed_cost(osv.osv):
|
||||||
continue
|
continue
|
||||||
line_obj.copy(cr, uid, valuation.id, default={'cost_line_id': line.id, 'flag': 'duplicate'}, context=context)
|
line_obj.copy(cr, uid, valuation.id, default={'cost_line_id': line.id, 'flag': 'duplicate'}, context=context)
|
||||||
|
|
||||||
|
|
||||||
for cost in self.browse(cr, uid, ids, context=None):
|
for cost in self.browse(cr, uid, ids, context=None):
|
||||||
dict = {}
|
dict = {}
|
||||||
for line in cost.cost_lines:
|
for line in cost.cost_lines:
|
||||||
|
@ -151,14 +150,14 @@ class stock_landed_cost(osv.osv):
|
||||||
else:
|
else:
|
||||||
dict[valuation.id] += value
|
dict[valuation.id] += value
|
||||||
elif line.split_method == 'by_weight':
|
elif line.split_method == 'by_weight':
|
||||||
per_unit = (line.price_unit / total_weight or 1.0)
|
per_unit = (line.price_unit / total_weight if total_weight else total_line)
|
||||||
value = valuation.quantity * per_unit
|
value = valuation.quantity * per_unit
|
||||||
if valuation.id not in dict:
|
if valuation.id not in dict:
|
||||||
dict[valuation.id] = value
|
dict[valuation.id] = value
|
||||||
else:
|
else:
|
||||||
dict[valuation.id] += value
|
dict[valuation.id] += value
|
||||||
elif line.split_method == 'by_volume':
|
elif line.split_method == 'by_volume':
|
||||||
per_unit = (line.price_unit / total_volume or 1.0)
|
per_unit = (line.price_unit / total_volume if total_volume else total_line)
|
||||||
value = valuation.quantity * per_unit
|
value = valuation.quantity * per_unit
|
||||||
if valuation.id not in dict:
|
if valuation.id not in dict:
|
||||||
dict[valuation.id] = value
|
dict[valuation.id] = value
|
||||||
|
|
Loading…
Reference in New Issue