pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch 8.0 up to b112631

Browse Source
This commit is contained in:
Christophe Simonis
2016-04-20 15:17:55 +02:00
parent a255a6f6a4 b112631bef
commit ff3a73195e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock_landed_costs/stock_landed_costs.py
+3 -4
View File
@@ -230,8 +230,7 @@ class stock_landed_cost(osv.osv):
if not line.move_id: if not line.move_id:
continue continue
per_unit = line.final_cost / line.quantity per_unit = line.final_cost / line.quantity
# FORWARDPORT UP TO SAAS-10 diff = per_unit - line.former_cost_per_unit
diff = per_unit - (line.former_cost / line.quantity if line.quantity else 1.0)
# If the precision required for the variable diff is larger than the accounting # If the precision required for the variable diff is larger than the accounting
# precision, inconsistencies between the stock valuation and the accounting entries # precision, inconsistencies between the stock valuation and the accounting entries
@@ -411,9 +410,9 @@ class stock_valuation_adjustment_lines(osv.osv):
'weight': fields.float('Weight', digits_compute=dp.get_precision('Product Unit of Measure')), 'weight': fields.float('Weight', digits_compute=dp.get_precision('Product Unit of Measure')),
'volume': fields.float('Volume', digits_compute=dp.get_precision('Product Unit of Measure')), 'volume': fields.float('Volume', digits_compute=dp.get_precision('Product Unit of Measure')),
'former_cost': fields.float('Former Cost', digits_compute=dp.get_precision('Product Price')), 'former_cost': fields.float('Former Cost', digits_compute=dp.get_precision('Product Price')),
'former_cost_per_unit': fields.function(_amount_final, multi='cost', string='Former Cost(Per Unit)', type='float', digits_compute=dp.get_precision('Account'), store=True), 'former_cost_per_unit': fields.function(_amount_final, multi='cost', string='Former Cost(Per Unit)', type='float', store=True, digits=0),
'additional_landed_cost': fields.float('Additional Landed Cost', digits_compute=dp.get_precision('Product Price')), 'additional_landed_cost': fields.float('Additional Landed Cost', digits_compute=dp.get_precision('Product Price')),
'final_cost': fields.function(_amount_final, multi='cost', string='Final Cost', type='float', digits_compute=dp.get_precision('Account'), store=True), 'final_cost': fields.function(_amount_final, multi='cost', string='Final Cost', type='float', store=True, digits=0),
} }
_defaults = { _defaults = {