odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] stock_landed_costs : Fixed the calculation of landed costs. 

bzr revid: mdi@tinyerp.com-20140421104149-iscgxoru7rgb25xs
This commit is contained in:
DJ Patel 2014-04-21 16:11:49 +05:30
parent 4751a49a9f
commit d2c484656c
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/stock_landed_costs/stock_landed_costs.py
View File

@ -191,41 +191,29 @@ class stock_landed_cost(osv.osv):
dict = {}
for line in cost.cost_lines:
for valuation in cost.valuation_adjustment_lines:
value = 0.0
if valuation.cost_line_id and valuation.cost_line_id.id == line.id:
if line.split_method == 'by_quantity':
if line.split_method == 'by_quantity' and total_qty:
per_unit = (line.price_unit / total_qty)
value = valuation.quantity * per_unit
if valuation.id not in dict:
dict[valuation.id] = value
else:
dict[valuation.id] += value
elif line.split_method == 'by_weight':
per_unit = (line.price_unit / total_weight if total_weight else total_line)
value = valuation.quantity * per_unit
if valuation.id not in dict:
dict[valuation.id] = value
else:
dict[valuation.id] += value
elif line.split_method == 'by_volume':
per_unit = (line.price_unit / total_volume if total_volume else total_line)
value = valuation.quantity * per_unit
if valuation.id not in dict:
dict[valuation.id] = value
else:
dict[valuation.id] += value
elif line.split_method == 'by_weight' and total_weight:
per_unit = (line.price_unit / total_weight)
value = valuation.weight * per_unit
elif line.split_method == 'by_volume' and total_volume:
per_unit = (line.price_unit / total_volume)
value = valuation.volume * per_unit
elif line.split_method == 'equal':
per_unit = (line.price_unit / total_line)
if valuation.id not in dict:
dict[valuation.id] = per_unit
else:
dict[valuation.id] += per_unit
elif line.split_method == 'by_current_cost_price':
value = (line.price_unit / total_line)
elif line.split_method == 'by_current_cost_price' and total_cost:
per_unit = (line.price_unit / total_cost)
value = valuation.former_cost * per_unit
if valuation.id not in dict:
dict[valuation.id] = value
else:
dict[valuation.id] += value
else:
value = (line.price_unit / total_line)
if valuation.id not in dict:
dict[valuation.id] = value
else:
dict[valuation.id] += value
for key, value in dict.items():
line_obj.write(cr, uid, key, {'additional_landed_cost': value}, context=context)