From b3967dfecea9d019796958664bb75ed1f03b6824 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 7 May 2014 11:34:17 +0200
Subject: [PATCH] [REF] stock: renamed th_qty field into theoretical_qty for
 more clarity

bzr revid: qdp-launchpad@openerp.com-20140507093417-nvvifmnz0ds9z7fb
---
 addons/stock/stock.py       | 18 +++++++++---------
 addons/stock/stock_view.xml | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0098688e2ef..b5da935ee93 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2496,7 +2496,7 @@ class stock_inventory(osv.osv):
         """
         for inv in self.browse(cr, uid, ids, context=context):
             for inventory_line in inv.line_ids:
-                if inventory_line.product_qty < 0 and inventory_line.product_qty != inventory_line.th_qty:
+                if inventory_line.product_qty < 0 and inventory_line.product_qty != inventory_line.theoretical_qty:
                     raise osv.except_osv(_('Warning'), _('You cannot set a negative product quantity in an inventory line:\n\t%s - qty: %s' % (inventory_line.product_id.name, inventory_line.product_qty)))
             self.action_check(cr, uid, [inv.id], context=context)
             inv.refresh()
@@ -2608,7 +2608,7 @@ class stock_inventory(osv.osv):
                 if not value:
                     product_line[key] = False
             product_line['inventory_id'] = inventory.id
-            product_line['th_qty'] = product_line['product_qty']
+            product_line['theoretical_qty'] = product_line['product_qty']
             if product_line['product_id']:
                 product = product_obj.browse(cr, uid, product_line['product_id'], context=context)
                 product_line['product_uom_id'] = product.uom_id.id
@@ -2640,7 +2640,7 @@ class stock_inventory_line(osv.osv):
         'company_id': fields.related('inventory_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, select=True, readonly=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'state': fields.related('inventory_id', 'state', type='char', string='Status', readonly=True),
-        'th_qty': fields.float('Theoretical Quantity', readonly=True),
+        'theoretical_qty': fields.float('Theoretical Quantity', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Owner'),
         'product_name': fields.related('product_id', 'name', type='char', string='Product Name', store={
                                                                                             'product.product': (_get_product_name_change, ['name', 'default_code'], 20),
@@ -2662,7 +2662,7 @@ class stock_inventory_line(osv.osv):
 
     def _resolve_inventory_line(self, cr, uid, inventory_line, context=None):
         stock_move_obj = self.pool.get('stock.move')
-        diff = inventory_line.th_qty - inventory_line.product_qty
+        diff = inventory_line.theoretical_qty - inventory_line.product_qty
         if not diff:
             return
         #each theorical_lines where difference between theoretical and checked quantities is not 0 is a line for which we need to create a stock move
@@ -2690,8 +2690,8 @@ class stock_inventory_line(osv.osv):
             vals['product_uom_qty'] = diff
         return stock_move_obj.create(cr, uid, vals, context=context)
 
-    def restrict_change(self, cr, uid, ids, th_qty, context=None):
-        if ids and th_qty:
+    def restrict_change(self, cr, uid, ids, theoretical_qty, context=None):
+        if ids and theoretical_qty:
             #if the user try to modify a line prepared by openerp, reject the change and display an error message explaining how he should do
             old_value = self.browse(cr, uid, ids[0], context=context)
             return {
@@ -2710,15 +2710,15 @@ class stock_inventory_line(osv.osv):
             }
         return {}
 
-    def on_change_product_id(self, cr, uid, ids, product, uom, th_qty, context=None):
+    def on_change_product_id(self, cr, uid, ids, product, uom, theoretical_qty, context=None):
         """ Changes UoM
         @param location_id: Location id
         @param product: Changed product_id
         @param uom: UoM product
         @return:  Dictionary of changed values
         """
-        if ids and th_qty:
-            return self.restrict_change(cr, uid, ids, th_qty, context=context)
+        if ids and theoretical_qty:
+            return self.restrict_change(cr, uid, ids, theoretical_qty, context=context)
         if not product:
             return {'value': {'product_uom_id': False}}
         obj_product = self.pool.get('product.product').browse(cr, uid, product, context=context)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a0c441663c0..b5bd13697c5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -126,14 +126,14 @@
                         <page string="Inventory Details" >
                             <button name="set_checked_qty" states="confirm" string="⇒ Set quantities to 0" type="object" class="oe_link oe_right" groups="stock.group_stock_user"/>
                             <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
-                                <tree string="Inventory Details" editable="bottom" colors="blue: product_qty != th_qty; red: th_qty &lt; 0">
-                                    <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(product_id,product_uom_id,th_qty,context)" domain="[('type','=','product')]"/>
-                                    <field name="product_uom_id" groups="product.group_uom" on_change="restrict_change(th_qty)"/>
-                                    <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations" on_change="restrict_change(th_qty)"/>
-                                    <field name="prod_lot_id" on_change="restrict_change(th_qty)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
-                                    <field name="package_id" on_change="restrict_change(th_qty)" groups="stock.group_tracking_lot"/>
-                                    <field name="partner_id" on_change="restrict_change(th_qty)" groups="stock.group_tracking_owner"/>
-                                    <field name="th_qty" readonly="1"/>
+                                <tree string="Inventory Details" editable="bottom" colors="blue: product_qty != theoretical_qty; red: theoretical_qty &lt; 0">
+                                    <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(product_id,product_uom_id,theoretical_qty,context)" domain="[('type','=','product')]"/>
+                                    <field name="product_uom_id" groups="product.group_uom" on_change="restrict_change(theoretical_qty)"/>
+                                    <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations" on_change="restrict_change(theoretical_qty)"/>
+                                    <field name="prod_lot_id" on_change="restrict_change(theoretical_qty)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
+                                    <field name="package_id" on_change="restrict_change(theoretical_qty)" groups="stock.group_tracking_lot"/>
+                                    <field name="partner_id" on_change="restrict_change(theoretical_qty)" groups="stock.group_tracking_owner"/>
+                                    <field name="theoretical_qty" readonly="1"/>
                                     <field name="product_qty" string="Real Quantity"/>
                                     <field name="state" invisible="True"/>
                                 </tree>