Merge lp:~openerp-dev/openobject-addons/trunk-bug-777522-aag into lp:openobject-addons

[Atik Agewan(OpenERP)]

 Hello,

   Stock:Rename string "Stock Variation Account" to "Stock Valuation Account"

 Thanks
  Atik

[Rucha (Open ERP) (rpa-openerp)]

review: Approve

[qdp (OpenERP) (qdp)]

it's better to change name in the code too as we are on a trunk version (but not for long, so it's better to do it now).

So please, change also the field name into 'property_stock_valuation_account_id'

thanks,
Quentin

review: Needs Fixing

[Atik Agewan(OpenERP) (aag-openerp)]

Hello,

  Stock:Change field name property_stock_variation into property_stock_valuation_account_id.

 Thanks
  Atik

review: Needs Resubmitting

[Rucha (Open ERP) (rpa-openerp)]

I have seen that there is still one remaining reference to the old property name in stock/stock.py
can you please check that,
also change the name in pot,
thanks

review: Needs Fixing

[Atik Agewan(OpenERP) (aag-openerp)]

 Hello ,

   changes are done as per your suggestion.

 Thanks
  Atik

review: Needs Resubmitting

=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot	2011-03-17 17:33:16 +0000
+++ stock/i18n/stock.pot	2011-10-10 11:37:19 +0000
@@ -1978,8 +1978,8 @@
 msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
 msgstr ""
 
 #. module: stock
@@ -2036,7 +2036,7 @@
 msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation:0
+#: help:product.category,property_stock_valuation_account_id:0
 msgid "When real-time inventory valuation is enabled on a product, this account will hold the current value of the products."
 msgstr ""
 

=== modified file 'stock/product.py'
--- stock/product.py	2011-08-28 01:17:39 +0000
+++ stock/product.py	2011-10-10 11:37:19 +0000
@@ -44,13 +44,12 @@
             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_valuation = 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_valuation
         }
 
     def do_change_standard_price(self, cr, uid, ids, datas, context=None):
@@ -71,9 +70,9 @@
         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_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))
+        account_valuation = product_obj.categ_id.property_stock_valuation_account_id
+        account_valuation_id = account_valuation and account_valuation.id or False
+        if not account_valuation_id: raise osv.except_osv(_('Error!'), _('Valuation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
         move_ids = []
         loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
@@ -132,7 +131,7 @@
                                     })
                         move_line_obj.create(cr, uid, {
                                     'name': product.categ_id.name,
-                                    'account_id': account_variation_id,
+                                    'account_id': account_valuation_id,
                                     'credit': amount_diff,
                                     'move_id': move_id
                                     })
@@ -158,7 +157,7 @@
                                     })
                         move_line_obj.create(cr, uid, {
                                         'name': product.categ_id.name,
-                                        'account_id': account_variation_id,
+                                        'account_id': account_valuation_id,
                                         'debit': amount_diff,
                                         'move_id': move_id
                                     })
@@ -449,10 +448,10 @@
             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 Variation Account",
+            string="Stock Valuation Account",
             view_load=True,
             help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2011-09-29 05:14:07 +0000
+++ stock/product_view.xml	2011-10-10 11:37:19 +0000
@@ -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>

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-09-27 21:38:03 +0000
+++ stock/stock.py	2011-10-10 11:37:19 +0000
@@ -2033,14 +2033,14 @@
         else:
             acc_dest = accounts['stock_account_output']
 
-        acc_variation = accounts.get('property_stock_variation', False)
+        acc_valuation = accounts.get('property_stock_valuation_account_id', False)
         journal_id = accounts['stock_journal']
 
-        if acc_dest == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same.'))
+        if acc_dest == acc_valuation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Output Account defined on this product and Valuation account on category of this product are same.'))
 
-        if acc_src == acc_variation:
-            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same.'))
+        if acc_src == acc_valuation:
+            raise osv.except_osv(_('Error!'),  _('Can not create Journal Entry, Input Account defined on this product and Valuation account on category of this product are same.'))
 
         if not acc_src:
             raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
@@ -2051,10 +2051,10 @@
         if not journal_id:
             raise osv.except_osv(_('Error!'), _('There is no journal defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        if not acc_variation:
-            raise osv.except_osv(_('Error!'), _('There is no inventory variation account defined on the product category: "%s" (id: %d)') % \
+        if not acc_valuation:
+            raise osv.except_osv(_('Error!'), _('There is no inventory Valuation account defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        return journal_id, acc_src, acc_dest, acc_variation
+        return journal_id, acc_src, acc_dest, acc_valuation
 
     def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
         """
@@ -2104,17 +2104,17 @@
             if move.location_id.company_id \
                 and (move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal'\
                      or move.location_id.company_id != move.location_dest_id.company_id):
-                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
+                journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_variation, acc_dest, reference_amount, reference_currency_id, context))]
+                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
 
             # Incoming moves (or cross-company input part)
             if move.location_dest_id.company_id \
                 and (move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal'\
                      or move.location_id.company_id != move.location_dest_id.company_id):
-                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
+                journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_variation, reference_amount, reference_currency_id, context))]
+                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
 
             move_obj = self.pool.get('account.move')
             for j_id, move_lines in account_moves:

=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml	2011-07-19 10:46:31 +0000
+++ stock/stock_demo.xml	2011-10-10 11:37:19 +0000
@@ -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>