From 27fe53e940a9b7577ecec8f188ee1f5b81af07e7 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Mon, 10 Oct 2011 11:49:22 +0530
Subject: [PATCH] [Fix] Stock:Change field name  property_stock_variation into
 property_stock_valuation_account_id

lp bug: https://launchpad.net/bugs/777522 fixed

bzr revid: aag@tinyerp.com-20111010061922-630tnm331s73ze7g
---
 addons/stock/product.py       | 9 ++++-----
 addons/stock/product_view.xml | 2 +-
 addons/stock/stock_demo.xml   | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index f67ba726816..95fa850e521 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -44,13 +44,12 @@ class product_product(osv.osv):
             stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
 
         journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
-        account_variation = product_obj.categ_id.property_stock_variation and product_obj.categ_id.property_stock_variation.id or False
-
+        account_variation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
         return {
             'stock_account_input': stock_input_acc,
             'stock_account_output': stock_output_acc,
             'stock_journal': journal_id,
-            'property_stock_variation': account_variation
+            'property_stock_valuation_account_id': account_variation
         }
 
     def do_change_standard_price(self, cr, uid, ids, datas, context=None):
@@ -71,7 +70,7 @@ class product_product(osv.osv):
         stock_input_acc = datas.get('stock_input_account', False)
         journal_id = datas.get('stock_journal', False)
         product_obj=self.browse(cr, uid, ids, context=context)[0]
-        account_variation = product_obj.categ_id.property_stock_variation
+        account_variation = product_obj.categ_id.property_stock_valuation_account_id
         account_variation_id = account_variation and account_variation.id or False
         if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
         move_ids = []
@@ -449,7 +448,7 @@ class product_category(osv.osv):
             type='many2one', relation='account.account',
             string='Stock Output Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
-        'property_stock_variation': fields.property('account.account',
+        'property_stock_valuation_account_id': fields.property('account.account',
             type='many2one',
             relation='account.account',
             string="Stock Valuation Account",
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index a0059ce60d3..39d155b57d4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -27,7 +27,7 @@
                         <separator string="Accounting Stock Properties" colspan="2"/>
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_variation"/>
+                        <field name="property_stock_valuation_account_id"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 7bcda8a200e..386a4d60e30 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -260,9 +260,9 @@
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
 
-        <record forcecreate="True" id="property_stock_variation" model="ir.property">
-            <field name="name">property_stock_variation</field>
-            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_variation')]"/>
+        <record forcecreate="True" id="property_stock_valuation_account_id" model="ir.property">
+            <field name="name">property_stock_valuation_account_id</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
             <field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
              <field name="company_id" ref="base.main_company"/>
         </record>