From ed605d0f45bc819bc4f8c17e4ce9200825834c0b Mon Sep 17 00:00:00 2001
From: DJ Patel <mdi@tinyerp.com>
Date: Wed, 9 Apr 2014 15:09:18 +0530
Subject: [PATCH] [ADD] stock_landed_costs : Added the function to calculate
 final coston valuation adjustment lines.

bzr revid: mdi@tinyerp.com-20140409093918-mmgbiya5ai993xwv
---
 .../stock_landed_costs/stock_landed_costs.py   | 18 ++++++++++++++----
 .../stock_landed_costs_view.xml                |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index 11ead0ab85e..9663781d8b6 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -135,15 +135,25 @@ class stock_valuation_adjustment_lines(osv.osv):
     _name = 'stock.valuation.adjustment.lines'
     _description = 'Stock Valuation Adjustment Lines'
 
+    def _amount_final(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            result[line.id] = (line.former_cost + line.additional_landed_cost)
+        return result
+
     _columns = {
         'name': fields.char('Description', size=256),
         'cost_id': fields.many2one('stock.landed.cost', 'Landed Cost', required=True, ondelete='cascade'),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
-        'former_cost': fields.float('Former Cost', required=True, digits_compute= dp.get_precision('Product Price')),
-        'former_cost_per_unit': fields.float('Former Cost(Per Unit)', required=True, digits_compute= dp.get_precision('Product Price')),
-        'additional_landed_cost': fields.float('Additional Landed Cost', required=True, digits_compute= dp.get_precision('Product Price')),
-        'final_cost': fields.float('Final Cost', required=True, 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.float('Former Cost(Per Unit)', 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, string='Final Cost', type='float', digits_compute= dp.get_precision('Account'), store=True),
+    }
+
+    _defaults = {
+        'quantity': 1.0,
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_landed_costs/stock_landed_costs_view.xml b/addons/stock_landed_costs/stock_landed_costs_view.xml
index 89efd8cc38c..477b13ed56d 100644
--- a/addons/stock_landed_costs/stock_landed_costs_view.xml
+++ b/addons/stock_landed_costs/stock_landed_costs_view.xml
@@ -78,7 +78,6 @@
                                             <group>
                                                 <field name="former_cost"/>
                                                 <field name="additional_landed_cost"/>
-                                                <field name="final_cost"/>
                                             </group>
                                         </group>
                                     </form>