From 5b85b245b505cc6e25595983735a29fd78727e79 Mon Sep 17 00:00:00 2001
From: "Sunil Sharma (OpenERP Trainee)" <sunilsharma.sharma07@gmail.com>
Date: Tue, 27 Aug 2013 14:04:59 +0530
Subject: [PATCH] [IMP]:Stock:Form view and Stock Help

bzr revid: sunilsharma.sharma07@gmail.com-20130827083459-lv6ic79k88h843eu
---
 addons/stock/stock.py       | 17 +++++++++--------
 addons/stock/stock_view.xml | 11 ++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 54f473f75c1..4752376a085 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1662,18 +1662,18 @@ class stock_inventory(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'date_done': fields.datetime('Date done'),
+        'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Inventory Name."),
+        'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Inventory Create Date."),
+        'date_done': fields.datetime('Date done', help="Inventory Date time."),
         'line_ids': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=False, states={'done': [('readonly', True)]}),
         'move_ids': fields.one2many('stock.move', 'inventory_id', 'Created Moves'),
-        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'Confirmed'), ('done', 'Done')], 'Status', readonly=True, select=True),
-        'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product'),
+        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('confirm', 'In Progress'), ('done', 'Validated')], 'Status', readonly=True, select=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}, help="Your Company Name."),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, help="Physical location stock name."),
+        'product_id': fields.many2one('product.product', 'Product', help="Product Name"),
         'package_id': fields.many2one('stock.quant.package', 'Pack'),
         'partner_id': fields.many2one('res.partner', 'Owner'),
-        'lot_id': fields.many2one('stock.production.lot', 'Lot/Serial Number'),
+        'lot_id': fields.many2one('stock.production.lot', 'Lot/Serial Number', help="Forces to specify a Serial Number for all moves containing this product and generated by a Manufacturing Order"),
         'move_ids_exist': fields.function(_get_move_ids_exist, type='boolean', string=' Stock Move Exists?', help='technical field for attrs in view'),
     }
 
@@ -1837,6 +1837,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),
+        'real_qty':fields.related('product_id','qty_available', type='float',string='Real Quantity',store=True),
     }
 
     def _resolve_inventory_line(self, cr, uid, inventory_line, theorical_lines, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index af3fa1153f4..8a0ed746544 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -101,11 +101,11 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
-                    <button name="%(action_view_stock_fill_inventory)d" states="draft" string="Fill Inventory" type="action" class="oe_highlight" groups="stock.group_stock_user"/>
+                    <button name="%(action_view_stock_fill_inventory)d" states="draft" string="Start Inventory" type="action" class="oe_highlight" groups="stock.group_stock_user"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box">
@@ -130,11 +130,12 @@
                     </group>
                     <field name="move_ids_exist" invisible="1"/>
                     <notebook>
-                    <page string="Inventory Details">
+                    <page string="Inventory Details" attrs="{'invisible':[('state','=','draft')]}">
                     <field name="line_ids" string="Inventory Details">
                         <tree string="Inventory Details" editable="bottom">
                             <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,parent.date)"  domain="[('type','=','product')]"/>
-                            <field name="product_qty"/>
+                            <field name="real_qty" readonly="1"/>
+                            <field name="product_qty" string="Checked Quantity"/>
                             <field name="product_uom_id" groups="product.group_uom"/>
                             <field name="prod_lot_id"/>
                             <field name="package_id" readonly="1"/>
@@ -143,7 +144,7 @@
                         </tree>
                     </field>
                     </page>
-                    <page string="Inventory Adjustments" attrs="{'invisible': [('move_ids_exist', '=', False)]}">
+                   <page string="Inventory Adjustments" attrs="{'invisible': [('move_ids_exist', '=', False)],'invisible': [('state','=','draft')] }">
                         <field name="move_ids" context="{'inventory_id':active_id}" readonly="1">
                            <tree string="Inventory Adjustments">
                                <field name="product_id"/>