From ee198c29abe9a56dd9876afe53ca52b2a0e1a063 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 8 Sep 2010 13:36:22 +0200
Subject: [PATCH 001/138] [FIX] stock: properly handle child locations during
 inventory import

bzr revid: odo@openerp.com-20100908113622-csl1mcogawrkeee2
---
 addons/stock/wizard/stock_fill_inventory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index e133a9fc879..bc7d0453091 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -64,7 +64,7 @@ class stock_fill_inventory(osv.osv_memory):
             for product_id in res.keys():
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
-                context.update({'uom': uom})
+                context.update(uom=uom, compute_child=False)
                 amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
 

From ce357b7f18cd7a96006046b46193c89690203dfd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 17:42:12 +0530
Subject: [PATCH 002/138] [ADD] stock : Add a partner_id field in stock and
 list view of picking

bzr revid: sbh@tinyerp.com-20100908121212-53b8kod0wfzd6kuj
---
 addons/stock/stock.py       |  3 ++-
 addons/stock/stock_view.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5ecbd5f40ba..2294da261d8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -654,7 +654,8 @@ class stock_picking(osv.osv):
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Picking'),
-        'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
+        'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
+        'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),        
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 108237576a2..5d8156655b0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -941,13 +941,13 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
+                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -996,7 +996,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
@@ -1156,14 +1156,14 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id" />
+                        <field name="partner_id" />
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1208,7 +1208,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id" />
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1363,7 +1363,7 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
+                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
@@ -1372,7 +1372,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>

From d8318d66f66ea99d92c017e516190244b3eaebc9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 17:44:18 +0530
Subject: [PATCH 003/138] [ADD] stock : Add a partner_id field in delivery list
 view

bzr revid: sbh@tinyerp.com-20100908121418-8i0yj167floqoakg
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5d8156655b0..db2d9e59da1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -776,7 +776,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>

From 54ed33730f37978c457dd67109f31018af6a71a6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:07:05 +0530
Subject: [PATCH 004/138] [IMP] stock : change the contact_display of all
 picking

bzr revid: sbh@tinyerp.com-20100908123705-152r19r46odrfzoi
---
 addons/stock/stock_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index db2d9e59da1..88810e87bc1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -962,7 +962,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -1179,7 +1179,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner', 'search_default_available': 1}</field>
+            <field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
             <field name="search_view_id" ref="view_picking_out_search"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
@@ -1389,7 +1389,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1444,7 +1444,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
 

From b095ebd8268d7938409b0fa0bd3d48e45d00f8db Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:22:26 +0530
Subject: [PATCH 005/138] [ADD] stock: Add the list for stock_move in
 Production Lots

bzr revid: sbh@tinyerp.com-20100908125226-p5heeoa8s1hsvrpf
---
 addons/stock/stock_view.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 88810e87bc1..3f21ef33256 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -288,7 +288,20 @@
                             <field colspan="2" name="revisions" nolabel="1"/>
                         </page>
                         <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1"/>
+                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uos" groups="product.product_uos"/>
+                                    <field name="picking_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>                            
                         </page>
                     </notebook>
                 </form>

From 51c5533ebec5259cb35f0238dff780a2170aa2d0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:36:57 +0530
Subject: [PATCH 006/138] [IMP] stock: Imrpove the view of Periodical
 Inventory,rename the label and add the list view of move_ids

bzr revid: sbh@tinyerp.com-20100908130657-6it84bme2brthnwo
---
 addons/stock/stock_view.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3f21ef33256..a05e3217613 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -85,14 +85,14 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Lot Inventory">
+                <form string="Physical Inventory">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
-                            <tree string="Inventory Lines" editable="bottom">
+                            <tree string="Products" editable="bottom">
                                 <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -103,7 +103,7 @@
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
-                            <form string="Inventory Lines">
+                            <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -117,7 +117,17 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
-                        <field colspan="4" name="move_ids" nolabel="1"/>
+  						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="date"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>                                                    
                     </page>
                     </notebook>
                     <field name="state"/>
@@ -132,7 +142,7 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Periodical Inventory</field>
+            <field name="name">Physical Inventory</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
@@ -143,7 +153,7 @@
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
         <record id="action_inventory_form_draft" model="ir.actions.act_window">
-            <field name="name">Draft Periodical Inventories</field>
+            <field name="name">Draft Physical Inventories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>

From e537bea1ac27dd9d9c60fc57dd64103c7ce0a9b8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:52:51 +0530
Subject: [PATCH 007/138] [IMP] stock: Improve the view and change the icon

bzr revid: sbh@tinyerp.com-20100908132251-ku151vivau677nyb
---
 addons/stock/stock_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a05e3217613..5851d31a40a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -41,7 +41,7 @@
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
                             string="Split inventory lines" groups="base.group_extended"
-                            type="action" icon="gtk-justify-fill"/>
+                            type="action" icon="terp-stock_effects-object-colorize"/>
                 </form>
             </field>
         </record>
@@ -101,19 +101,20 @@
                                 <field name="state" />
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
-                                    type="action" icon="gtk-justify-fill" states="draft"/>
+                                    type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
                             </tree>
                             <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id"/>
+                                <group colspan="2" col="4">
                                 <field name="prod_lot_id" groups="base.group_extended"/>
-                                <group colspan="2" col="3">
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="base.group_extended"
-                                        type="action" icon="gtk-justify-fill"/>
+                                        type="action" icon="terp-stock_effects-object-colorize"/>
                                 </group>
+                                
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
@@ -133,7 +134,7 @@
                     <field name="state"/>
                     <group col="4" colspan="2">
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
 

From ba0880457624084a554cf9dd7c85de6d30643ee9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 19:13:53 +0530
Subject: [PATCH 008/138] [IMP] stock: Rename the Fill Inventory to Impor
 Inventory

bzr revid: sbh@tinyerp.com-20100908134353-leco6y3n7i7ejrhq
---
 addons/stock/wizard/stock_fill_inventory.py       | 4 ++--
 addons/stock/wizard/stock_fill_inventory_view.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index bc7d0453091..d79d9d61fe0 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -24,14 +24,14 @@ from tools.translate import _
 
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
-    _description = "Fill Inventory"
+    _description = "Import Inventory"
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include all children for the location"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):
-        """ To fill stock inventory according to products available in the selected locations.
+        """ To Import stock inventory according to products available in the selected locations.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ef95a3bf447..949df830a3c 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
    		<record id="view_stock_fill_inventory" model="ir.ui.view">
-            <field name="name">Fill Inventory</field>
+            <field name="name">Import Inventory</field>
             <field name="model">stock.fill.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Fill Inventory">
-             		<separator string="Fill Inventory for specific location" colspan="4" />
+              <form string="Import Inventory">
+             		<separator string="Import current product inventory from the following location" colspan="4" />
                 	<field name="location_id"/>
                 	<newline/>
                 	<field name="recursive"/>
@@ -19,7 +19,7 @@
             </field>
 		</record>
 
-         <act_window name="Fill Inventory"		    
+         <act_window name="Import Inventory"		    
 		    res_model="stock.fill.inventory"
 		    src_model="stock.inventory"
 		    view_mode="form"

From bc186ed6b279b51e385c41f607236b5324385aaf Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 19:24:26 +0530
Subject: [PATCH 009/138] [IMP] small change

bzr revid: sbh@tinyerp.com-20100908135426-kvkvbjcv3d97dz7z
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5851d31a40a..032b905c551 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,7 +119,7 @@
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
   						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                <tree string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>

From 11132ec477f598e200fb9d23edf0e260cdc9c4f3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 11:10:04 +0530
Subject: [PATCH 010/138] [IMP] stock: Add search_default_in_location in fill
 inventory wizard

bzr revid: sbh@tinyerp.com-20100909054004-o3h0vhmxmydmmw4r
---
 addons/stock/wizard/stock_fill_inventory_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 949df830a3c..04e66e525e5 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -24,6 +24,7 @@
 		    src_model="stock.inventory"
 		    view_mode="form"
 		    target="new"        
+		    context="{'search_default_in_location':1}" 
             key2="client_action_multi"    
 		    id="action_view_stock_fill_inventory"/>	
 

From 1239d4c8cdf199d4226e8c61bf94fec9893fca17 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 11:45:10 +0530
Subject: [PATCH 011/138] [ADD] stock: Improve the tooltips of fill_inventory
 wizard and merge set_stock_zero [REM] Remove the set_stock_zero wizard

bzr revid: sbh@tinyerp.com-20100909061510-3rdpvo4m48qxehnv
---
 addons/stock/__openerp__.py                   |  1 -
 addons/stock/wizard/__init__.py               |  1 -
 addons/stock/wizard/stock_fill_inventory.py   | 24 +++++-
 .../wizard/stock_fill_inventory_view.xml      |  1 +
 .../wizard/stock_inventory_set_stock_zero.py  | 74 -------------------
 .../stock_inventory_set_stock_zero_view.xml   | 31 --------
 6 files changed, 23 insertions(+), 109 deletions(-)
 delete mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero.py
 delete mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index e33e347d612..07a9a73f10f 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -49,7 +49,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_move_view.xml",
         "wizard/stock_partial_picking_view.xml",
         "wizard/stock_partial_move_view.xml",
-        "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_inventory_merge_view.xml",
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 7a13dc26fd5..f6021e0fbe2 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -27,7 +27,6 @@ import stock_partial_move
 import stock_replacement
 import stock_ups
 import stock_inventory_merge
-import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index d79d9d61fe0..e9b3fb2e02c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -27,7 +27,8 @@ class stock_fill_inventory(osv.osv_memory):
     _description = "Import Inventory"
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'recursive': fields.boolean("Include all children for the location"),
+        'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
+        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done and when set all inventory lines that are added to the inventory should have zero as quantity"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):
@@ -52,12 +53,31 @@ class stock_fill_inventory(osv.osv_memory):
                 for location in location_ids :
                     res = location_obj._product_get(cr, uid, location)
                     res_location[location] = res
+            if fill_inventory.set_stock_zero:
+                loc = fill_inventory.location_id.id
+                cr.execute('select distinct location_id,product_id \
+                            from stock_inventory_line \
+                            where inventory_id=%s', (context['active_id'],))
+                inv = cr.fetchall()
+                cr.execute('select distinct product_id from stock_move where \
+                            location_dest_id=%s or location_id=%s', (loc, loc,))
+                stock = cr.fetchall()
+                for s in stock:
+                    if (loc, s[0]) not in inv:
+                        p = prod_obj.browse(cr, uid, s[0])
+                        invent_line_obj.create(cr, uid, {
+                            'inventory_id': context['active_id'],
+                            'location_id': loc,
+                            'product_id': s[0],
+                            'product_uom': p.uom_id.id,
+                            'product_qty': 0.0,
+                            })                    
             else:
                 context.update({'compute_child': False})
                 res = location_obj._product_get(cr, uid,
                             fill_inventory.location_id.id, context=context)
                 res_location[fill_inventory.location_id.id] = res
-
+    
         product_ids = []
         for location in res_location.keys():
             res = res_location[location]
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 04e66e525e5..40cf34af26b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -12,6 +12,7 @@
                 	<newline/>
                 	<field name="recursive"/>
     				<newline/>
+    				<field name="set_stock_zero"/>
         	        <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
             	    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
deleted file mode 100644
index 4cbba93bdb6..00000000000
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-class inventory_set_stock_zero(osv.osv_memory):
-    _name = "stock.inventory.set.stock.zero"
-    _description = "Set Stock to 0"
-
-    _columns = {
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-    }
-
-    def do_merge(self, cr, uid, ids, context):
-        """ To set stock to Zero
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
-        invent_obj = self.pool.get('stock.inventory')
-        invent_line_obj = self.pool.get('stock.inventory.line')
-        prod_obj =  self.pool.get('product.product')
-
-        if len(context['active_ids']) <> 1:
-            raise osv.except_osv(_('Warning'),
-                                       _('Please select one and only one inventory !'))
-        for id in ids:
-            datas = self.read(cr, uid, id)
-            loc = str(datas['location_id'])
-
-            cr.execute('select distinct location_id,product_id \
-                        from stock_inventory_line \
-                        where inventory_id=%s', (context['active_id'],))
-            inv = cr.fetchall()
-            cr.execute('select distinct product_id from stock_move where \
-                        location_dest_id=%s or location_id=%s', (loc, loc,))
-            stock = cr.fetchall()
-            for s in stock:
-                if (loc, s[0]) not in inv:
-                    p = prod_obj.browse(cr, uid, s[0])
-                    invent_line_obj.create(cr, uid, {
-                        'inventory_id': context['active_id'],
-                        'location_id': loc,
-                        'product_id': s[0],
-                        'product_uom': p.uom_id.id,
-                        'product_qty': 0.0,
-                        })
-        return {}
-
-inventory_set_stock_zero()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
deleted file mode 100644
index 0ee84d2045d..00000000000
--- a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_inventory_set_stock_zero" model="ir.ui.view">
-            <field name="name">Set Stock to Zero</field>
-            <field name="model">stock.inventory.set.stock.zero</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Set Stock to Zero">
-             		<separator string="Set Stocks to Zero" colspan="4" />
-                	<field name="location_id"/>
-    				<newline/>
-    				<label colspan="4" string="Do you want to set stocks to zero ?"/>
-        	        <separator string="" colspan="4" />
-					<button special="cancel" icon='gtk-cancel' string="Cancel" />
-            	    <button name="do_merge" string="Set Stock to Zero" type="object" icon="gtk-ok"/>
-             </form>
-            </field>
-		</record>
-
-        <act_window name="Set Stock to Zero"		    
-		    res_model="stock.inventory.set.stock.zero"
-		    src_model="stock.inventory"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_inventory_set_stock_zero"/>			
-        
-    </data>
-</openerp>

From 319c65e5b9a87b859c2d02aae328b04a237e7f13 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 12:17:21 +0530
Subject: [PATCH 012/138] [IMP] stock: Improve the view

bzr revid: sbh@tinyerp.com-20100909064721-aeq7ygar8gvic1xc
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 032b905c551..58e858bc94b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -120,7 +120,6 @@
                     </page><page string="Posted Inventory" groups="base.group_extended">
   						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
                                 <tree string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>

From 16bee80a57cfd4dec9b120a8799cc1eba1176f88 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 12:20:39 +0530
Subject: [PATCH 013/138] [Fix] stock: Correct the object name

bzr revid: sbh@tinyerp.com-20100909065039-z2g8avrcpbknf5ue
---
 addons/stock/wizard/stock_fill_inventory.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index e9b3fb2e02c..539ae830687 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -64,8 +64,8 @@ class stock_fill_inventory(osv.osv_memory):
                 stock = cr.fetchall()
                 for s in stock:
                     if (loc, s[0]) not in inv:
-                        p = prod_obj.browse(cr, uid, s[0])
-                        invent_line_obj.create(cr, uid, {
+                        p = product_obj.browse(cr, uid, s[0])
+                        inventory_line_obj.create(cr, uid, {
                             'inventory_id': context['active_id'],
                             'location_id': loc,
                             'product_id': s[0],

From cbce82b237f4fd1f5ee1ef8414ea9b44d5a1d868 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 15:02:48 +0530
Subject: [PATCH 014/138] [Fix] stock: Add the field in list view of stock_move

bzr revid: sbh@tinyerp.com-20100909093248-b2p506n72d6x1u40
---
 addons/stock/stock_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 58e858bc94b..efddb92e82c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -299,13 +299,15 @@
                         </page>
                         <page string="Stock Moves">
                             <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
+                                <tree  string="Stock Moves">
+ 									<field name="picking_id" string="Reference"/>                                
+									<field name="origin"/>
+									<field name="partner_id"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="product_uos" groups="product.product_uos"/>
-                                    <field name="picking_id"/>
+                                    <field name="tracking_id"/>
+                                    <field name="date"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>

From e9806cae8d0c1093b685bbc584b5afaa02572dd0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:05:14 +0200
Subject: [PATCH 015/138] [IMP] stock inventory: spellchecking + moved button
 column in inv. lines o2m

bzr revid: odo@openerp.com-20100909120514-n4mwthszd41nvobc
---
 addons/stock/stock_view.xml                 | 10 +++++-----
 addons/stock/wizard/stock_fill_inventory.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index efddb92e82c..09dde138a5f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -97,11 +97,11 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
-                                <field name="state" />
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
+                                <field name="state" />
                             </tree>
                             <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
@@ -118,7 +118,7 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
-  						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
+                             <field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
                                 <tree string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -127,7 +127,7 @@
                                     <field name="date"/>
                                     <field name="state"/>
                                 </tree>
-                             </field>                                                    
+                             </field>
                     </page>
                     </notebook>
                     <field name="state"/>
@@ -142,7 +142,7 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Physical Inventory</field>
+            <field name="name">Physical Inventories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 539ae830687..a6976e884a5 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -28,7 +28,7 @@ class stock_fill_inventory(osv.osv_memory):
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
-        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done and when set all inventory lines that are added to the inventory should have zero as quantity"),
+        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):

From 9b99c73b00930b55b15fe9671b4aac482301d1a6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 18:12:01 +0530
Subject: [PATCH 016/138] [ADD] stock: Add the field in list view ofposted 
 inventory

bzr revid: sbh@tinyerp.com-20100909124201-a5vlnswldntqp6um
---
 addons/stock/stock_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 09dde138a5f..0b48a9970c0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -124,6 +124,8 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
+                                   	<field name="location_id"/>
+                                    <field name="location_dest_id"/>                                    
                                     <field name="date"/>
                                     <field name="state"/>
                                 </tree>

From 8ae1b3b8d74793f3f3b4ab233232ecf38d3ed2df Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:39:06 +0200
Subject: [PATCH 017/138] [IMP] stock: add missing columns in posted inventory
 moves

bzr revid: odo@openerp.com-20100909123906-dvkibjfdkys3hlkj
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0b48a9970c0..34e508fdc84 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -124,9 +124,9 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                   	<field name="location_id"/>
-                                    <field name="location_dest_id"/>                                    
-                                    <field name="date"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date" string="Date"/>
                                     <field name="state"/>
                                 </tree>
                              </field>

From 5feb1fd1e1a9c7fb91aece5685ae166c1f10bac6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:46:41 +0200
Subject: [PATCH 018/138] [IMP] stock inventory: don't count products
 recursively when computing the delta

bzr revid: odo@openerp.com-20100909124641-5jv31k8nqji8c2xu
---
 addons/stock/stock.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2294da261d8..5f1aab239d6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2344,14 +2344,19 @@ class stock_inventory(osv.osv):
         """
         if context is None:
             context = {}
+
+        # to perform the correct inventory corrections we need analyze stock location by
+        # location, never recursively, so we use a special context
+        product_context = dict(context, compute_child=False)
+
+        location_obj = self.pool.get('stock.location')
         for inv in self.browse(cr, uid, ids):
             move_ids = []
             move_line = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-
-                amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
-                #TOCHECK: Why put restriction like new inventory qty should greater available qty ?
+                product_context.update(uom=line.product_uom.id)
+                amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:

From 52b56ef04adf560484bc655c48ed94fe5eac4d66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 18:33:11 +0530
Subject: [PATCH 019/138] [IMP] stock: Improve the Merge inventories wizard put
 the warning to use in list view

bzr revid: sbh@tinyerp.com-20100909130311-n51aas1gcgpf09kx
---
 addons/stock/wizard/stock_inventory_merge.py | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 46c589f18e9..cbb9f380cb1 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -25,7 +25,25 @@ from tools.translate import _
 class stock_inventory_merge(osv.osv_memory):
     _name = "stock.inventory.merge"
     _description = "Merge Inventory"
-
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        if not context:
+            context={}
+        res = super(stock_inventory_merge, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context.get('active_model','') == 'stock.inventory' and len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select multiple physical inventories to merge in the list view.'))
+        return res    
+        
     def do_merge(self, cr, uid, ids, context):
         """ To merge selected Inventories.
         @param self: The object pointer.
@@ -37,13 +55,7 @@ class stock_inventory_merge(osv.osv_memory):
         """ 
         invent_obj = self.pool.get('stock.inventory')
         invent_line_obj = self.pool.get('stock.inventory.line')
-
         invent_lines = {}
-
-        if len(context['active_ids']) < 2:
-            raise osv.except_osv(_('Warning'),
-            _('Please select at least two inventories.'))
-
         for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
             if inventory.state == "done":
                 raise osv.except_osv(_('Warning'),

From 8b6e629f6dd384789de516f9f5c9f903f27ad57c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 19:35:55 +0530
Subject: [PATCH 020/138] [IMP] stock :Improve fill inventory wizard

bzr revid: sbh@tinyerp.com-20100909140555-kpheons7bt7gh822
---
 addons/stock/wizard/stock_fill_inventory.py | 57 ++++++++-------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index a6976e884a5..53a8fabcf2d 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -44,39 +44,24 @@ class stock_fill_inventory(osv.osv_memory):
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
         stock_location_obj = self.pool.get('stock.location')
-        for fill_inventory in self.browse(cr, uid, ids):
-            res = {}
-            res_location = {}
-            if fill_inventory.recursive :
-                location_ids = location_obj.search(cr, uid, [('location_id',
-                                 'child_of', fill_inventory.location_id.id)])
-                for location in location_ids :
-                    res = location_obj._product_get(cr, uid, location)
-                    res_location[location] = res
-            if fill_inventory.set_stock_zero:
-                loc = fill_inventory.location_id.id
-                cr.execute('select distinct location_id,product_id \
-                            from stock_inventory_line \
-                            where inventory_id=%s', (context['active_id'],))
-                inv = cr.fetchall()
-                cr.execute('select distinct product_id from stock_move where \
-                            location_dest_id=%s or location_id=%s', (loc, loc,))
-                stock = cr.fetchall()
-                for s in stock:
-                    if (loc, s[0]) not in inv:
-                        p = product_obj.browse(cr, uid, s[0])
-                        inventory_line_obj.create(cr, uid, {
-                            'inventory_id': context['active_id'],
-                            'location_id': loc,
-                            'product_id': s[0],
-                            'product_uom': p.uom_id.id,
-                            'product_qty': 0.0,
-                            })                    
-            else:
-                context.update({'compute_child': False})
-                res = location_obj._product_get(cr, uid,
-                            fill_inventory.location_id.id, context=context)
-                res_location[fill_inventory.location_id.id] = res
+        if ids and len(ids): 
+            ids = ids[0]
+        else:
+             return {}    
+        fill_inventory = self.browse(cr, uid, ids)
+        res = {}
+        res_location = {}
+        if fill_inventory.recursive :
+            location_ids = location_obj.search(cr, uid, [('location_id',
+                             'child_of', fill_inventory.location_id.id)])
+            for location in location_ids :
+                res = location_obj._product_get(cr, uid, location)
+                res_location[location] = res
+        else:
+            context.update({'compute_child': False})
+            res = location_obj._product_get(cr, uid,
+                        fill_inventory.location_id.id, context=context)
+            res_location[fill_inventory.location_id.id] = res
     
         product_ids = []
         for location in res_location.keys():
@@ -85,9 +70,11 @@ class stock_fill_inventory(osv.osv_memory):
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
                 context.update(uom=uom, compute_child=False)
-                amount = stock_location_obj._product_get(cr, uid,
+                if fill_inventory.set_stock_zero:
+                    amount = 0
+                else:    
+                    amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
-
                 if(amount):
                     line_ids=inventory_line_obj.search(cr, uid,
                         [('inventory_id', '=', context['active_ids']),

From 7027a0130a5d56bb804004ea8e572de930a5ca48 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 20:17:21 +0530
Subject: [PATCH 021/138] [IMP]: Fix stock_fill_inventory for set_stock_zero

bzr revid: sbh@tinyerp.com-20100909144721-1mcr7erveystgf9d
---
 addons/stock/wizard/stock_fill_inventory.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 53a8fabcf2d..d0469960381 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -70,12 +70,11 @@ class stock_fill_inventory(osv.osv_memory):
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
                 context.update(uom=uom, compute_child=False)
-                if fill_inventory.set_stock_zero:
-                    amount = 0
-                else:    
-                    amount = stock_location_obj._product_get(cr, uid,
+                amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
                 if(amount):
+                    if fill_inventory.set_stock_zero:
+                        amount = 0                    
                     line_ids=inventory_line_obj.search(cr, uid,
                         [('inventory_id', '=', context['active_ids']),
                          ('location_id', '=', location),

From 4f43a5b3412ee356ab90f1cd6314e9c948911a7f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 13 Sep 2010 03:57:17 +0200
Subject: [PATCH 022/138] [IMP] procurement: rationalized procurement menus in
 procurement, stock, mrp: New structure: Procurement module installs its menus
 only in Warehouse. No need for a shared menu in "base" namespace.

bzr revid: odo@openerp.com-20100913015717-nx2hp4ezx7fxd58y
---
 addons/mrp/mrp_view.xml                       | 18 +------
 addons/mrp/process/procurement_process.xml    | 12 ++---
 .../mrp/process/service_product_process.xml   |  2 +-
 .../mrp/process/stockable_product_process.xml |  4 +-
 .../process/procurement_process.xml           |  4 +-
 addons/procurement/procurement_view.xml       | 52 +++++++------------
 addons/sale/process/sale_process.xml          |  2 +-
 7 files changed, 32 insertions(+), 62 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 4186a6e8722..52b165f69dd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,10 +5,9 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
 
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
+
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
@@ -472,24 +471,9 @@
             </field>
         </record>
 
-        <!--
-        Procurement
-        -->
-
-        <menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action"
-                  parent="mrp.menu_mrp_manufacturing" sequence="3" />
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
-        <menuitem action="procurement.action_compute_schedulers" id="base.mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager"/>
-
-        <!--
-        Order Point
-        -->
-        <menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
-
         <!--
         Production Management
         -->
-
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index ca08481d4e4..16aa1319ffd 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -26,7 +26,7 @@
         </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@@ -38,7 +38,7 @@
         </record>
         
         <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@@ -50,7 +50,7 @@
         </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@@ -62,7 +62,7 @@
         </record>
         
         <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@@ -74,7 +74,7 @@
         </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
@@ -118,7 +118,7 @@
             Process Transition
         -->
     	<record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index c23ed6e7a65..83f0fceed8b 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -9,7 +9,7 @@
 
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 9dc45f0515f..6b6db4ccee3 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index 42ee50782a1..955d9cf6416 100644
--- a/addons/procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -12,7 +12,7 @@
             <field eval="1" name="active"/>
         </record>
     	<record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="menu_stock_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 			<field eval="1" name="active"/>
 		</record>        
       	<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="menu_stock_procurement_action"/>
 			<field name="model_id" ref="procurement.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index aa5552f0b0c..b6bd670de1a 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -85,11 +85,13 @@
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
                        <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
-                       <filter icon="terp-gtk-go-back-rtl" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
+                       <separator orientation="vertical"/>
+                       <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
+                       <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
+                       <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -107,29 +109,29 @@
                 </search>
             </field>
         </record>
+
         <record id="procurement_action" model="ir.actions.act_window">
             <field name="name">Procurement Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
-            <field name="help">The procurement order will schedule a proposal for automatic procurement for the product concerned. This procurement will start a task, a purchase order form for the supplier or a production depending on the product configuration.</field>
+            <field name="context">{'search_default_current':1}</field>
+            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc.</field>
         </record>
 
-        <record id="procurement_action3" model="ir.actions.act_window">
-            <field name="name">Procurements</field>
+        <record id="procurement_exceptions" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_perm_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
+            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)</field>
         </record>
-
+        
         <record id="procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
@@ -137,26 +139,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
-            <field name="help"> For each customer order line or raw materials in a manufacturing order, there is a procurement form . In normal system use, procurement orders are automatically generated by OpenERP. But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. It is a procurement exception. Some problems are link to timing and will be correct automatically by the system. If there is no procurement rule, the exception must be corrected manually.</field>
-        </record>
-
-        <record id="procurement_action4" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions to Fix</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">procurement.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">procurement.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
 
         <!-- Order Point -->
@@ -260,8 +242,12 @@
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-		<menuitem id="base.menu_mrp_scheduler" name="Schedulers" parent="stock.menu_stock_root" groups="base.group_system" sequence="3"/>
-		<menuitem action="action_compute_schedulers" id="base.mrp_Sched_all" parent="base.menu_mrp_scheduler" sequence="50" groups="base.group_system"/>
-		<menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action" parent="stock.menu_stock_warehouse_mgmt" sequence="9" groups="base.group_system"/>		
+        <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
+        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="base.group_extended"/>
+            <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
+            <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
+        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5" groups="base.group_extended"/>
+            <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index b4a54d5afa5..d9211ae2e8c 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -63,7 +63,7 @@
         </record>
 
         <record id="process_node_saleprocurement0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>

From 13f77ea43f93d0e373cc46c4545d27878036d536 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 10:49:01 +0530
Subject: [PATCH 023/138] [IMP] stock:Partial Picking wizard take current cost
 price of the product if no so/po line

bzr revid: sbh@tinyerp.com-20100913051901-rdam3dhfl00dg985
---
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 3b6ce21b6ee..bbf7e86fc7f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -174,7 +174,7 @@ class stock_partial_picking(osv.osv_memory):
 
                 if (m.product_id.cost_method == 'average'):
                     currency = False
-                    price = 0
+                    price = m.product_id.standard_price
                     if (pick.type == 'in') and 'purchase_id' in pick._columns.keys():
                         if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
                             price = m.purchase_line_id.price_unit

From 33814c739561f92f894ff1e0236ebcfb6ea8fefb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 11:31:02 +0530
Subject: [PATCH 024/138] [Fix] mrp,procurement: Fix the action name and menu
 id

bzr revid: sbh@tinyerp.com-20100913060102-jjd6x2ordhrqp5t8
---
 addons/mrp/board_manufacturing_view.xml    | 2 +-
 addons/mrp/process/procurement_process.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index aa8bd2ab69e..c5474670d9b 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
                             <action colspan="4" name="%(stock.action_picking_tree)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(procurement.procurement_action4)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/>
                         </child1>
                         <child2>
                             <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 16aa1319ffd..70e3278ebc8 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -16,7 +16,7 @@
 
         
         <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="procurement.menu_stock_order_points"/>
             <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
@@ -85,7 +85,7 @@
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="procurement.menu_stock_order_points"/>
             <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>

From 969f0b9460373fdad20a19dcb436f3fe6f3d86af Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 15:57:24 +0530
Subject: [PATCH 025/138] [Fix] stock: Correct stock.invoice_onshipping
 sometimes chooses the wrong type of invoice
 https://bugs.launchpad.net/openobject-addons/+bug/352203

bzr revid: sbh@tinyerp.com-20100913102724-5sbydjdfis9jh7dx
---
 addons/stock/wizard/stock_invoice_onshipping.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index f931e575b2f..7e0693b9045 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -48,22 +48,22 @@ class stock_invoice_onshipping(osv.osv_memory):
         if context is None:
             context = {}
         picking_obj = self.pool.get('stock.picking')
-        usage = 'customer'
+        src_usage = dest_usage = None
         pick = picking_obj.browse(cr, uid, context['active_id'], context=context)
         if pick.invoice_state == 'invoiced':
             raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
         if pick.invoice_state == 'none':
             raise osv.except_osv(_('UserError'), _('This picking does not require any invoicing.'))
         if pick.move_lines:
-            usage = pick.move_lines[0].location_id.usage
-
-        if pick.type == 'out' and usage == 'supplier':
+            src_usage = pick.move_lines[0].location_id.usage
+            dest_usage = pick.move_lines[0].location_dest_id.usage
+        if pick.type == 'out' and dest_usage == 'supplier':
             type = 'in_refund'
-        elif pick.type == 'out' and usage == 'customer':
+        elif pick.type == 'out' and dest_usage == 'customer':
             type = 'out_invoice'
-        elif pick.type == 'in' and usage == 'supplier':
+        elif pick.type == 'in' and src_usage == 'supplier':
             type = 'in_invoice'
-        elif pick.type == 'in' and usage == 'customer':
+        elif pick.type == 'in' and src_usage == 'customer':
             type = 'out_refund'
         else:
             type = 'out_invoice'

From 4c1a6928cce257030d076594cc85253e0a695bb4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 17:16:02 +0530
Subject: [PATCH 026/138] [IMP] stock: stock_fill_inventory wizard check if
 state is done the rasie the expection

bzr revid: sbh@tinyerp.com-20100913114602-3if7lmcd10wzsr26
---
 addons/stock/wizard/stock_fill_inventory.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index d0469960381..a2dd4190c6c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -30,6 +30,20 @@ class stock_fill_inventory(osv.osv_memory):
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
         'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: New arch of view with new columns.
+        """
+        res = super(stock_fill_inventory, self).view_init(cr, uid, fields_list, context=context)
+        stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False) )
+        if stock.state=='done':
+                raise osv.except_osv('Error!','Stock Inventory is done')
+        True
 
     def fill_inventory(self, cr, uid, ids, context):
         """ To Import stock inventory according to products available in the selected locations.

From d33725df080d11de33ba35cc0ceeb4582d478c70 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 10:51:33 +0530
Subject: [PATCH 027/138] [IMP] stock: Improve the search view

bzr revid: sbh@tinyerp.com-20100914052133-jg9tm14qm1ed8ht0
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d17ae115302..c964e9a05b5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1396,10 +1396,10 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
@@ -1794,8 +1794,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

From db4e43e07b8e3c0bc68d38ddcc931b6f5be832eb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 11:56:43 +0530
Subject: [PATCH 028/138] [IMP] stock :Improve the fill_inventory wizard

bzr revid: sbh@tinyerp.com-20100914062643-s60j692m6207mshz
---
 addons/stock/wizard/stock_fill_inventory.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index a2dd4190c6c..599377fec1e 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -39,13 +39,16 @@ class stock_fill_inventory(osv.osv_memory):
          @param context: A standard dictionary
          @return: New arch of view with new columns.
         """
+        if context==None:
+            context={}
         res = super(stock_fill_inventory, self).view_init(cr, uid, fields_list, context=context)
-        stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False) )
-        if stock.state=='done':
+        if context.get('active_id', False):
+            stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False))
+            if stock.state=='done':
                 raise osv.except_osv('Error!','Stock Inventory is done')
         True
 
-    def fill_inventory(self, cr, uid, ids, context):
+    def fill_inventory(self, cr, uid, ids, context=None):
         """ To Import stock inventory according to products available in the selected locations.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -54,6 +57,8 @@ class stock_fill_inventory(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context==None:
+            context={}        
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')

From e7c5054bd02ca46a1773f16ba22de076ab221e5c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 16:55:37 +0530
Subject: [PATCH 029/138] [IMP] stock: Add the short cut for cancel button in
 all view

bzr revid: sbh@tinyerp.com-20100914112537-5xyhjg2fkkk3thyb
---
 addons/stock/stock_view.xml                   | 24 +++++++++----------
 .../wizard/stock_fill_inventory_view.xml      |  2 +-
 .../wizard/stock_inventory_merge_view.xml     |  2 +-
 .../wizard/stock_invoice_onshipping_view.xml  |  2 +-
 .../wizard/stock_location_product_view.xml    |  2 +-
 addons/stock/wizard/stock_move_view.xml       |  2 +-
 .../stock/wizard/stock_picking_make_view.xml  |  2 +-
 .../stock/wizard/stock_replacement_view.xml   |  2 +-
 addons/stock/wizard/stock_splitinto_view.xml  |  2 +-
 addons/stock/wizard/stock_ups_view.xml        |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c964e9a05b5..f975637b3c0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -581,7 +581,7 @@
                     <field name="picking_id" invisible="True"/>
                     <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"  height="100" width="500"/><newline/>
                     <group colspan="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         <button name="action_move" string="Add" type="object" icon="gtk-add"/>
                     </group>
                     </group>
@@ -750,7 +750,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -810,7 +810,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
         </record>
@@ -923,7 +923,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -935,7 +935,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1139,7 +1139,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1151,7 +1151,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1243,7 +1243,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
         </record>
@@ -1350,7 +1350,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1362,7 +1362,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1598,7 +1598,7 @@
                     <group col="4" colspan="2">
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
@@ -1767,7 +1767,7 @@
                     <group col="5" colspan="2">
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
                         <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     </group>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 40cf34af26b..3db42eb7be5 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -14,7 +14,7 @@
     				<newline/>
     				<field name="set_stock_zero"/>
         	        <separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
             	    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
              </form>
             </field>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 5ae2987b59a..62cac877179 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -12,7 +12,7 @@
 				    	<label string="Do you want to merge theses inventories ?"/>
 				 <separator colspan="4"/>
     				<group colspan="4" col="6">
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
 					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
 					</group>			
 				</form>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index e1e742d7aee..eddffb594aa 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -16,7 +16,7 @@
 					<newline/>
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
 			       	<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
             </field>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 518bc6eab35..2459daac189 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -16,7 +16,7 @@
        				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
         			<separator string="" colspan="4" />
         			<label string=""/>
-					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+					<button special="cancel" string="_Cancel" icon="gtk-cancel" />
            	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
     			</form>
             </field>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 46d3893900b..06f6822e3c7 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -13,7 +13,7 @@
                         <newline/>
                         <separator string="" colspan="4" />
                         <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
+                            string="_Cancel" />
                         <button name="track_lines" string="Ok"
                             type="object" icon="gtk-ok" />
                     </form>
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
index fa77042c5d8..4ecebed1031 100644
--- a/addons/stock/wizard/stock_picking_make_view.xml
+++ b/addons/stock/wizard/stock_picking_make_view.xml
@@ -12,7 +12,7 @@
 				        width="600" height="300"/>
                 	<separator string="" colspan="4" />
                 	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
+                		string="_Cancel" />
                 	<button name="make_packing" string="Ok"
                 		type="object" icon="gtk-apply" />
                 </form>
diff --git a/addons/stock/wizard/stock_replacement_view.xml b/addons/stock/wizard/stock_replacement_view.xml
index ce5f7efbc9f..cea5bfedbe8 100644
--- a/addons/stock/wizard/stock_replacement_view.xml
+++ b/addons/stock/wizard/stock_replacement_view.xml
@@ -9,7 +9,7 @@
 	                <form string="Replace a component">
 	                	<label string="Component" colspan="4"/>
 						<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel" string="Cancel" />
+	                	<button icon='gtk-cancel' special="cancel" string="_Cancel" />
 	                	<button name="replace_composant" string="Replace" type="object" />
 	                </form>
 	            </field>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index a325519ca75..7ed7266a163 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -10,7 +10,7 @@
                 <separator string="Quantity to leave in the current pack" colspan="4"/>
                 <field name="quantity"/>
                 <button icon='gtk-cancel' special="cancel"
-                    string="Cancel" />
+                    string="_Cancel" />
                 <button name="split" string="Ok"
                     type="object" icon="gtk-ok" />
             </form>
diff --git a/addons/stock/wizard/stock_ups_view.xml b/addons/stock/wizard/stock_ups_view.xml
index 89b5fe131e8..cbce721e1b9 100644
--- a/addons/stock/wizard/stock_ups_view.xml
+++ b/addons/stock/wizard/stock_ups_view.xml
@@ -11,7 +11,7 @@
 					<separator string="UPS generator" colspan="4"/>
 					<field name="weight" />
 					<separator string="" colspan="4" />
-					<button icon='gtk-cancel' special="cancel" string="Cancel" />
+					<button icon='gtk-cancel' special="cancel" string="_Cancel" />
 					<button name="ups_save" string="Get xml file" type="object" />
 					<button name="ups_upload" string="Upload xml file" type="object" />
 				</form>

From fe76938598f6252fba342e5972b493114b6e7e37 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 19:09:38 +0530
Subject: [PATCH 030/138] [Fix] stock,sale:Remove the sale_order_line in stock
 and add the code in sale

bzr revid: sbh@tinyerp.com-20100914133938-qv3zf19pjasx865u
---
 addons/purchase/stock_view.xml | 12 +++++++++++-
 addons/sale/stock.py           |  1 +
 addons/sale/stock_view.xml     | 11 +++++++++++
 addons/stock/stock.py          |  7 -------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 2b741536d3b..863b3ed77af 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+       <record id="stock_move_purchase" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="/form/group/field[@name='tracking_id']" position="before">
+                    <field name="purchase_line_id" colspan="2" />
+                </xpath>
+            </field>
+        </record>      
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 39260e759b4..b5c0e10e75d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -186,6 +186,7 @@ class stock_picking(osv.osv):
                         'quantity': sale_line.product_uos_qty,
                         'invoice_line_tax_id': [(6, 0, tax_ids)],
                         'account_analytic_id': account_analytic_id,
+                        'notes':sale_line.notes
                     }, context=context)
                     self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True,
                         'invoice_lines': [(6, 0, [invoice_line_id])],
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 6b3c0e2c684..93529fd3b7d 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -13,6 +13,17 @@
             </field>
         </record>
         
+        <record id="stock_move_sale" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
+                    <field name="sale_line_id" colspan="2"/>
+                </xpath>
+            </field>
+        </record>        
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5f1aab239d6..fa68c3c776b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1038,12 +1038,6 @@ class stock_picking(osv.osv):
                     uos_id = move_line.product_uom.id
 
                 account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
-                notes = False
-                if ('sale_line_id' in move_line._columns.keys()) and move_line.sale_line_id:
-                    notes = move_line.sale_line_id.notes
-                elif ('purchase_line_id' in move_line._columns.keys()) and move_line.purchase_line_id:
-                    notes = move_line.purchase_line_id.notes
-
                 invoice_line_id = invoice_line_obj.create(cr, uid, {
                     'name': name,
                     'origin': origin,
@@ -1056,7 +1050,6 @@ class stock_picking(osv.osv):
                     'quantity': move_line.product_uos_qty or move_line.product_qty,
                     'invoice_line_tax_id': [(6, 0, tax_ids)],
                     'account_analytic_id': account_analytic_id,
-                    'note': notes,
                 }, context=context)
                 self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
 

From 79d751bb7666ad4e76a85c80739774b45f6aaa36 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 19:34:07 +0530
Subject: [PATCH 031/138] [Fix] purchase: Move the code of stock in purchae

bzr revid: sbh@tinyerp.com-20100914140407-f8f5jhsdib083xdd
---
 addons/purchase/stock.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 49a28e352b2..e84a70d1b93 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -86,6 +86,9 @@ class stock_picking(osv.osv):
                 user, picking, move_line)
 
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
+        if move_line.purchase_line_id:
+            invoice_line_obj = self.pool.get('account.invoice.line')
+            invoice_line_obj.write(cursor, user, [invoice_line_id], {'note':  move_line.purchase_line_id.notes,})            
         return super(stock_picking, self)._invoice_line_hook(cursor, user,
                 move_line, invoice_line_id)
 

From 22daad45d3104bc790d6e789c17ebb48835258bb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 15 Sep 2010 02:10:44 +0200
Subject: [PATCH 032/138] [IMP] stock: improve labels and tooltips in
 stock-related fields on products

bzr revid: odo@openerp.com-20100915001044-1yhm564t5c9a7qpr
---
 addons/stock/product.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 951c3badcf4..831c130689d 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -318,8 +318,11 @@ class product_product(osv.osv):
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
         'location_id': fields.dummy(string='Stock Location', relation='stock.location', type='many2one'),
-        'valuation':fields.selection([('manual_periodic', 'Periodic (manual)'),
-                                        ('real_time','Real Time (automatized)'),], 'Stock Valuation', help="Decide if the system must automatically creates account moves based on stock moves", required=True),
+        'valuation':fields.selection([('manual_periodic', 'Periodical (manual)'),
+                                        ('real_time','Real Time (automated)'),], 'Inventory Valuation', 
+                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
+                                             "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
+                                        , required=True),
     }
 
     _defaults = {
@@ -405,11 +408,11 @@ class product_template(osv.osv):
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            help='This account will be used, instead of the default one, to value input stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
         'property_stock_account_output': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            help='This account will be used, instead of the default one, to value output stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
     }
 
 product_template()
@@ -421,21 +424,21 @@ class product_category(osv.osv):
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
             string='Stock journal', method=True, view_load=True,
-            help="This journal will be used for the accounting move generated by stock move"),
+            help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            help='This account will be used to value the input stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all incoming 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_account_output_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            help='This account will be used to value the output stock'),
+            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',
             type='many2one',
             relation='account.account',
             string="Stock Variation Account",
             method=True, view_load=True,
-            help="This account will be used in product when valuation type is real-time valuation ",),
+            help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
 
 product_category()

From 784b5e5a464455df3646f7b6934633680794a420 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:01:58 +0530
Subject: [PATCH 033/138] [IMP] stock: Move the valuation field of the product
 into accountint tab and set Input Account and Output Account read-only if
 valuation is not Real Time

bzr revid: sbh@tinyerp.com-20100915103158-75ji09bpbw21tswf
---
 addons/stock/product_view.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ef9b833ec32..fda4c91592b 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,10 +75,16 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                </field>
+     		      <xpath expr="/form/notebook/page[@string='Accounting']" position="inside"> 
+     		      	<newline/>
+     				<group  groups="base.group_extended">
+	                	<separator string="Stock Input/Output Account" colspan="2"/>
+	                	<newline/>
+	                	<field name="valuation"/>
+	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                    </group>
+                    </xpath>
             </field>
         </record>
 
@@ -121,7 +127,7 @@
             </field>
         </record>
 
-        <record id="view_product_valuation_form" model="ir.ui.view">
+<!--        <record id="view_product_valuation_form" model="ir.ui.view">
             <field name="name">product.valuation.stock.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
@@ -131,7 +137,7 @@
                     <field name="valuation"/>
                 </field>
             </field>
-        </record>
+        </record>-->
 
     </data>
 </openerp>

From 3a52e3db6c86609b7cb0db4e008903d3e6272f40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:18:07 +0530
Subject: [PATCH 034/138] [IMP] stock: Improve the view of product

bzr revid: sbh@tinyerp.com-20100915104807-ggnoeybdnnwhpfdx
---
 addons/account/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cc9351d55f4..67352fd1120 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group  groups="base.group_extended">
+                    <group name="properties" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <separator string="Purchase Properties" colspan="2"/>
                         <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"  groups="base.group_extended"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index fda4c91592b..c1fc739eda2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,15 +75,15 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-     		      <xpath expr="/form/notebook/page[@string='Accounting']" position="inside"> 
-     		      	<newline/>
+     		      <xpath expr="/form/notebook/page/group[@name='properties']" position="before"> 
      				<group  groups="base.group_extended">
 	                	<separator string="Stock Input/Output Account" colspan="2"/>
-	                	<newline/>
+	                	 <newline/>
 	                	<field name="valuation"/>
 	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
 	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
                     </group>
+                    <newline/>
                     </xpath>
             </field>
         </record>

From cbf69ba9386ba60072f83d23f560e18c04dcce85 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:55:08 +0530
Subject: [PATCH 035/138] [Fix] stock : Move the sale and purchase related code
 in to there module

bzr revid: sbh@tinyerp.com-20100915112508-9eq3w14bjylgzd7x
---
 addons/purchase/stock.py                     | 24 ++++++++++++++++++++
 addons/sale/stock.py                         | 24 ++++++++++++++++++++
 addons/stock/wizard/stock_partial_picking.py | 11 ---------
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index e84a70d1b93..a269f66d525 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -102,5 +102,29 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+class stock_partial_picking(osv.osv_memory):
+    _inherit = 'stock.partial.picking'
+      
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        pick_obj = self.pool.get('stock.picking')
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            for m in pick.move_lines:
+                if (m.product_id.cost_method == 'average'):
+                    if pick.type == 'in' and pick.purchase_id:
+                        if m.sale_line_id:
+                            res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
+                        if  pick.sale_id:
+                            res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
+        return res      
+stock_partial_picking()     
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index b5c0e10e75d..1d53b8b8754 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -209,4 +209,28 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+class stock_partial_picking(osv.osv_memory):
+    _inherit = 'stock.partial.picking'
+      
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        pick_obj = self.pool.get('stock.picking')
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            for m in pick.move_lines:
+                if (m.product_id.cost_method == 'average'):
+                    if pick.type == 'out' and pick.sale_id:
+                        if m.sale_line_id:
+                            res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
+                        if  pick.sale_id:
+                            res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
+        return res      
+stock_partial_picking()                                    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bbf7e86fc7f..bbc9021d87c 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -171,20 +171,9 @@ class stock_partial_picking(osv.osv_memory):
                     res['move%s_product_uom'%(m.id)] = m.product_uom.id
                 if 'move%s_prodlot_id'%(m.id) in fields:
                     res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
-
                 if (m.product_id.cost_method == 'average'):
                     currency = False
                     price = m.product_id.standard_price
-                    if (pick.type == 'in') and 'purchase_id' in pick._columns.keys():
-                        if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                            price = m.purchase_line_id.price_unit
-                        if hasattr(pick, 'purchase_id') and pick.purchase_id:
-                            currency = pick.purchase_id.pricelist_id.currency_id.id
-                    if (pick.type == 'out') and 'sale_id' in pick._columns.keys():
-                        if hasattr(m, 'sale_line_id') and m.sale_line_id:
-                            price = m.sale_line_id.price_unit
-                        if hasattr(pick, 'sale_id') and pick.sale_id:
-                            currency = pick.sale_id.pricelist_id.currency_id.id
                     if 'move%s_product_price'%(m.id) in fields:
                         res['move%s_product_price'%(m.id)] = price
                     if 'move%s_product_currency'%(m.id) in fields:

From 5b300999868eaab303fb66e47c80a5eb931b454e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 18:11:17 +0530
Subject: [PATCH 036/138] [Fix] stock : Move the stock_partial_move sale and
 purchase realated code into there module

bzr revid: sbh@tinyerp.com-20100915124117-1ja17fd3m3arwn3g
---
 addons/purchase/stock.py                  | 33 ++++++++++++++++++-----
 addons/sale/stock.py                      | 24 ++++++++++++++++-
 addons/stock/wizard/stock_partial_move.py | 24 ++---------------
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index a269f66d525..75cb99c0325 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -119,12 +119,33 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'in' and pick.purchase_id:
-                        if m.sale_line_id:
-                            res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
-                        if  pick.sale_id:
-                            res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
+                    if pick.type == 'in' and m.purchase_line_id:
+                        res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
+                    if  pick.purchase_id:
+                        res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
         return res      
-stock_partial_picking()     
+stock_partial_picking()   
+  
+class stock_partial_move(osv.osv_memory):
+    _inherit = "stock.partial.move"     
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')  
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+            if (m.product_id.cost_method == 'average'):
+                if m.picking_id.type == 'out' and  m.purchase_line_id:
+                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
+                if m.picking_id.purchase_id:
+                    res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
+        return res     
+stock_partial_move()     
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 1d53b8b8754..ed9a6098386 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -232,5 +232,27 @@ class stock_partial_picking(osv.osv_memory):
                         if  pick.sale_id:
                             res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
         return res      
-stock_partial_picking()                                    
+stock_partial_picking() 
+
+class stock_partial_move(osv.osv_memory):
+    _inherit = "stock.partial.move"   
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')  
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+            if (m.product_id.cost_method == 'average'):
+                if m.picking_id.type == 'in' and  m.sale_id:
+                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
+                if  m.picking_id.sale_id:
+                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False
+        return res     
+stock_partial_move()                                                                                                  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 17515f86252..d0cb04cba08 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -164,29 +164,9 @@ class stock_partial_move(osv.osv_memory):
                 res['move%s_product_qty'%(m.id)] = m.product_qty
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
-            if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average') and 'sale_id' in m.picking_id._columns.keys():
-                price = 0
-                if hasattr(m, 'sale_line_id') and m.sale_line_id:
-                    price = m.sale_line_id.price_unit
-
+            if  m.product_id.cost_method == 'average' :
+                price = m.product_id.standard_price
                 currency = False
-                if hasattr(m.picking_id, 'sale_id') and m.picking_id.sale_id:
-                    currency = m.picking_id.sale_id.pricelist_id.currency_id.id
-
-                if 'move%s_product_price'%(m.id) in fields:
-                    res['move%s_product_price'%(m.id)] = price
-                if 'move%s_product_currency'%(m.id) in fields:
-                    res['move%s_product_currency'%(m.id)] = currency
-
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average') and 'purchase_id' in m.picking_id._columns.keys():
-                price = 0
-                if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                    price = m.purchase_line_id.price_unit
-
-                currency = False
-                if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
-                    currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
-
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:

From 81909b9e7204488680e1706d958d1955320a5095 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 18:52:55 +0530
Subject: [PATCH 037/138] [Fix] stock: fix the name of type

bzr revid: sbh@tinyerp.com-20100915132255-mdgwqf5xr2j0xie7
---
 addons/purchase/stock.py | 2 +-
 addons/sale/stock.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 75cb99c0325..9e477909840 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -141,7 +141,7 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')  
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'out' and  m.purchase_line_id:
+                if m.picking_id.type == 'in' and  m.purchase_line_id:
                     res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
                 if m.picking_id.purchase_id:
                     res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ed9a6098386..f8745b4b44a 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -249,7 +249,7 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')  
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'in' and  m.sale_id:
+                if m.picking_id.type == 'out' and  m.sale_line_id:
                     res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
                 if  m.picking_id.sale_id:
                     res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False

From ef7ecffa29991eda19fc6e9c6fa5d4509ecfbf09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 15 Sep 2010 20:01:00 +0200
Subject: [PATCH 038/138] [FIX/REF] stock,purchase,sale: refactored stock
 valuation handling + fixed multicompany/multicurrency issues

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

bzr revid: odo@openerp.com-20100915180100-qbjxdj0n63teg7pg
---
 addons/purchase/stock.py |  43 ++++---
 addons/sale/stock.py     |  48 ++++---
 addons/stock/stock.py    | 270 ++++++++++++++++++++++++---------------
 3 files changed, 226 insertions(+), 135 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 9e477909840..f25a03adda2 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -31,6 +31,21 @@ class stock_move(osv.osv):
     _defaults = {
         'purchase_line_id': False
     }
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Overrides the default stock valuation to take into account the currency that was specified
+        on the purchase order in case the valuation data was not directly specified during picking
+        confirmation.
+        """
+        reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
+        if move.product_id.cost_method != 'average' or not move.price_unit:
+            # no average price costing or cost not specified during picking validation, we will 
+            # plug the purchase line values if they are found.
+            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+        return reference_amount, reference_currency_id
+
 stock_move()
 
 #
@@ -104,7 +119,7 @@ stock_picking()
 
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
-      
+
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -119,15 +134,14 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'in' and m.purchase_line_id:
+                    if pick.type == 'in' and pick.purchase_id and m.purchase_line_id:
                         res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
-                    if  pick.purchase_id:
-                        res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
-        return res      
-stock_partial_picking()   
-  
+                        res['move%s_product_currency'%(m.id)] =  pick.purchase_id.pricelist_id.currency_id.id
+        return res
+stock_partial_picking()
+
 class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"     
+    _inherit = "stock.partial.move"
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -138,14 +152,13 @@ class stock_partial_move(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')  
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+        move_obj = self.pool.get('stock.move')
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'in' and  m.purchase_line_id:
-                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
-                if m.picking_id.purchase_id:
+                if m.picking_id.type == 'in' and m.purchase_line_id and m.picking_id.purchase_id:
+                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit
                     res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
-        return res     
-stock_partial_move()     
+        return res
+stock_partial_move()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f8745b4b44a..13d9e0f4052 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -29,7 +29,20 @@ class stock_move(osv.osv):
     _defaults = {
         'sale_line_id': False
     }
-    
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Overrides the default stock valuation to take into account the currency that was specified
+        on the sale order in case the valuation data was not directly specified during picking
+        confirmation.
+        """
+        reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
+        if move.product_id.cost_method != 'average' or not move.price_unit:
+            # no average price costing or cost not specified during picking validation, we will 
+            # plug the sale line values if they are found.
+            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+        return reference_amount, reference_currency_id
 stock_move()
 
 class stock_picking(osv.osv):
@@ -211,7 +224,7 @@ stock_picking()
 
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
-      
+
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -226,16 +239,14 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'out' and pick.sale_id:
-                        if m.sale_line_id:
-                            res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
-                        if  pick.sale_id:
-                            res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
-        return res      
-stock_partial_picking() 
+                    if pick.type == 'out' and pick.sale_id and m.sale_line_id:
+                        res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
+                        res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id
+        return res
+stock_partial_picking()
 
 class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"   
+    _inherit = "stock.partial.move"
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -246,13 +257,12 @@ class stock_partial_move(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')  
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+        move_obj = self.pool.get('stock.move')
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'out' and  m.sale_line_id:
-                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
-                if  m.picking_id.sale_id:
-                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False
-        return res     
-stock_partial_move()                                                                                                  
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+                if m.picking_id.type == 'out' and  m.sale_line_id and m.picking_id.sale_id:
+                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit
+                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id
+        return res
+stock_partial_move()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fa68c3c776b..49a6d4db542 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1110,6 +1110,7 @@ class stock_picking(osv.osv):
 
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
+    # FIXME: needs refactoring, this code is partially duplicated in stock_move.do_partial()!
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial picking and moves done.
         @param partial_datas : Dictionary containing details of partial picking
@@ -1117,6 +1118,10 @@ class stock_picking(osv.osv):
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
+        if context is None:
+            context = {}
+        else:
+            context = dict(context)
         res = {}
         move_obj = self.pool.get('stock.move')
         product_obj = self.pool.get('product.product')
@@ -1152,17 +1157,21 @@ class stock_picking(osv.osv):
                     too_many.append(move)
 
                 # Average price computation
+                # FIXME: we should not use the company of the user to determine the currency of the 
+                # product valuation field, we should use the company to which the destination location
+                # belongs! 
                 if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
                     product = product_obj.browse(cr, uid, move.product_id.id)
                     user = users_obj.browse(cr, uid, uid)
-                    context['currency_id'] = move.company_id.currency_id.id
+                    move_currency_id = move.company_id.currency_id.id
+                    context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
                     pricetype = False
                     if user.company_id.property_valuation_price_type:
                         pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
                     if pricetype and qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
-                                user.company_id.currency_id.id, product_price)
+                                move_currency_id, product_price)
                         new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
                                 product.uom_id.id)
                         if product.qty_available <= 0:
@@ -1174,9 +1183,13 @@ class stock_picking(osv.osv):
                                 + (new_price * qty))/(product.qty_available + qty)
 
                         # Write the field according to price type field
-                        product_obj.write(cr, uid, [product.id],
-                                {pricetype.field: new_std_price})
-                        move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
+                        product_obj.write(cr, uid, [product.id], {pricetype.field: new_std_price})
+
+                        # Record the values that were chosen in the wizard, so they can be
+                        # used for inventory valuation if real-time valuation is enabled.
+                        move_obj.write(cr, uid, [move.id], 
+                                {'price_unit': product_price,
+                                 'price_currency_id': product_currency})
 
 
             for move in too_few:
@@ -1475,8 +1488,8 @@ class stock_move(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
-        'price_unit': fields.float('Unit Price',
-            digits_compute= dp.get_precision('Account')),
+        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
+        'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
@@ -1853,48 +1866,107 @@ class stock_move(osv.osv):
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
         return True
 
-    def _get_accounting_values(self, cr, uid, move, context=None):
+    def _get_accounting_data_for_valuation(self, cr, uid, move, context=None):
+        """
+        Return the accounts and journal to use to post Journal Entries for the real-time
+        valuation of the move.
+        
+        :param context: context dictionary that can explicitly mention the company to consider via the 'force_company' key
+        :raise: osv.except_osv() is any mandatory account or journal is not defined.
+        """
         product_obj=self.pool.get('product.product')
-        product_uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
-        accounts = product_obj.get_product_accounts(cr,uid,move.product_id.id,context)
+        accounts = product_obj.get_product_accounts(cr, uid, move.product_id.id, context)
         acc_src = accounts['stock_account_input']
         acc_dest = accounts['stock_account_output']
         acc_variation = accounts.get('property_stock_variation', False)
         journal_id = accounts['stock_journal']
 
-        if context is None:
-            context = {}
-
         if not acc_src:
-            raise osv.except_osv(_('Error!'),  _('There is no stock input account defined ' \
-                                    'for this product: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
                                     (move.product_id.name, move.product_id.id,))
         if not acc_dest:
-            raise osv.except_osv(_('Error!'),  _('There is no stock output account defined ' \
-                                    'for this product: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'),  _('There is no stock output account defined for this product or its category: "%s" (id: %d)') % \
                                     (move.product_id.name, move.product_id.id,))
         if not journal_id:
-            raise osv.except_osv(_('Error!'), _('There is no journal defined '\
-                                    'on the product category: "%s" (id: %d)') % \
+            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 variation  account defined '\
-                                    'on the product category: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'), _('There is no inventory variation account defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        if acc_src != acc_dest:
-            default_uom = move.product_id.uom_id.id
-            q = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
-            if move.product_id.cost_method == 'average' and move.price_unit:
-                amount = q * move.price_unit
-            # Base computation on valuation price type
-            else:
-                company_id = move.company_id.id
-                context['currency_id'] = move.company_id.currency_id.id
-                pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
-                amount_unit = move.product_id.price_get(pricetype.field, context)[move.product_id.id]
-                amount = amount_unit * q or 1.0
-        return journal_id, acc_src, acc_dest, acc_variation, amount
+
+        return journal_id, acc_src, acc_dest, acc_variation
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Return the reference amount and reference currency representing the inventory valuation for this move.
+        These reference values should possibly be converted before being posted in Journals to adapt to the primary
+        and secondary currencies of the relevant accounts.
+        """
+        product_obj=self.pool.get('product.product')
+        product_uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+
+        # by default the reference currency is that of the move's company
+        reference_currency_id = move.company_id.currency_id.id
+
+        default_uom = move.product_id.uom_id.id
+        qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
+
+        # if product is set to average price and a specific value was entered in the picking wizard, 
+        # we use it
+        if move.product_id.cost_method == 'average' and move.price_unit:
+            reference_amount = qty * move.price_unit
+            reference_currency_id = move.price_currency_id.id or reference_currency_id
+
+        # Otherwise we default to the company's valuation price type, considering that the values of the 
+        # valuation field are expressed in the default currency of the move's company.
+        else:
+            if context is None:
+                context = {}
+            currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
+            pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
+            amount_unit = move.product_id.price_get(pricetype.field, currency_ctx)[move.product_id.id]
+            reference_amount = amount_unit * qty or 1.0
+
+        return reference_amount, reference_currency_id
+
+
+    def _create_product_valuation_moves(self, cr, uid, move, context=None):
+        """
+        Generate the appropriate accounting moves if the product being moves is subject
+        to real_time valuation tracking, and the source or destination location is
+        a transit location or is outside of the company.
+        """
+        if move.product_id.valuation == 'real_time': # FIXME: product valuation should perhaps be a property?
+            if context is None:
+                context = {}
+            src_company_ctx = dict(context,force_company=move.location_id.company_id.id)
+            dest_company_ctx = dict(context,force_company=move.location_dest_id.company_id.id)
+            account_moves = []
+            # Outgoing moves (or cross-company output part)
+            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)
+                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))]
+
+            # 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)
+                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))]
+
+            move_obj = self.pool.get('account.move')
+            for j_id, move_lines in account_moves:
+                move_obj.create(cr, uid, 
+                        {'name': move.name,
+                         'journal_id': j_id,
+                         'line_id': move_lines,
+                         'ref': move.picking_id and move.picking_id.name})
+
 
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
@@ -1905,7 +1977,6 @@ class stock_move(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
-        move_obj = self.pool.get('account.move')
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1923,42 +1994,7 @@ class stock_move(osv.osv):
                     if move.move_dest_id.auto_validate:
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
-            #
-            # Accounting Entries
-            #
-            acc_src = None
-            acc_dest = None
-            if move.product_id.valuation == 'real_time':
-                lines = []
-                if ((move.location_id.usage == 'internal' and move.location_dest_id.usage == 'customer') or (move.location_id.usage == 'internal' and move.location_dest_id.usage == 'transit')):
-                    if move.location_id.company_id:
-                        context.update({'force_company': move.location_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    lines = [(journal_id, self.create_account_move(cr, uid, move, acc_dest, acc_variation, amount, context))]
-
-                elif ((move.location_id.usage == 'supplier' and move.location_dest_id.usage == 'internal') or (move.location_id.usage == 'transit' and move.location_dest_id.usage == 'internal')):
-                    if move.location_dest_id.company_id:
-                        context.update({'force_company': move.location_dest_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    lines = [(journal_id, self.create_account_move(cr, uid, move, acc_variation, acc_src, amount, context))]
-                elif (move.location_id.usage == 'internal' and move.location_dest_id.usage == 'internal' and move.location_id.company_id != move.location_dest_id.company_id):
-                    if move.location_id.company_id:
-                        context.update({'force_company': move.location_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    line1 = [(journal_id, self.create_account_move(cr, uid, move, acc_dest, acc_variation, amount, context))]
-                    if move.location_dest_id.company_id:
-                        context.update({'force_company': move.location_dest_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    line2 = [(journal_id, self.create_account_move(cr, uid, move, acc_variation, acc_src, amount, context))]
-                    lines = line1 + line2
-                for j_id, line in lines:
-                    move_obj.create(cr, uid, {
-                        'name': move.name,
-                        'journal_id': j_id,
-                        'type':'cont_voucher',
-                        'line_id': line,
-                        'ref': move.picking_id and move.picking_id.name,
-                    })
+            self._create_product_valuation_moves(cr, uid, move, context=context)
 
         self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
@@ -1973,31 +2009,55 @@ class stock_move(osv.osv):
         picking_obj.log_picking(cr, uid, picking_ids, context=context)
         return True
 
-    def create_account_move(self, cr, uid, move,account_id, account_variation, amount, context=None):
-        if context is None:
-            context = {}
-        partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
-        lines=[(0, 0, {
-                'name': move.name,
-                'quantity': move.product_qty,
-                'product_id': move.product_id and move.product_id.id or False,
-                'credit': amount,
-                'account_id': account_id,
-                'ref': move.picking_id and move.picking_id.name or False,
-                'date': time.strftime('%Y-%m-%d')   ,
-                'partner_id': partner_id,
-                }),
-            (0, 0, {
-                'name': move.name,
-                'product_id': move.product_id and move.product_id.id or False,
-                'quantity': move.product_qty,
-                'debit': amount,
-                'account_id': account_variation,
-                'ref': move.picking_id and move.picking_id.name or False,
-                'date': time.strftime('%Y-%m-%d')   ,
-                'partner_id': partner_id,
-        })]
-        return lines
+    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
+        """
+        Generate the account.move.line values to post to track the stock valuation difference due to the 
+        processing of the given stock move.
+        """
+        # prepare default values considering that the destination accounts have the reference_currency_id as their main currency 
+        partner_id = (move.picking_id.address_id and move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id) or False
+        debit_line_vals = {
+                    'name': move.name,
+                    'product_id': move.product_id and move.product_id.id or False,
+                    'quantity': move.product_qty,
+                    'ref': move.picking_id and move.picking_id.name or False,
+                    'date': time.strftime('%Y-%m-%d')   ,
+                    'partner_id': partner_id,
+                    'debit': reference_amount,
+                    'account_id': dest_account_id,
+        }
+        credit_line_vals = {
+                    'name': move.name,
+                    'product_id': move.product_id and move.product_id.id or False,
+                    'quantity': move.product_qty,
+                    'ref': move.picking_id and move.picking_id.name or False,
+                    'date': time.strftime('%Y-%m-%d')   ,
+                    'partner_id': partner_id,
+                    'credit': reference_amount,
+                    'account_id': src_account_id,
+        }
+
+        # if we are posting to accounts in a different currency, provide correct values in both currencies correctly
+        # when compatible with the optional secondary currency on the account. 
+        # Financial Accounts only accept amounts in secondary currencies if there's no secondary currency on the account
+        # or if it's the same as that of the secondary amount being posted.
+        account_obj = self.pool.get('account.account')
+        src_acct, dest_acct = account_obj.browse(cr, uid, [src_account_id, dest_account_id], context=context)
+        src_main_currency_id = src_acct.company_id.currency_id.id
+        dest_main_currency_id = dest_acct.company_id.currency_id.id
+        cur_obj = self.pool.get('res.currency')
+        if reference_currency_id != src_main_currency_id:
+            # fix credit line:
+            credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
+            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+        if reference_currency_id != dest_main_currency_id:
+            # fix debit line:
+            debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
+            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+                debit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+
+        return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
@@ -2186,6 +2246,7 @@ class stock_move(osv.osv):
 
         return res
 
+    # FIXME: needs refactoring, this code is partially duplicated in stock_picking.do_partial()!
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial pickings and moves done.
         @param partial_datas: Dictionary containing details of partial picking
@@ -2229,6 +2290,9 @@ class stock_move(osv.osv):
                 too_many.append(move)
 
             # Average price computation
+            # FIXME: we should not use the company of the user to determine the currency of the 
+            # product valuation field, we should use the company to which the destination location
+            # belongs! 
             if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                 product = product_obj.browse(cr, uid, move.product_id.id)
                 user = users_obj.browse(cr, uid, uid)
@@ -2250,10 +2314,14 @@ class stock_move(osv.osv):
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    # Write the field according to price type field
-                    product_obj.write(cr, uid, [product.id],
-                            {pricetype.field: new_std_price})
-                    self.write(cr, uid, [move.id], {'price_unit': new_price})
+                    product_obj.write(cr, uid, [product.id],{pricetype.field: new_std_price})
+
+                    # Record the values that were chosen in the wizard, so they can be
+                    # used for inventory valuation if real-time valuation is enabled.
+                    self.write(cr, uid, [move.id], 
+                                {'price_unit': product_price,
+                                 'price_currency_id': product_currency,
+                                })
 
         for move in too_few:
             product_qty = move_product_qty[move.id]

From 495318ea48b9a0dcebd4ca2e515cc337810438b3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 11:20:17 +0530
Subject: [PATCH 039/138] [Fix] sale: remove the purchase_line_id from sale

bzr revid: sbh@tinyerp.com-20100916055017-x9gf8agtna3y4i91
---
 addons/sale/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 13d9e0f4052..7ce8c806cfb 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -40,8 +40,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the sale line values if they are found.
-            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.sale_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 stock_move()
 

From 08c1ed1f642562ff4d3e3a39f96806339b4d1c6c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 11:38:16 +0530
Subject: [PATCH 040/138] [Fix] sale,purchase: Fix the name

bzr revid: sbh@tinyerp.com-20100916060816-vi4wxobnktcv2nyy
---
 addons/purchase/stock.py | 4 ++--
 addons/sale/stock.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index f25a03adda2..fb3d8f0b078 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -42,8 +42,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the purchase line values if they are found.
-            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.purchase_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 
 stock_move()
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 7ce8c806cfb..ce75d1a99ff 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -40,8 +40,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the sale line values if they are found.
-            if move.sale_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
+                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 stock_move()
 

From 98fb031bd0059e37039fde5a04896d24a7b66a13 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 14:37:22 +0530
Subject: [PATCH 041/138] [IMP] stock,sale: Move the code into sale

bzr revid: sbh@tinyerp.com-20100916090722-fkwvzhn03gmo937r
---
 addons/sale/stock.py  |  5 +++++
 addons/stock/stock.py | 33 ++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ce75d1a99ff..02b2817d3b4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -43,6 +43,11 @@ class stock_move(osv.osv):
             if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
                 reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,todo, context=None):
+        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,todo, context=context)
+        if picking.sale_id:
+            picking_obj = self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
+        return res    
 stock_move()
 
 class stock_picking(osv.osv):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 49a6d4db542..3e19738c2e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1682,7 +1682,23 @@ class stock_move(osv.osv):
                     result.setdefault(m.picking_id, [])
                     result[m.picking_id].append( (m, dest) )
         return result
-
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+        res_obj = self.pool.get('res.company')
+        picking_obj = self.pool.get('stock.picking')
+        pick_id= picking_obj.create(cr, uid, {
+                                'name': pick_name,
+                                'origin': str(picking.origin or ''),
+                                'type': ptype,
+                                'note': picking.note,
+                                'move_type': picking.move_type,
+                                'auto_picking': move[0][1][1] == 'auto',
+                                'stock_journal_id': move[0][1][3],
+                                'company_id': move[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context=context),
+                                'address_id': picking.address_id.id,
+                                'invoice_state': 'none',
+                                'date': picking.date,
+                            })
+        return pick_id
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms stock move.
         @return: List of ids.
@@ -1708,20 +1724,7 @@ class stock_move(osv.osv):
                     pickid = check_picking_ids[0]
                 else:
                     if picking:
-                        pickid = picking_obj.create(cr, uid, {
-                            'name': pick_name,
-                            'origin': str(picking.origin or ''),
-                            'type': ptype,
-                            'note': picking.note,
-                            'move_type': picking.move_type,
-                            'auto_picking': todo[0][1][1] == 'auto',
-                            'stock_journal_id': todo[0][1][3],
-                            'company_id': todo[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context=context),
-                            'address_id': picking.address_id.id,
-                            'invoice_state': 'none',
-                            'date': picking.date,
-                            'sale_id':' sale_id' in picking._columns.keys() and  picking.sale_id.id or False
-                        })
+                        pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
                     else:
                         pickid = False
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:

From eaf5e50adcb3f78fa227bcc2f69ba76f29eef381 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 14:38:29 +0530
Subject: [PATCH 042/138] [IMP] stock: change the name of argument

bzr revid: sbh@tinyerp.com-20100916090829-xoavbubn94wqwizm
---
 addons/sale/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 02b2817d3b4..0bb47110213 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -43,8 +43,8 @@ class stock_move(osv.osv):
             if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
                 reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
-    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,todo, context=None):
-        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,todo, context=context)
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,move, context=context)
         if picking.sale_id:
             picking_obj = self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
         return res    

From b792ea494ec867ed773e55d56ef347472410ca71 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 18:14:12 +0530
Subject: [PATCH 043/138] [FIX]: stock :picking cancels done moves

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

bzr revid: sbh@tinyerp.com-20100916124412-fjwhh0ms6935f30i
---
 addons/stock/stock.py           | 11 +++++++++--
 addons/stock/stock_workflow.xml |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3e19738c2e7..80be285cd25 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -60,7 +60,6 @@ class stock_journal(osv.osv):
     }
 
 stock_journal()
-
 #----------------------------------------------------------
 # Stock Location
 #----------------------------------------------------------
@@ -1090,7 +1089,15 @@ class stock_picking(osv.osv):
                 if move.state not in ('cancel',):
                     return False
         return True
-
+   
+    def allow_cancel(self, cr, uid, ids, context={}):
+        for pick in self.browse(cr, uid, ids, context=context):
+            if not pick.move_lines:
+                return True
+            for move in pick.move_lines:
+                if move.state == 'done':
+                    return False
+        return True
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')
         if context is None:
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3254f7b6984..9d4d41260ed 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -96,11 +96,13 @@
         <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_cancel"/>
+			 <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>
+            <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_draft_cancel" model="workflow.transition">

From d0e25ef9642ba10e16be8a5f2365edd3f7c89ba5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 18:39:40 +0530
Subject: [PATCH 044/138] [IMP] stock: raise an exception when picking cancels
 done moves

bzr revid: sbh@tinyerp.com-20100916130940-l3jnsgqhjjavrq4t
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 80be285cd25..19f66ceb61e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1096,7 +1096,7 @@ class stock_picking(osv.osv):
                 return True
             for move in pick.move_lines:
                 if move.state == 'done':
-                    return False
+                    raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !'))                    
         return True
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')

From 05f36597af8125fc562f95ab12a5a61d871ebda0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 11:44:48 +0530
Subject: [PATCH 045/138] [IMP] stock:remove the widget=selection in Move_lines

bzr revid: sbh@tinyerp.com-20100917061448-bi1hsyeca6oj1x9c
---
 addons/stock/stock_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f975637b3c0..b1cd4f20baf 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -705,8 +705,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','=','internal')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -890,8 +890,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -1106,8 +1106,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -1317,8 +1317,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" />
+                                        <field name="location_dest_id" domain="[('usage','=','internal')]" />
                                     </group>
 
                                     <group colspan="2" col="2">

From 3a01a11b8bd281e6d0a0c9626bc5ea1df625b9b9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 15:38:47 +0530
Subject: [PATCH 046/138] [REF] stock: refactored stock_return_picking

bzr revid: sbh@tinyerp.com-20100917100847-oa1zadom07xrtg8y
---
 addons/stock/wizard/stock_return_picking.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 30403e3b1d0..190f57968f0 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -65,18 +65,15 @@ class stock_return_picking(osv.osv_memory):
          @return: New arch of view with new columns.
         """
         res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False
+        record_id = context and context.get('active_id', False) 
         if record_id:
             pick_obj = self.pool.get('stock.picking')
-            try:
-                pick = pick_obj.browse(cr, uid, record_id)
-                for m in [line for line in pick.move_lines]:
-                    if 'return%s'%(m.id) not in self._columns:
-                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                    if 'invoice_state' not in self._columns:
-                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
-            except Exception, e:
-                return res
+            pick = pick_obj.browse(cr, uid, record_id)
+            for m in [line for line in pick.move_lines]:
+                if 'return%s'%(m.id) not in self._columns:
+                    self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                if 'invoice_state' not in self._columns:
+                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 

From f46520efa91c5062e7e30ef989d79fdd83047d0f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 16:55:14 +0530
Subject: [PATCH 047/138] [IMP/REF] stock: Improve the code and remove the
 warning message on return picking wizard

bzr revid: sbh@tinyerp.com-20100917112514-jn9k6d4ngvjs8xba
---
 addons/stock/wizard/stock_return_picking.py | 49 ++++++++-------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 190f57968f0..4542fff47cf 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -73,7 +73,10 @@ class stock_return_picking(osv.osv_memory):
                 if 'return%s'%(m.id) not in self._columns:
                     self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
                 if 'invoice_state' not in self._columns:
-                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
+                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+                for rec in m.move_history_ids2:
+                    if rec.product_qty==m.product_qty:
+                        raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
@@ -110,8 +113,8 @@ class stock_return_picking(osv.osv_memory):
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)
-                if not res.get('returns',False):
-                    raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
+#            if not res.get('returns',False): Todo : It may be used 
+#                raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
         
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             if pick.invoice_state=='invoiced':
@@ -121,13 +124,13 @@ class stock_return_picking(osv.osv_memory):
             res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
             arch_lst.append('<group col="2" colspan="4">')
             arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
-            arch_lst.append('<button name="action_open_window" string="Return" colspan="1" type="object" icon="gtk-apply" />')
+            arch_lst.append('<button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />')
             arch_lst.append('</group>')
             arch_lst.append('</form>')
             res['arch'] = '\n'.join(arch_lst)
         return res
 
-    def _create_returns(self, cr, uid, ids, context):
+    def create_returns(self, cr, uid, ids, context):
         """ 
          Creates return picking.
          @param self: The object pointer.
@@ -183,35 +186,21 @@ class stock_return_picking(osv.osv_memory):
     
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-    
         if new_picking:
             if new_picking:
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
             pick_obj.force_assign(cr, uid, [new_picking], context)
-        return new_picking
-    
-    def action_open_window(self, cr, uid, ids, context):
-        """ 
-         Opens return picking list.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: List of ids selected 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
-        """ 
-        res = self._create_returns(cr, uid, ids, context)
-        if not res:
-            return {}
-        return {
-            'domain': "[('id', 'in', ["+str(res)+"])]",
-            'name': 'Picking List',
-            'view_type':'form',
-            'view_mode':'tree,form',
-            'res_model':'stock.picking',
-            'view_id':False,
-            'type':'ir.actions.act_window',
-        }
+            return {
+                'domain': "[('id', 'in', ["+str(new_picking)+"])]",
+                'name': 'Picking List',
+                'view_type':'form',
+                'view_mode':'tree,form',
+                'res_model':'stock.picking',
+                'view_id':False,
+                'type':'ir.actions.act_window',
+                'context':context,
+            }            
+        return {}
     
 stock_return_picking()
 

From fc1a40a1eeeab3e7e352cc62423fc91f2add2df1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 16 Sep 2010 17:27:53 +0200
Subject: [PATCH 048/138] [FIX] stock: use correct accounts when testing for
 multi-currency Journal Entries

bzr revid: odo@openerp.com-20100916152753-2y93oewqqd3zkmhu
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 19f66ceb61e..49a7d57e417 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2064,7 +2064,7 @@ class stock_move(osv.osv):
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
             debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
-            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+            if (not dest_acct.currency_id) or dest_acct.currency_id.id == reference_currency_id:
                 debit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
 
         return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]

From 1521b235409982842b63b423c6ff7ac4ed4ca1db Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 11:28:33 +0530
Subject: [PATCH 049/138] [IMP] stock: Improve the get_product_available method
 contains SQL injection

bzr revid: sbh@tinyerp.com-20100921055833-u1j2mk8pah2a9oi4
---
 addons/stock/product.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 0feb2a9456c..ca3d19f6878 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -228,16 +228,23 @@ class product_product(osv.osv):
         results = []
         results2 = []
 
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)
-        date_str=False
+        from_date = context.get('from_date',False)
+        to_date = context.get('to_date',False)
+        date_str = False
+        date_values = False
         if from_date and to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+            date_str = "date_planned>=%s and date_planned<=%s"
+            date_values = [from_date, to_date]
         elif from_date:
-            date_str="date_planned>='%s'"%(from_date)
+            date_str = "date_planned>=%s"
+            date_values = [from_date] 
         elif to_date:
-            date_str="date_planned<='%s'"%(to_date)
+            date_str = "date_planned<=%s"
+            date_values = [to_date]
 
+        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
+        if date_values:
+            where.append(tuple(date_values))
         if 'in' in what:
             # all moves from a location out of the set to a location in the set
             cr.execute(
@@ -247,8 +254,7 @@ class product_product(osv.osv):
                 'and location_dest_id IN %s'\
                 'and product_id IN %s'\
                 'and state IN %s' + (date_str and 'and '+date_str+' ' or '') +''\
-                'group by product_id,product_uom',(tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states),)
-            )
+                'group by product_id,product_uom',tuple(where))
             results = cr.fetchall()
         if 'out' in what:
             # all moves from a location in the set to a location out of the set
@@ -259,8 +265,7 @@ class product_product(osv.osv):
                 'and location_dest_id NOT IN %s '\
                 'and product_id  IN %s'\
                 'and state in %s' + (date_str and 'and '+date_str+' ' or '') + ''\
-                'group by product_id,product_uom',(tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states),)
-            )
+                'group by product_id,product_uom',tuple(where))
             results2 = cr.fetchall()
         uom_obj = self.pool.get('product.uom')
         uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
@@ -442,4 +447,4 @@ class product_category(osv.osv):
 
 product_category()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From be9b937035bb6c6a9c9d13eb5ea05c4662d62e29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 15:51:42 +0530
Subject: [PATCH 050/138] [REM] product: Remove property_valuation_price_type
 field from view and code, [IMP]account,hr_expense,product,stock:
 property_valuation_price_type remove the field and use standard_price

bzr revid: sbh@tinyerp.com-20100921102142-nlngoezrxz5m72jb
---
 addons/account/account_analytic_line.py |  3 +-
 addons/hr_expense/hr_expense.py         |  4 +--
 addons/product/__init__.py              |  1 -
 addons/product/__openerp__.py           |  1 -
 addons/product/company.py               | 43 -------------------------
 addons/product/company_view.xml         | 18 -----------
 addons/product/product_data.xml         |  6 ----
 addons/stock/stock.py                   | 30 ++++++-----------
 8 files changed, 12 insertions(+), 94 deletions(-)
 delete mode 100644 addons/product/company.py
 delete mode 100644 addons/product/company_view.xml

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index be1e5ec65e6..5faec1c63a0 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -95,7 +95,8 @@ class account_analytic_line(osv.osv):
                 company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
             flag = False
             # Compute based on pricetype
-            pricetype=product_price_type_obj.browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
+            pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
             if journal_id:
                 journal = analytic_journal_obj.browse(cr, uid, journal_id)
                 if journal.type == 'sale':
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c5818536f8c..96fdcb5250a 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -246,10 +246,8 @@ class hr_expense_line(osv.osv):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v['name'] = product.name
             # Compute based on pricetype of employee company
-            pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.property_valuation_price_type.id
             context['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, pricetype_id, context=context)
-            amount_unit = product.price_get(pricetype.field, context)[product.id]
+            amount_unit = product.price_get('standard_price', context)[product.id]
             v['unit_amount'] = amount_unit
             if not uom_id:
                 v['uom_id'] = product.uom_id.id
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index 3052a02d212..4247b49d41b 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -23,6 +23,5 @@ import pricelist
 import report
 import partner
 import wizard
-import company
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 5d099489859..851031e0424 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,7 +55,6 @@
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
-        'company_view.xml',
         'process/product_process.xml'
     ],
     'test':['test/product_report.yml'],
diff --git a/addons/product/company.py b/addons/product/company.py
deleted file mode 100644
index 0f248dba309..00000000000
--- a/addons/product/company.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class res_company(osv.osv):
-    _inherit = 'res.company'
-    _columns = {
-        'property_valuation_price_type': fields.property(
-            'product.price.type',
-            type='many2one', 
-            relation='product.price.type', 
-            domain=[],
-            string="Valuation Price Type", 
-            method=True,
-            view_load=True,
-            help="The price type field in the selected price type will be used, instead of the default one, \
-                  for valuation of product in the current company"),
-    }
-
-res_company()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/product/company_view.xml b/addons/product/company_view.xml
deleted file mode 100644
index eb0294e2daa..00000000000
--- a/addons/product/company_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<openerp>
-    <data>
-
-    
-        <record id="view_company_property_form" model="ir.ui.view">
-            <field name="name">res.company.product.property.form.inherit</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <field name="property_valuation_price_type"/>
-                </field>
-            </field>
-            </record>
-
-    </data>
-</openerp>
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 05a57126402..e7cd7623f96 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -140,12 +140,6 @@ parameter) will see those record just disappear.
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
 
-        <record forcecreate="True" id="property_valuation_price_type" model="ir.property">
-            <field name="name">property_valuation_price_type</field>
-            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_valuation_price_type')]"/>
-            <field eval="'product.price.type,'+str(ref('standard_price'))" name="value"/>
-        </record>
-
         <record forcecreate="True" id="decimal_sale" model="decimal.precision">
             <field name="name">Sale Price</field>
             <field name="digits">2</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 49a7d57e417..4e6d6c81f18 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -139,15 +139,13 @@ class stock_location(osv.osv):
         if result:
             # Choose the right filed standard_price to read
             # Take the user company
-            price_type_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id, context=context)
             for r in result:
                 c = (context or {}).copy()
                 c['location'] = id
                 product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read], context=c)
                 # Compute the amount_unit in right currency
                 context['currency_id'] = self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
-                amount_unit = self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get(pricetype.field, context)[r['product_id']]
+                amount_unit = self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get('standard_price', context)[r['product_id']]
                 final_value += (product[field_to_read] * amount_unit)
         return final_value
 
@@ -280,8 +278,6 @@ class stock_location(osv.osv):
             context = {}
         product_obj = self.pool.get('product.product')
         # Take the user company and pricetype
-        price_type_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.property_valuation_price_type.id
-        pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
         context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
 
         # To be able to offer recursive or non-recursive reports we need to prevent recursive quantities by default
@@ -320,7 +316,7 @@ class stock_location(osv.osv):
 
                     # Compute based on pricetype
                     # Choose the right filed standard_price to read
-                    amount_unit = product.price_get(pricetype.field, context)[product.id]
+                    amount_unit = product.price_get('standard_price', context)[product.id]
                     price = qty[product_id] * amount_unit
 
                     total_price += price
@@ -887,11 +883,8 @@ class stock_picking(osv.osv):
 
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
-            price_type_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.property_valuation_price_type.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
             context['currency_id'] = move_line.company_id.currency_id.id
-
-            amount_unit = move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id]
+            amount_unit = move_line.product_id.price_get('standard_price', context)[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
@@ -1173,9 +1166,7 @@ class stock_picking(osv.osv):
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                    pricetype = False
-                    if user.company_id.property_valuation_price_type:
-                        pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                    pricetype ='standard_price'
                     if pricetype and qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
@@ -1185,7 +1176,7 @@ class stock_picking(osv.osv):
                             new_std_price = new_price
                         else:
                             # Get the standard price
-                            amount_unit = product.price_get(pricetype.field, context)[product.id]
+                            amount_unit = product.price_get(pricetype, context)[product.id]
                             new_std_price = ((amount_unit * product.qty_available)\
                                 + (new_price * qty))/(product.qty_available + qty)
 
@@ -1934,8 +1925,7 @@ class stock_move(osv.osv):
             if context is None:
                 context = {}
             currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
-            pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
-            amount_unit = move.product_id.price_get(pricetype.field, currency_ctx)[move.product_id.id]
+            amount_unit = move.product_id.price_get('standard_price', currency_ctx)[move.product_id.id]
             reference_amount = amount_unit * qty or 1.0
 
         return reference_amount, reference_currency_id
@@ -2308,9 +2298,7 @@ class stock_move(osv.osv):
                 user = users_obj.browse(cr, uid, uid)
                 context['currency_id'] = move.company_id.currency_id.id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                pricetype = False
-                if user.company_id.property_valuation_price_type:
-                    pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                pricetype = 'standard_price'
                 if pricetype and qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
                             user.company_id.currency_id.id, product_price)
@@ -2320,11 +2308,11 @@ class stock_move(osv.osv):
                         new_std_price = new_price
                     else:
                         # Get the standard price
-                        amount_unit = product.price_get(pricetype.field, context)[product.id]
+                        amount_unit = product.price_get(pricetype, context)[product.id]
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    product_obj.write(cr, uid, [product.id],{pricetype.field: new_std_price})
+                    product_obj.write(cr, uid, [product.id],{pricetype: new_std_price})
 
                     # Record the values that were chosen in the wizard, so they can be
                     # used for inventory valuation if real-time valuation is enabled.

From 4897b891bce0b6aefca88ca771b7947f5296fff3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 17:38:55 +0530
Subject: [PATCH 051/138] [IMP] stock: remove one of the date field on stock
 move and use current_date rename the current date_planned to date

bzr revid: sbh@tinyerp.com-20100921120855-9jmg0dctpytlhnlq
---
 addons/stock/product.py                       |  6 +--
 addons/stock/report/product_stock.py          |  8 +--
 addons/stock/report/report_stock_move.py      | 28 +++++-----
 .../stock/report/report_stock_move_view.xml   | 14 ++---
 addons/stock/stock.py                         | 50 +++++++++--------
 addons/stock/stock_view.xml                   | 54 +++++++++----------
 addons/stock/test/stock_test.yml              |  2 +-
 addons/stock/wizard/stock_return_picking.py   |  2 +-
 8 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index ca3d19f6878..c6b5500c38c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -233,13 +233,13 @@ class product_product(osv.osv):
         date_str = False
         date_values = False
         if from_date and to_date:
-            date_str = "date_planned>=%s and date_planned<=%s"
+            date_str = "date>=%s and date<=%s"
             date_values = [from_date, to_date]
         elif from_date:
-            date_str = "date_planned>=%s"
+            date_str = "date>=%s"
             date_values = [from_date] 
         elif to_date:
-            date_str = "date_planned<=%s"
+            date_str = "date<=%s"
             date_values = [to_date]
 
         where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index e55405381b4..b7dd254234c 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -69,12 +69,12 @@ class report_stock(report_int):
         if not loc_ids or not product_ids:
             return (False, 'pdf')
 
-        cr.execute("select sum(r.product_qty * u.factor), r.date_planned, r.product_id "
+        cr.execute("select sum(r.product_qty * u.factor), r.date, r.product_id "
                    "from stock_move r left join product_uom u on (r.product_uom=u.id) "
                    "where state IN %s"
                    "and location_id IN %s"
                    "and product_id IN %s"
-                   "group by date_planned,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
+                   "group by date,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
                 dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')
@@ -83,12 +83,12 @@ class report_stock(report_int):
             products.setdefault(prod_id, [])
             products[prod_id].append((dt,-qty))
 
-        cr.execute("select sum(r.product_qty * u.factor), r.date_planned, r.product_id "
+        cr.execute("select sum(r.product_qty * u.factor), r.date, r.product_id "
                    "from stock_move r left join product_uom u on (r.product_uom=u.id) "
                    "where state IN %s"
                    "and location_dest_id IN %s"
                    "and product_id IN %s"
-                   "group by date_planned,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
+                   "group by date,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
 
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 460e7a6d0ab..3e005c3a51a 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -28,7 +28,7 @@ class report_stock_move(osv.osv):
     _description = "Moves Statistics"
     _auto = False
     _columns = {
-        'date_planned': fields.date('Date', readonly=True),
+        'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -57,7 +57,7 @@ class report_stock_move(osv.osv):
                 select
                         min(sm_id) as id,
                         sum(value) as value,
-                        al.dp as date_planned,
+                        al.dp as date,
                         al.curr_year as year,
                         al.curr_month as month,
                         al.curr_day as day,
@@ -82,13 +82,13 @@ class report_stock_move(osv.osv):
                         CASE WHEN sp.type in ('in') THEN
                             sum(sm.product_qty)  END AS in_qty,
                         min(sm.id) as sm_id,
-                        sm.date_planned as dp,
-                        to_char(date_trunc('day',sm.date_planned), 'YYYY') as curr_year,
-                        to_char(date_trunc('day',sm.date_planned), 'MM') as curr_month,
-                        to_char(date_trunc('day',sm.date_planned), 'YYYY-MM-DD') as curr_day,
-                        avg(date(sm.date_planned)-date(sm.create_date)) as curr_day_diff,
+                        sm.date as dp,
+                        to_char(date_trunc('day',sm.date), 'YYYY') as curr_year,
+                        to_char(date_trunc('day',sm.date), 'MM') as curr_month,
+                        to_char(date_trunc('day',sm.date), 'YYYY-MM-DD') as curr_day,
+                        avg(date(sm.date)-date(sm.create_date)) as curr_day_diff,
                         avg(date(sm.date_expected)-date(sm.create_date)) as curr_day_diff1,
-                        avg(date(sm.date_planned)-date(sm.date_expected)) as curr_day_diff2,
+                        avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
                         pt.standard_price * sum(sm.product_qty) as value,
@@ -107,7 +107,7 @@ class report_stock_move(osv.osv):
                         left join stock_location sl on (sm.location_id = sl.id)
 
                     group by
-                        sm.id,sp.type, sm.date_planned,sm.address_id,
+                        sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
@@ -129,7 +129,7 @@ class report_stock_inventory(osv.osv):
     _description = "Stock Statistics"
     _auto = False
     _columns = {
-        'date_planned': fields.datetime('Date', readonly=True),
+        'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
@@ -147,7 +147,7 @@ class report_stock_inventory(osv.osv):
         cr.execute("""
 create or replace view report_stock_inventory as (
     (select
-        min(m.id) as id, m.date_planned as date_planned,
+        min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
@@ -163,10 +163,10 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date_planned, m.state, l.usage, m.company_id
+        m.date, m.state, l.usage, m.company_id
 ) union all (
     select
-        -m.id as id, m.date_planned as date_planned,
+        -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
@@ -182,7 +182,7 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_dest_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date_planned, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
         """)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2c8c1ad80e9..2ee9809f86d 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -13,7 +13,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Moves Analysis">
-                <field name="date_planned" invisible="1"/>
+                <field name="date" invisible="1"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -62,7 +62,7 @@
                 <filter icon="terp-go-today"
                     string="Today"
                     separator="1"
-                    domain="[('date_planned','=', time.strftime('%%Y-%%m-%%d'))]"
+                    domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
                     help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
 
@@ -99,7 +99,7 @@
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
@@ -109,7 +109,7 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                 </group>
 
             </search>
@@ -134,7 +134,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Inventory Analysis">
-                <field name="date_planned" invisible="1"/>
+                <field name="date" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
@@ -182,7 +182,7 @@
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -197,7 +197,7 @@
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
                 <newline/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4e6d6c81f18..6e23e89506d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -554,12 +554,12 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context):
             sql_str = """update stock_move set
-                    date_planned='%s'
+                    date='%s'
                 where
                     picking_id=%d """ % (value, pick.id)
 
             if pick.max_date:
-                sql_str += " and (date_planned='" + pick.max_date + "' or date_planned>'" + value + "')"
+                sql_str += " and (date='" + pick.max_date + "' or date>'" + value + "')"
             cr.execute(sql_str)
         return True
 
@@ -576,11 +576,11 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context=context):
             sql_str = """update stock_move set
-                    date_planned='%s'
+                    date='%s'
                 where
                     picking_id=%s """ % (value, pick.id)
             if pick.min_date:
-                sql_str += " and (date_planned='" + pick.min_date + "' or date_planned<'" + value + "')"
+                sql_str += " and (date='" + pick.min_date + "' or date<'" + value + "')"
             cr.execute(sql_str)
         return True
 
@@ -595,8 +595,8 @@ class stock_picking(osv.osv):
             return res
         cr.execute("""select
                 picking_id,
-                min(date_planned),
-                max(date_planned)
+                min(date),
+                max(date)
             from
                 stock_move
             where
@@ -1457,9 +1457,8 @@ class stock_move(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
-
-        'date': fields.datetime('Creation Date', select=True),
-        'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'date': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
@@ -1540,7 +1539,6 @@ class stock_move(osv.osv):
         'priority': '1',
         'product_qty': 1.0,
         'scrapped' :  False,
-        'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
         'date_expected': time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1673,7 +1671,7 @@ class stock_move(osv.osv):
             if dest:
                 if dest[1] == 'transparent':
                     self.write(cr, uid, [m.id], {
-                        'date_planned': (datetime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \
+                        'date': (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + \
                             relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'),
                         'location_dest_id': dest[0].id})
                 else:
@@ -1734,7 +1732,7 @@ class stock_move(osv.osv):
                         'state': 'waiting',
                         'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
                         'move_history_ids': [],
-                        'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
+                        'date': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
                     )
                     move_obj.write(cr, uid, [move.id], {
@@ -1996,7 +1994,7 @@ class stock_move(osv.osv):
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
 
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
@@ -2426,7 +2424,7 @@ class stock_inventory(osv.osv):
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,
                         'date': inv.date,
-                        'date_planned': inv.date,
+                        'date': inv.date,
                         'state': 'done'
                     }
                     if change > 0:
@@ -2591,21 +2589,21 @@ class report_products_to_received_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
         cr.execute("""
             create or replace view report_products_to_received_planned as (
-               select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+               select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
+                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.create_date
 
                     union
 
-               select stock.date_planned, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date_planned
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date
                 )
         """)
 
@@ -2626,21 +2624,21 @@ class report_delivery_products_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
         cr.execute("""
             create or replace view report_delivery_products_planned as (
-                select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+                select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
+                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.create_date
 
                     union
 
-               select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date_planned
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date
 
 
                 )
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1cd4f20baf..d8bebd97fce 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -390,8 +390,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="date"/>
-                    <field name="date_planned" string="Date"/>
+                    <field name="create_date"/>
+                    <field name="date" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -415,8 +415,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="date" />
-                    <field name="date_planned" string="Date"/>
+                    <field name="create_date" />
+                    <field name="date" string="Date"/>
                      <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
@@ -683,7 +683,7 @@
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -711,8 +711,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -868,7 +868,7 @@
                                         groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -896,8 +896,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1083,7 +1083,7 @@
                                         groups="base.group_extended"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -1112,8 +1112,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1323,8 +1323,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1497,10 +1497,10 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves" editable="top">
+                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
-                    <field name="date" invisible="1"/>
+                    <field name="create_date" invisible="1"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1528,7 +1528,7 @@
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -1570,8 +1570,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
+                        <field name="create_date"/>
                         <field name="date"/>
-                        <field name="date_planned"/>
                         <field name="date_expected"/>
                         <field name="priority"/>
                     </group>
@@ -1613,7 +1613,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="14" colspan="4">
-                        <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
@@ -1622,7 +1622,7 @@
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
-                        <field name="date_planned"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -1636,8 +1636,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Creation" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected" name="groupby_date_planned" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." colspan="4" col="8">
@@ -1699,7 +1699,7 @@
                         groups="base.group_extended"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
@@ -1740,8 +1740,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
+                        <field name="create_date"/>
                         <field name="date"/>
-                        <field name="date_planned"/>
                         <field name="date_expected"/>
                         <field name="priority"/>
                     </group>
@@ -1783,7 +1783,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
@@ -1800,7 +1800,7 @@
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 442cc8735b9..77b398a94bb 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -294,7 +294,7 @@
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date_planned: '2010-05-11 15:18:57'
+        date: '2010-05-11 15:18:57'
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index fc49abb62a1..662772faf96 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -177,7 +177,7 @@ class stock_return_picking(osv.osv_memory):
                     new_qty, move.product_uos.id),
                 'picking_id':new_picking, 'state':'draft',
                 'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur, 'date_planned':date_cur,})
+                'date':date_cur, 'date':date_cur,})
             move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
     
         if set_invoice_state_to_none:

From 1397b4df2141e495f8e9c169c72229a51b0d3e6a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 17:54:21 +0530
Subject: [PATCH 052/138] [IMP] point_of_sale: Rename the date_planned to date
 in stock_move

bzr revid: sbh@tinyerp.com-20100921122421-8q36feddjkzrxwwf
---
 addons/point_of_sale/wizard/pos_return.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index cbfe4c5365a..3620ed0f451 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -206,8 +206,7 @@ class pos_return(osv.osv_memory):
                             'product_id': line.product_id.id,
                             'location_dest_id': stock_dest_id,
                             'name': '%s (return)' %order_id.name,
-                            'date': date_cur,
-                            'date_planned': date_cur
+                            'date': date_cur
                         })
                         line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
                 order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
@@ -288,8 +287,7 @@ class add_product(osv.osv_memory):
                                 'product_id':prod_id.id,
                                 'location_dest_id':stock_dest_id,
                                 'name':'%s (return)' %order_id.name,
-                                'date':date_cur,
-                                'date_planned':date_cur
+                                'date':date_cur
                             })
 
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
@@ -356,7 +354,6 @@ class add_product(osv.osv_memory):
                         'location_dest_id':stock_dest_id,
                         'name':'%s (return)' %order_id.name,
                         'date':date_cur,
-                        'date_planned':date_cur
                     })
                     lines_obj.write(cr,uid,[line.id], {
                                 'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],

From f3dd4e659de9e1bef9a5052e932b5a9e01a6afb5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:04:53 +0530
Subject: [PATCH 053/138] [IMP] sale,mrp,purchase: Rename the date_planned to
 date in stock_move

bzr revid: sbh@tinyerp.com-20100921123453-186dl4tyq1mwzo2x
---
 addons/mrp/mrp.py               | 6 +++---
 addons/mrp/report/mrp_report.py | 4 ++--
 addons/mrp/stock.py             | 2 +-
 addons/purchase/purchase.py     | 2 +-
 addons/sale/sale.py             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5ad90bf25d6..8cb3b62689d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -857,7 +857,7 @@ class mrp_production(osv.osv):
             source = production.product_id.product_tmpl_id.property_stock_production.id
             data = {
                 'name':'PROD:' + production.name,
-                'date_planned': production.date_planned,
+                'date': production.date_planned,
                 'product_id': production.product_id.id,
                 'product_qty': production.product_qty,
                 'product_uom': production.product_uom.id,
@@ -879,7 +879,7 @@ class mrp_production(osv.osv):
                 if line.product_id.type in ('product', 'consu'):
                     res_dest_id = move_obj.create(cr, uid, {
                         'name':'PROD:' + production.name,
-                        'date_planned': production.date_planned,
+                        'date': production.date_planned,
                         'product_id': line.product_id.id,
                         'product_qty': line.product_qty,
                         'product_uom': line.product_uom.id,
@@ -900,7 +900,7 @@ class mrp_production(osv.osv):
                         'product_uom': line.product_uom.id,
                         'product_uos_qty': line.product_uos and line.product_uos_qty or False,
                         'product_uos': line.product_uos and line.product_uos.id or False,
-                        'date_planned': newdate,
+                        'date': newdate,
                         'move_dest_id': res_dest_id,
                         'location_id': production.location_src_id.id,
                         'location_dest_id': routing_loc or production.location_src_id.id,
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index 6ae1b2e63e5..d677184586e 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -71,7 +71,7 @@ class report_mrp_inout(osv.osv):
             create or replace view report_mrp_inout as (
                 select
                     min(sm.id) as id,
-                    to_char(sm.date_planned,'YYYY:IW') as date,
+                    to_char(sm.date,'YYYY:IW') as date,
                     sum(case when (sl.usage='internal') then
                         pt.standard_price * sm.product_qty
                     else
@@ -94,7 +94,7 @@ class report_mrp_inout(osv.osv):
                 where
                     sm.state in ('waiting','confirmed','assigned')
                 group by
-                    to_char(sm.date_planned,'YYYY:IW')
+                    to_char(sm.date,'YYYY:IW')
             )""")
 
 report_mrp_inout()
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 248e39989d8..9f149dda6bd 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -79,7 +79,7 @@ class StockMove(osv.osv):
                     proc_id = procurement_obj.create(cr, uid, {
                         'name': (move.picking_id.origin or ''),
                         'origin': (move.picking_id.origin or ''),
-                        'date_planned': move.date_planned,
+                        'date_planned': move.date,
                         'product_id': line['product_id'],
                         'product_qty': line['product_qty'],
                         'product_uom': line['product_uom'],
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 51e294200cb..29320cf28c0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -451,7 +451,7 @@ class purchase_order(osv.osv):
                         'product_uos_qty': order_line.product_qty,
                         'product_uom': order_line.product_uom.id,
                         'product_uos': order_line.product_uom.id,
-                        'date_planned': order_line.date_planned,
+                        'date': order_line.date_planned,
                         'date_expected': order_line.date_planned,
                         'location_id': loc_id,
                         'location_dest_id': dest,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b2df12965d3..924c17d0da3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -654,7 +654,7 @@ class sale_order(osv.osv):
                         'name': line.name[:64],
                         'picking_id': picking_id,
                         'product_id': line.product_id.id,
-                        'date_planned': date_planned,
+                        'date': date_planned,
                         'date_expected': date_planned,
                         'product_qty': line.product_uom_qty,
                         'product_uom': line.product_uom.id,

From a94078f37ffab309684f8f0c27c2d6ded5d59114 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:20:29 +0530
Subject: [PATCH 054/138] [IMP] mrp_repair,stock_location,stock_planning:
 Rename the date_planned to date in stock_move

bzr revid: sbh@tinyerp.com-20100921125029-2jm2exk7b66k8rvb
---
 addons/mrp_repair/mrp_repair.py            | 2 +-
 addons/mrp_repair/test/test_mrp_repair.yml | 2 +-
 addons/stock_location/mrp_pull.py          | 2 +-
 addons/stock_planning/stock_planning.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index ddcd2ccb501..85c26593501 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -192,7 +192,7 @@ class mrp_repair(osv.osv):
         if move_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            date = move.date_planned
+            date = move.date
             limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 7d38ab8a94d..3e58a837f38 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -8,7 +8,7 @@
     company_id: base.main_company
     date: '2010-06-24 20:10:28'
     date_expected: '2010-06-24 20:10:55'
-    date_planned: '2010-06-24 20:10:28'
+    date: '2010-06-24 20:10:28'
     location_dest_id: stock.stock_location_stock
     location_id: stock.stock_location_stock
     name: '[PC1] Basic PC'
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index b4a68ca1b74..231a814e671 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
                 'picking_id': picking_id,
                 'company_id':  line.company_id and line.company_id.id or False,
                 'product_id': proc.product_id.id,
-                'date_planned': proc.date_planned,
+                'date': proc.date_planned,
                 'product_qty': proc.product_qty,
                 'product_uom': proc.product_uom.id,
                 'product_uos_qty': (proc.product_uos and proc.product_uos_qty)\
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index f6668130415..3bd9e6d6af9 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -690,7 +690,7 @@ class stock_planning(osv.osv):
                         'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
                         'picking_id': picking_id,
                         'product_id': obj.product_id.id,
-                        'date_planned': obj.period_id.date_start,
+                        'date': obj.period_id.date_start,
                         'product_qty': uom_qty,
                         'product_uom': uom,
                         'product_uos_qty': uos_qty,

From 9b6c4820ebaec8ab0482f494ecf77014b89cef09 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:44:39 +0530
Subject: [PATCH 055/138] [IMP] mrp_subproduct: Rename the date_planned to date
 in stock_move

bzr revid: sbh@tinyerp.com-20100921131439-ovr5igac3gjwg9zi
---
 addons/mrp_repair/test/test_mrp_repair.yml  | 1 -
 addons/mrp_subproduct/mrp_subproduct.py     | 2 +-
 addons/stock/wizard/stock_return_picking.py | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 3e58a837f38..1cf82635825 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -8,7 +8,6 @@
     company_id: base.main_company
     date: '2010-06-24 20:10:28'
     date_expected: '2010-06-24 20:10:55'
-    date: '2010-06-24 20:10:28'
     location_dest_id: stock.stock_location_stock
     location_id: stock.stock_location_stock
     name: '[PC1] Basic PC'
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 0478b0d1779..5519bba3a5c 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -83,7 +83,7 @@ class mrp_production(osv.osv):
                         qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
                 data = {
                     'name': 'PROD:'+production.name,
-                    'date_planned': production.date_planned,
+                    'date': production.date_planned,
                     'product_id': sub_product.product_id.id,
                     'product_qty': qty1,
                     'product_uom': sub_product.product_uom.id,
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 662772faf96..6cb7c144901 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -177,7 +177,7 @@ class stock_return_picking(osv.osv_memory):
                     new_qty, move.product_uos.id),
                 'picking_id':new_picking, 'state':'draft',
                 'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur, 'date':date_cur,})
+                'date':date_cur,})
             move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
     
         if set_invoice_state_to_none:

From a55d740cb55847e2df34ba461bfd23506ae63bbb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 20 Sep 2010 16:20:27 +0200
Subject: [PATCH 056/138] [IMP] stock: products inventory valuation properties
 layout

bzr revid: odo@openerp.com-20100920142027-1g02p8kmsdvn9uf8
---
 addons/stock/product_view.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index c1fc739eda2..561bb9f2206 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,16 +75,21 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-     		      <xpath expr="/form/notebook/page/group[@name='properties']" position="before"> 
-     				<group  groups="base.group_extended">
-	                	<separator string="Stock Input/Output Account" colspan="2"/>
-	                	 <newline/>
-	                	<field name="valuation"/>
-	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                    <group groups="base.group_extended">
+                        <separator string="Inventory Valuation" colspan="4"/>
+                        <group colspan="2" col="2">
+                            <field name="valuation"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                                domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                            <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                                domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                        </group>
                     </group>
                     <newline/>
-                    </xpath>
+                </xpath>
             </field>
         </record>
 

From 5fc0c4695709a2a7350b43a111186664eefcd7fe Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 19:19:34 +0200
Subject: [PATCH 057/138] [FIX] stock.partial.picking: production lot should
 not be readonly

bzr revid: odo@openerp.com-20100921171934-i65x2tg51pqbqlrw
---
 addons/stock/wizard/stock_partial_picking.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bbc9021d87c..2d4422986d5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -97,7 +97,6 @@ class stock_partial_picking(osv.osv_memory):
                             'string': _('Production Lot'),
                             'type': 'many2one',
                             'relation': 'stock.production.lot',
-                            'readonly': True,
                         }
                     })
 

From cec285803f60dbc6936e9033a2466184277695a0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:01:30 +0530
Subject: [PATCH 058/138] [Fix] stock: partial_picking wizard set production
 lot on the moves

bzr revid: sbh@tinyerp.com-20100922063130-p26mwhoc9s33p6db
---
 addons/stock/stock.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2aa3c3765ed..33914b5c435 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1149,6 +1149,9 @@ class stock_picking(osv.osv):
                 product_uom = partial_data.get('product_uom',False)
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
+                prodlot_id = partial_data.get('prodlot_id',False)
+                if prodlot_id:
+                  move_obj.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1458,7 +1461,7 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'date': fields.datetime('Date ', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 

From e32b992d2bffda023a7a6a2ca3eb28ee1d4aba29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:08:55 +0530
Subject: [PATCH 059/138] [ADD] stock: Add the production_lot field in Stock
 partial move wizard

bzr revid: sbh@tinyerp.com-20100922063855-zuj4ww3uzr69z9rl
---
 addons/stock/stock.py                     |  3 +++
 addons/stock/wizard/stock_partial_move.py | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 33914b5c435..c5784541f68 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2283,6 +2283,9 @@ class stock_move(osv.osv):
             product_uom = partial_data.get('product_uom',False)
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
+            prodlot_id = partial_data.get('prodlot_id',False)
+            if prodlot_id:
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                      
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 1fee7c66d0b..a6e515cd0c4 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -47,7 +47,9 @@ class stock_partial_move(osv.osv_memory):
                 self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
             if 'move%s_product_uom'%(m.id) not in self._columns:
                 self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
-
+            if 'move%s_prodlot_id'%(m.id) not in self._columns:
+                self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
+                
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                 if 'move%s_product_price'%(m.id) not in self._columns:
                     self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
@@ -89,7 +91,12 @@ class stock_partial_move(osv.osv_memory):
                         'relation': 'product.uom',
                         'required' : True,
                         'readonly' : True,
-                    }
+                    },
+                    'move%s_prodlot_id'%(m.id): {
+                            'string': _('Production Lot'),
+                            'type': 'many2one',
+                            'relation': 'stock.production.lot',
+                        }                    
                 })
 
                 _moves_arch_lst += """
@@ -97,7 +104,8 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                """%(m.id, m.id, m.id)
+                    <field name="move%s_prodlot_id" />                    
+                """%(m.id, m.id, m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
@@ -162,6 +170,8 @@ class stock_partial_move(osv.osv_memory):
                 res['move%s_product_qty'%(m.id)] = m.product_qty
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
+            if 'move%s_prodlot_id'%(m.id) in fields:
+                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id                
             if  m.product_id.cost_method == 'average' :
                 price = m.product_id.standard_price
                 currency = False
@@ -193,7 +203,8 @@ class stock_partial_move(osv.osv_memory):
             partial_datas['move%s'%(m.id)] = {
                 'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
                 'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
-                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id,
+                'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id                
             }
 
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):

From c4712a8dd49e3a64349d07bef15cecfe409fb764 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:15:27 +0530
Subject: [PATCH 060/138] [IMP]stock :production lot info should be hidden if
 user does not have extended view

bzr revid: sbh@tinyerp.com-20100922064527-3ddi9ul6gcngodsa
---
 addons/stock/wizard/stock_partial_move.py    | 2 +-
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index a6e515cd0c4..dafb50cefe1 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -104,7 +104,7 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                    <field name="move%s_prodlot_id" />                    
+                    <field name="move%s_prodlot_id" groups="base.group_extended" />                    
                 """%(m.id, m.id, m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 2d4422986d5..3bfe075eb0b 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -105,7 +105,7 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
-                        <field name="move%s_prodlot_id" />
+                        <field name="move%s_prodlot_id" groups="base.group_extended" />
                     """%(m.id, m.id, m.id, m.id)
                     if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({

From cf53d5cd724d4ea7f051e9ea11fee10dad402ccd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:24:59 +0530
Subject: [PATCH 061/138] [Fix] stock:  stock_move_do_partial to properly set
 the production lot

bzr revid: sbh@tinyerp.com-20100922065459-dzp65m06jiomu4rp
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c5784541f68..209492c8bb9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2284,8 +2284,6 @@ class stock_move(osv.osv):
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
             prodlot_id = partial_data.get('prodlot_id',False)
-            if prodlot_id:
-                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                      
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -2354,6 +2352,8 @@ class stock_move(osv.osv):
             complete.append(move)
 
         for move in complete:
+            if prodlot_id:
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
             self.action_done(cr, uid, [move.id], context=context)
             if  move.picking_id.id :
                 # TOCHECK : Done picking if all moves are done

From d672ae367f522aaa216aee2ee41d022ec54065f3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:49:38 +0530
Subject: [PATCH 062/138] [Fix] stock:Partial picking wizard  set
 production_lot set only on moves that are Done

bzr revid: sbh@tinyerp.com-20100922071938-il1ap830qp62sx7e
---
 addons/stock/stock.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 209492c8bb9..5c1343c8d5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1150,8 +1150,6 @@ class stock_picking(osv.osv):
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
                 prodlot_id = partial_data.get('prodlot_id',False)
-                if prodlot_id:
-                  move_obj.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1978,6 +1976,9 @@ class stock_move(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
+        partial_obj=self.pool.get('stock.partial.picking')
+        partial_id=partial_obj.search(cr,uid,[])
+        partial_datas=partial_obj.read(cr,uid,partial_id)[0]
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1996,8 +1997,10 @@ class stock_move(osv.osv):
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-
-        self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+            prodlot_id = partial_datas.get('move%s_prodlot_id'%(move.id), False)
+            if prodlot_id:
+                self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
+            self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)

From 6e479c58ad9aaf73486635cc4e0302dc9854185f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 15:22:43 +0530
Subject: [PATCH 063/138] [IMP] stock: Improve the Return picking wizard take
 the move line which is done state

bzr revid: sbh@tinyerp.com-20100922095243-nslm43jyhvldbpo7
---
 addons/stock/stock.py                       |  6 ++++--
 addons/stock/wizard/stock_return_picking.py | 17 +++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5c1343c8d5e..cb9259f08cc 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1972,13 +1972,15 @@ class stock_move(osv.osv):
         @return:
         """
         track_flag = False
+        partial_datas=''
         picking_ids = []
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
         partial_obj=self.pool.get('stock.partial.picking')
         partial_id=partial_obj.search(cr,uid,[])
-        partial_datas=partial_obj.read(cr,uid,partial_id)[0]
+        if partial_id:
+            partial_datas=partial_obj.read(cr,uid,partial_id)[0]
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1997,7 +1999,7 @@ class stock_move(osv.osv):
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-            prodlot_id = partial_datas.get('move%s_prodlot_id'%(move.id), False)
+            prodlot_id =partial_datas and  partial_datas.get('move%s_prodlot_id'%(move.id), False)
             if prodlot_id:
                 self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
             self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 6cb7c144901..504563c230d 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -70,10 +70,11 @@ class stock_return_picking(osv.osv_memory):
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
             for m in [line for line in pick.move_lines]:
-                if 'return%s'%(m.id) not in self._columns:
-                    self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                if 'invoice_state' not in self._columns:
-                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+                if m.state=='done':
+                    if 'return%s'%(m.id) not in self._columns:
+                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                    if 'invoice_state' not in self._columns:
+                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
                 for rec in m.move_history_ids2:
                     if rec.product_qty==m.product_qty:
                         raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
@@ -97,9 +98,8 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
-            if pick.state != 'done':
+            if pick.state not in['done','confirmed']:
                 raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
-        
             return_history = {}
             for m_line in pick.move_lines:
                 return_history[m_line.id] = 0
@@ -109,13 +109,10 @@ class stock_return_picking(osv.osv_memory):
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
             for m in [line for line in pick.move_lines]:
                 quantity = m.product_qty
-                if quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
+                if m.state=='done' and quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)
-#            if not res.get('returns',False): Todo : It may be used 
-#                raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
-        
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
             arch_lst.append('<group col="2" colspan="4">')

From c04e93ee33508e03613afd2d183de4e0494654b9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 18:20:36 +0530
Subject: [PATCH 064/138] [IMP] stock: Improve the Return picking wizard

bzr revid: sbh@tinyerp.com-20100922125036-4rp33dgc27n0tn4t
---
 addons/stock/wizard/stock_return_picking.py | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 504563c230d..9f34bbc5fac 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -158,25 +158,25 @@ class stock_return_picking(osv.osv_memory):
                         'move_lines':[], 'state':'draft', 'type':new_type,
                         'date':date_cur, 'invoice_state':data['invoice_state'],})
             new_location=move.location_dest_id.id
+            if move.state=='done':
+                new_qty = data['return%s' % move.id]
+                returned_qty = move.product_qty
     
-            new_qty = data['return%s' % move.id]
-            returned_qty = move.product_qty
-    
-            for rec in move.move_history_ids2:
-                returned_qty -= rec.product_qty
-    
-            if returned_qty != new_qty:
-                set_invoice_state_to_none = False
-    
-            new_move=move_obj.copy(cr, uid, move.id, {
-                'product_qty': new_qty,
-                'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                    new_qty, move.product_uos.id),
-                'picking_id':new_picking, 'state':'draft',
-                'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur,})
-            move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
-    
+                for rec in move.move_history_ids2:
+                    returned_qty -= rec.product_qty
+        
+                if returned_qty != new_qty:
+                    set_invoice_state_to_none = False
+        
+                new_move=move_obj.copy(cr, uid, move.id, {
+                    'product_qty': new_qty,
+                    'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+                        new_qty, move.product_uos.id),
+                    'picking_id':new_picking, 'state':'draft',
+                    'location_id':new_location, 'location_dest_id':move.location_id.id,
+                    'date':date_cur,})
+                move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+        
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
         if new_picking:

From ce964cd20570569bbfb9da1bec5a6753f594e126 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 16:33:01 +0200
Subject: [PATCH 065/138] [IMP] stock: use more unique names in yml test to
 avoid name conflicts with other demo data

bzr revid: odo@openerp.com-20100922143301-d6dc4ueohuj4gjnx
---
 addons/stock/test/stock_test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 77b398a94bb..33d879cd7e6 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -53,7 +53,7 @@
   I create Receivable Account .
 - 
   !record {model: account.account, id: account_account_receivable0}:
-    code: '40000'
+    code: '40000-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Receivable
@@ -65,7 +65,7 @@
   I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable0}:
-    code: '440000'
+    code: '440000-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Payable
@@ -111,7 +111,7 @@
   I create Product Sale Account.
 - 
   !record {model: account.account, id: account_account_productsale0}:
-    code: '001'
+    code: '001-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Product Sale
@@ -123,7 +123,7 @@
   I create Product Purchase Account.
 - 
   !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002'
+    code: '0002-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Product Purchase
@@ -267,7 +267,7 @@
 - 
   !record {model: stock.move.split, id: stock_move_split_0}:
     line_ids:
-      - name: '00001'
+      - name: '00001-stock-test'
         quantity: 5      
     product_id: stock.product_product_hpcdwriters0
      

From 5a2baadf2e625833039d343bcbc198ddaf43bb79 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:52:10 +0200
Subject: [PATCH 066/138] [IMP] stock: added sums on Inventory Analysis tree
 view

bzr revid: odo@openerp.com-20100922165210-7ns713vkhuujxubh
---
 addons/stock/report/report_stock_move_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2ee9809f86d..fe68dedd8a7 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -127,7 +127,6 @@
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
     <!-- Inventory Control -->
-
     <record id="view_stock_inventory_tree" model="ir.ui.view">
         <field name="name">report.stock.inventory.tree</field>
         <field name="model">report.stock.inventory</field>
@@ -142,8 +141,8 @@
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="product_qty"/>
-                <field name="value"/>
+                <field name="product_qty" sum="Total quantity"/>
+                <field name="value" sum="Total value"/>
            </tree>
         </field>
     </record>
@@ -171,12 +170,12 @@
                         name="real"
                         icon="terp-dialog-close"
                         domain="[('state','=','done')]"
-                        help="Analysis on real stock."/>
+                        help="Analysis on real stock (including only moves already processed)"/>
 
                     <filter string="Future"
                         icon="terp-camera_test"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future operations."/>
+                        help = "Analysis including future operations (similar to virtual stock)"/>
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>

From 65dd1ccf79e4d173fd51fb14cedf0dc9e8b7f768 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:52:47 +0200
Subject: [PATCH 067/138] [IMP] decimal_precision: better constraint error
 message

bzr revid: odo@openerp.com-20100922165247-zmowte1j492lwfeg
---
 addons/decimal_precision/decimal_precision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index 6a0f8ffa424..9ef8b67ebbc 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -35,7 +35,7 @@ class decimal_precision(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', """The Usage of the decimal precision must be unique!"""),
+        ('name_uniq', 'unique (name)', """Only one value can be defined for each given usage!"""),
     ]
 
     @cache(skiparg=3)

From 209cac5d0d1f817eff616d3acbb10c8881da63d8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:53:22 +0200
Subject: [PATCH 068/138] [IMP] product,stock: all float fields related to
 quantities and prices should use the corresponding decimal precision

bzr revid: odo@openerp.com-20100922165322-266p61d5yn0xbbzq
---
 addons/product/product.py                |  6 +++---
 addons/product/product_data.xml          |  5 ++++-
 addons/stock/product.py                  |  9 ++++----
 addons/stock/report/report_stock_move.py |  2 +-
 addons/stock/stock.py                    | 26 +++++++++++++-----------
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index eaa1df9ebf2..035ff1f0faa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -69,15 +69,15 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
-        'factor': fields.float('Ratio', digits=(12, 6), required=True,
+        'factor': fields.float('Ratio', digits_compute=dp.get_precision('Product UoM'), required=True,
             help='How many times this UoM is smaller than the reference UoM in this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
-        'factor_inv': fields.function(_factor_inv, digits=(12, 6),
+        'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),
             fnct_inv=_factor_inv_write,
             method=True, string='Ratio',
             help='How many times this UoM is bigger than the reference UoM in this category:\n'\
                     '1 * (this unit) = ratio * (reference unit)', required=True),
-        'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
+        'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product UoM'), required=True,
             help="The computed quantity will be a multiple of this value. "\
                  "Use 1.0 for a UoM that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index e7cd7623f96..962f8aca560 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -156,6 +156,9 @@ parameter) will see those record just disappear.
             <field name="name">Stock Weight</field>
             <field name="digits">2</field>
         </record>
-       
+        <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
+            <field name="name">Product UoM</field>
+            <field name="digits" eval="6"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index c6b5500c38c..bdaec60832e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -314,10 +315,10 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
-        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
+        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
         'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 3e005c3a51a..f7aab3c1895 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -135,7 +135,7 @@ class report_stock_inventory(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_qty':fields.float('Qty', digits=(16,2), readonly=True),
+        'product_qty':fields.float('Quantity', digits=(16,2), readonly=True),
         'value' : fields.float('Total Value', digits=(16,2), required=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index cb9259f08cc..31752fcd7f1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -178,8 +178,8 @@ class stock_location(osv.osv):
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
         'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
 
-        'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
-        'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock"),
+        'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock", digits_compute=dp.get_precision('Product UoM')),
+        'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock", digits_compute=dp.get_precision('Product UoM')),
 
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
@@ -216,8 +216,8 @@ class stock_location(osv.osv):
 
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
-        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
+        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
     }
@@ -1358,7 +1358,9 @@ class stock_production_lot(osv.osv):
         'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'date': fields.datetime('Creation Date', required=True),
-        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2", help="Current quantity of products with this Production Lot Number available in company warehouses"),
+        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True, 
+            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            digits_compute=dp.get_precision('Product UoM')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),
         'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this production lot', readonly=True),
@@ -1463,9 +1465,9 @@ class stock_move(osv.osv):
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
-        'product_qty': fields.float('Quantity', required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
-        'product_uos_qty': fields.float('Quantity (UOS)'),
+        'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM')),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
@@ -2489,7 +2491,7 @@ class stock_inventory_line(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_qty': fields.float('Quantity'),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
         'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
@@ -2592,8 +2594,8 @@ class report_products_to_received_planned(osv.osv):
     _auto = False
     _columns = {
         'date':fields.date('Date'),
-        'qty': fields.integer('Actual Qty'),
-        'planned_qty': fields.integer('Planned Qty'),
+        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
+        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
 
     }
     def init(self, cr):
@@ -2626,8 +2628,8 @@ class report_delivery_products_planned(osv.osv):
     _auto = False
     _columns = {
         'date':fields.date('Date'),
-        'qty': fields.integer('Actual Qty'),
-        'planned_qty': fields.integer('Planned Qty'),
+        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
+        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
 
     }
 

From c3508d6f841c12903a68d5e42f023e4271ec1dea Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 11:38:29 +0530
Subject: [PATCH 069/138] [Fix] product: fix the factor digits

bzr revid: sbh@tinyerp.com-20100923060829-2c47ygg5iwyntjng
---
 addons/product/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 035ff1f0faa..0672f6f392d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -69,7 +69,7 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
-        'factor': fields.float('Ratio', digits_compute=dp.get_precision('Product UoM'), required=True,
+        'factor': fields.float('Ratio', required=True,digits=(12, 6),
             help='How many times this UoM is smaller than the reference UoM in this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
         'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),

From 71bc1eaa196cef336a58f595133662bebe18f8b2 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:07:18 +0530
Subject: [PATCH 070/138] [IMP] stock: float used use the correct decimal
 precision

bzr revid: sbh@tinyerp.com-20100923063718-s8dj60xcaplwwmry
---
 addons/stock/report/report_stock_move.py           | 11 ++++++-----
 addons/stock/report/report_stock_picking.py        |  5 +++--
 addons/stock/wizard/stock_change_standard_price.py |  3 ++-
 addons/stock/wizard/stock_splitinto.py             |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index f7aab3c1895..80ed559cb05 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -21,6 +21,7 @@
 
 import tools
 from osv import fields,osv
+import decimal_precision as dp
 
 
 class report_stock_move(osv.osv):
@@ -45,9 +46,9 @@ class report_stock_move(osv.osv):
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'day_diff2':fields.float('Delay (Days)',readonly=True, digits=(16,2), group_operator="avg"),
-        'day_diff1':fields.float('Planned (Days)',readonly=True, digits=(16,2), group_operator="avg"),
-        'day_diff':fields.float('Real (Days)',readonly=True, digits=(16,2), group_operator="avg"),
+        'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
     }
 
     def init(self, cr):
@@ -135,8 +136,8 @@ class report_stock_inventory(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_qty':fields.float('Quantity', digits=(16,2), readonly=True),
-        'value' : fields.float('Total Value', digits=(16,2), required=True),
+        'product_qty':fields.float('Quantity',  digits_compute=dp.get_precision('Product UoM'), readonly=True),
+        'value' : fields.float('Total Value',  digits_compute=dp.get_precision('Account'), required=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
index 81f20ed8906..82232c49f14 100644
--- a/addons/stock/report/report_stock_picking.py
+++ b/addons/stock/report/report_stock_picking.py
@@ -20,6 +20,7 @@
 ##############################################################################
 from osv import fields,osv
 import tools
+import decimal_precision as dp
 
 class report_stock_picking(osv.osv):
     _name = "report.stock.picking"
@@ -37,8 +38,8 @@ class report_stock_picking(osv.osv):
         'product_uos_qty': fields.float('# of Products', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'date': fields.date('Date', readonly=True),
-        'avg_days_late': fields.float('Avg Due Days', digits=(16,2), readonly=True, group_operator="avg"),
-        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits=(16,2), readonly=True, group_operator="avg",
+        'avg_days_late': fields.float('Avg Due Days',  digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg"),
+        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg",
                                        help="Number of  Avg Days to deliver"),
         'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 47fb5387f26..ecbaef57a36 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -21,12 +21,13 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class change_standard_price(osv.osv_memory):
     _name = "stock.change.standard.price"
     _description = "Change Standard Price"
     _columns = {
-        'new_price': fields.float('Price', required=True,
+        'new_price': fields.float('Price', required=True, digits_compute=dp.get_precision('Account'),
                                   help="If cost price is increased, stock variation account will be debited "
                                         "and stock output account will be credited with the value = (difference of amount * quantity available).\n"
                                         "If cost price is decreased, stock variation account will be creadited and stock input account will be debited."),
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 20b1940e1c7..a54e6a485c2 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -21,13 +21,13 @@
 
 from osv import fields, osv
 from tools.translate import _
-
+import decimal_precision as dp
 
 class stock_split_into(osv.osv_memory):
     _name = "stock.split.into"
     _description = "Split into"
     _columns = {
-        'quantity': fields.float('Quantity', digits=(16,2)),
+        'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UOM')),
     }
     _defaults = {
         'quantity': lambda *x: 0,

From ed99a00b562e40a13df0d5bb675f492feaa3e8ad Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:40:44 +0530
Subject: [PATCH 071/138] [IMP] stock:set  decimal precision on postgres report

bzr revid: sbh@tinyerp.com-20100923071044-qdi1a5xafb74bh69
---
 addons/stock/report/report_stock_move.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 80ed559cb05..1651607a922 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,8 +153,8 @@ create or replace view report_stock_inventory as (
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(-m.product_qty*u.factor)::decimal(16,2) as product_qty,
-        sum(-pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+        sum(-m.product_qty*u.factor)::decimal as product_qty,
+        sum(-pt.standard_price * m.product_qty * u.factor)::decimal as value
     from
         stock_move m
             left join stock_picking p on (m.picking_id=p.id)
@@ -172,8 +172,8 @@ create or replace view report_stock_inventory as (
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(m.product_qty*u.factor)::decimal(16,2) as product_qty,
-        sum(pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+        sum(m.product_qty*u.factor)::decimal as product_qty,
+        sum(pt.standard_price * m.product_qty * u.factor)::decimal as value
     from
         stock_move m
             left join stock_picking p on (m.picking_id=p.id)

From 73db799e6aff940df1f2052d912583a917e8a3fa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:52:17 +0530
Subject: [PATCH 072/138] [IMP] stock:Improve the tooltips of Inventory
 Analysis report

bzr revid: sbh@tinyerp.com-20100923072217-t2ekkabm2u8lm4jm
---
 addons/stock/report/report_stock_move_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index fe68dedd8a7..57eb5edee8e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -170,12 +170,12 @@
                         name="real"
                         icon="terp-dialog-close"
                         domain="[('state','=','done')]"
-                        help="Analysis on real stock (including only moves already processed)"/>
+                        help="Analysis of current inventory (only moves that have already been processed)"/>
 
                     <filter string="Future"
                         icon="terp-camera_test"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future operations (similar to virtual stock)"/>
+                        help = "Analysis including future moves (similar to virtual stock)"/>
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>

From ce4b6eb27c35121698c235e26758fae5f5a017ad Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 14:25:35 +0530
Subject: [PATCH 073/138] [IMP] stock:  Inventory Analysis report add the
 product_uom,improve  the search view

bzr revid: sbh@tinyerp.com-20100923085535-zl6lffmrnd8g0coy
---
 addons/stock/report/report_stock_move.py       |  9 +++++----
 addons/stock/report/report_stock_move_view.xml | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 1651607a922..b623c9c5738 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -133,6 +133,7 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_uom':fields.many2one('product.uom', 'Product UOM', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
@@ -150,7 +151,7 @@ create or replace view report_stock_inventory as (
     (select
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id, l.usage as location_type,
+        m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         sum(-m.product_qty*u.factor)::decimal as product_qty,
@@ -164,12 +165,12 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date, m.state, l.usage, m.company_id
+        m.date, m.state, l.usage, m.company_id,m.product_uom
 ) union all (
     select
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, l.usage as location_type,
+        m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         sum(m.product_qty*u.factor)::decimal as product_qty,
@@ -182,7 +183,7 @@ create or replace view report_stock_inventory as (
             left join product_uom u on (m.product_uom=u.id)
                 left join stock_location l on (m.location_dest_id=l.id)
     group by
-        m.id, m.product_id, m.address_id, m.location_id, m.location_dest_id,
+        m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 57eb5edee8e..0ee08503ea5 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -138,6 +138,7 @@
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="partner_id" invisible="1" context="{'contact_display':'partner'}"/>
+                <field name="product_uom" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
@@ -168,12 +169,12 @@
                 <group col="16">
                     <filter string="Real"
                         name="real"
-                        icon="terp-dialog-close"
+                        icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
 
                     <filter string="Future"
-                        icon="terp-camera_test"
+                        icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
 
@@ -181,20 +182,21 @@
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="date"/>
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
 
                 <newline/>
-                <group expand="1" string="Group By..." >
+                <group expand="0" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="group_company" string="Company" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
-                    <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -202,9 +204,11 @@
                 <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="product_uom" />
                     <field name="prodlot_id"/>
                     <field name="state"/>
                     <field name="location_type"/>
+                    <field name="date"/>
                 </group>
             </search>
         </field>

From 0632dff8687168253f22b75027137a6b0c822b66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 14:53:29 +0530
Subject: [PATCH 074/138] [IMP] stock:remove today and state filter and set
 context for full name of location in Move  Analysis report

bzr revid: sbh@tinyerp.com-20100923092329-vxdmflppf8w3fafz
---
 addons/stock/report/report_stock_move_view.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0ee08503ea5..f068fc36302 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -59,13 +59,7 @@
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
-                <filter icon="terp-go-today"
-                    string="Today"
-                    separator="1"
-                    domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                    help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
-
                 <filter string="Done"
                     name="done"
                     icon="terp-dialog-close"
@@ -94,7 +88,6 @@
                     <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
-                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
@@ -122,7 +115,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'full':'1','contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 

From 35c6b49aa76582bf4a0ca254b2746bdae418d790 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 15:22:58 +0530
Subject: [PATCH 075/138] [ADD] stock: Add product_qty in Move  Analysis report

bzr revid: sbh@tinyerp.com-20100923095258-kxxkeu9hxm3hqdor
---
 addons/stock/report/report_stock_move.py       | 7 +++++--
 addons/stock/report/report_stock_move_view.xml | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index b623c9c5738..6fd84093bfe 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -43,6 +43,7 @@ class report_stock_move(osv.osv):
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
+        'product_qty':fields.integer('Quantity',readonly=True),        
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
@@ -69,6 +70,7 @@ class report_stock_move(osv.osv):
                         al.picking_id as picking_id,
                         al.company_id as company_id,
                         al.location_dest_id as location_dest_id,
+                        al.product_qty,
                         al.out_qty as product_qty_out,
                         al.in_qty as product_qty_in,
                         al.address_id as partner_id,
@@ -92,6 +94,7 @@ class report_stock_move(osv.osv):
                         avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
+                        sum(sm.product_qty) as product_qty ,
                         pt.standard_price * sum(sm.product_qty) as value,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
@@ -110,7 +113,7 @@ class report_stock_move(osv.osv):
                     group by
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
-                        sm.product_id,pt.standard_price, sm.picking_id,
+                        sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
                     as al
 
@@ -118,7 +121,7 @@ class report_stock_move(osv.osv):
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type
+                        al.picking_id,al.company_id,al.type,al.product_qty
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index f068fc36302..a91e05ea5a9 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -25,6 +25,7 @@
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="state" invisible="1"/>
+                <field name="product_qty"/>
                 <field name="product_qty_in"/>
                 <field name="product_qty_out"/>
                 <field name="value"/>

From 85f90718ab639aa6491fd6482c91cc52c96a9831 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 18:56:52 +0530
Subject: [PATCH 076/138] [IMP] stock: Add the product category and set default
 view in Moves Analysis report

bzr revid: sbh@tinyerp.com-20100923132652-5pz6omk70jwh61p5
---
 addons/stock/report/report_stock_move.py       | 12 ++++++++----
 addons/stock/report/report_stock_move_view.xml |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 6fd84093bfe..40090df1210 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -43,7 +43,8 @@ class report_stock_move(osv.osv):
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
-        'product_qty':fields.integer('Quantity',readonly=True),        
+        'product_qty':fields.integer('Quantity',readonly=True),
+        'categ_id': fields.many2one('product.category', 'Product Category', ),                
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
@@ -77,6 +78,7 @@ class report_stock_move(osv.osv):
                         al.product_id as product_id,
                         al.state as state ,
                         al.product_uom as product_uom,
+                        al.categ_id as categ_id,
                         al.type as type
                     FROM (SELECT
 
@@ -95,7 +97,8 @@ class report_stock_move(osv.osv):
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
                         sum(sm.product_qty) as product_qty ,
-                        pt.standard_price * sum(sm.product_qty) as value,
+                        (pt.standard_price *pu.factor* sum(sm.product_qty)) as value,
+                        pt.categ_id as categ_id ,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
                         sm.picking_id as picking_id,
@@ -107,6 +110,7 @@ class report_stock_move(osv.osv):
                         stock_move sm
                         left join stock_picking sp on (sm.picking_id=sp.id)
                         left join product_product pp on (sm.product_id=pp.id)
+                        left join product_uom pu on (sm.product_uom=pu.id)
                         left join product_template pt on (pp.product_tmpl_id=pt.id)
                         left join stock_location sl on (sm.location_id = sl.id)
 
@@ -114,14 +118,14 @@ class report_stock_move(osv.osv):
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
-                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
+                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id)
                     as al
 
                     group by
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type,al.product_qty
+                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a91e05ea5a9..e9972f19f5f 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -24,6 +24,7 @@
                 <field name="location_id" invisible="1"/>
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="product_qty"/>
                 <field name="product_qty_in"/>
@@ -83,6 +84,8 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_categ_id" string="Product Category" icon="terp-personal" context="{'group_by':'categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
@@ -100,6 +103,7 @@
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="location_id" widget = "selection"/>
                     <field name="location_dest_id"  widget = "selection"/>
+                    <field name="categ_id"/>
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
@@ -116,7 +120,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'full':'1','contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'search_default_group_categ_id':1,'group_by':[], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 

From e95c30c25f927b05d406fa34e633027170cf3b84 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 19:15:02 +0530
Subject: [PATCH 077/138] [IMP] stock: Add stock jounral and set icon and field
 in move analysis

bzr revid: sbh@tinyerp.com-20100923134502-zr473jgu0akix25i
---
 addons/stock/report/report_stock_move.py       | 11 +++++++----
 addons/stock/report/report_stock_move_view.xml | 15 +++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 40090df1210..5d16136bfe8 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -51,6 +51,7 @@ class report_stock_move(osv.osv):
         'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
         'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
         'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),        
     }
 
     def init(self, cr):
@@ -79,7 +80,8 @@ class report_stock_move(osv.osv):
                         al.state as state ,
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
-                        al.type as type
+                        al.type as type,
+                        al.stock_journal as stock_journal
                     FROM (SELECT
 
                         CASE WHEN sp.type in ('out','delivery') THEN
@@ -105,7 +107,8 @@ class report_stock_move(osv.osv):
                             sm.company_id as company_id,
                             sm.state as state,
                             sm.product_uom as product_uom,
-                            sp.type as type
+                            sp.type as type,
+                            sp.stock_journal_id as stock_journal
                     from
                         stock_move sm
                         left join stock_picking sp on (sm.picking_id=sp.id)
@@ -118,14 +121,14 @@ class report_stock_move(osv.osv):
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
-                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id)
+                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
                     as al
 
                     group by
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id
+                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id, al.stock_journal
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e9972f19f5f..b829bccab12 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -25,6 +25,7 @@
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
+                <field name="stock_journal" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="product_qty"/>
                 <field name="product_qty_in"/>
@@ -64,11 +65,11 @@
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
-                    icon="terp-dialog-close"
+                    icon="terp-check"
                     domain="[('state','=','done')]"
                     help = "Completed Stock-Moves"/>
                 <filter string="Todo"
-                    icon="terp-camera_test"
+                    icon="terp-stock"
                     domain="[('state','in',('assigned','waiting','confirmed'))]"
                     help = "Future Stock-Moves"/>
 
@@ -85,11 +86,12 @@
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_categ_id" string="Product Category" icon="terp-personal" context="{'group_by':'categ_id'}"/>
+                    <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
+					<filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>                    
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
                     <separator orientation="vertical"/>
@@ -101,11 +103,12 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="location_id" widget = "selection"/>
-                    <field name="location_dest_id"  widget = "selection"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
                     <field name="categ_id"/>
+                    <field name="stock_journal"/>
                     <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget = "selection"/>
                     <newline/>
                     <field name="date"/>
                 </group>

From 4ca6d1b3d946870c4785e656d8ad734a719c902b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 19:21:43 +0530
Subject: [PATCH 078/138] [IMP] stock: sum in move Analysis report

bzr revid: sbh@tinyerp.com-20100923135143-bygzuzeprxaeh2at
---
 addons/stock/report/report_stock_move_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index b829bccab12..253833b2757 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -27,10 +27,10 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="stock_journal" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="product_qty"/>
-                <field name="product_qty_in"/>
-                <field name="product_qty_out"/>
-                <field name="value"/>
+                <field name="product_qty" sum="Total quantity"/>
+                <field name="product_qty_in" sum="Total incoming quantity" />
+                <field name="product_qty_out" sum="Total outgoing quantity"/>
+                <field name="value"  sum="Total value"/>
                 <field name="day_diff"/>
                 <field name="day_diff1"/>
                 <field name="day_diff2"/>

From a1863560b1dca132ed861241a2f45a5174f71d04 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 13:41:53 +0530
Subject: [PATCH 079/138] [ADD] stock: Add the filter on last month in Moves
 Analysis report

bzr revid: sbh@tinyerp.com-20100924081153-eahxyf9hpsptclsb
---
 addons/stock/report/report_stock_move_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 253833b2757..4871515fbe4 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -57,6 +57,11 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
+			<filter icon="terp-go-month"
+                 string="Last Month"
+                 separator="1"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Last month"/>                        
                 <filter icon="terp-go-month"
                     name="month"
                     string="This Month"

From 2b835bccc61d4b91f6892f6dd1d71cbd7bb1d170 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 16:35:56 +0530
Subject: [PATCH 080/138] [REM] stock : Remove the stock_picking report

bzr revid: sbh@tinyerp.com-20100924110556-bgnci35flqhd6t57
---
 addons/stock/__openerp__.py                   |   1 -
 addons/stock/report/__init__.py               |   1 -
 addons/stock/report/report_stock_picking.py   | 114 --------------
 .../report/report_stock_picking_view.xml      | 139 ------------------
 4 files changed, 255 deletions(-)
 delete mode 100644 addons/stock/report/report_stock_picking.py
 delete mode 100644 addons/stock/report/report_stock_picking_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index ba9019eafb6..7a20abe2fb0 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -67,7 +67,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_view.xml",
         "partner_view.xml",
         "report/report_stock_move_view.xml",
-        "report/report_stock_picking_view.xml",
         "report/report_stock_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 63d02ca2717..f41665342d0 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -25,7 +25,6 @@ import ups
 import picking
 import lot_overview_all
 import report_stock
-import report_stock_picking
 import report_stock_move
 import stock_inventory_move_report
 import lot_overview
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
deleted file mode 100644
index 82232c49f14..00000000000
--- a/addons/stock/report/report_stock_picking.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields,osv
-import tools
-import decimal_precision as dp
-
-class report_stock_picking(osv.osv):
-    _name = "report.stock.picking"
-    _description = "Stock Picking Report"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'nbr': fields.integer('# of Lines', readonly=True),
-        'nbp': fields.integer('# of Picking', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
-        'product_qty': fields.float('# of Products', readonly=True),
-        'product_uos_qty': fields.float('# of Products', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'avg_days_late': fields.float('Avg Due Days',  digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg"),
-        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg",
-                                       help="Number of  Avg Days to deliver"),
-        'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'invoice_state': fields.selection([
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not from Picking")], "Invoice Status",readonly=True),
-        'min_date': fields.date('Expected Date',help="Expected date for Picking. Default it takes current date"),
-        'order_date': fields.date('Order Date', help="Date of Order"),
-        'date_done': fields.date('Date Done', help="Date of completion"),
-        'location_id': fields.many2one('stock.location', 'Source Location', help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', help="Location where the system will stock the finished products."),
-        'max_date': fields.date('Max.Expected Date'),
-        'product_uos': fields.many2one('product.uom', 'Product UOS'),
-        'product_uom': fields.many2one('product.uom', 'Product UOM'),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_stock_picking')
-        cr.execute("""
-            create or replace view report_stock_picking as (
-                select
-                    min(sm.id) as id,
-                    date_trunc('day',sp.min_date) as min_date,
-                    date_trunc('day',sp.date) as order_date,
-                    date_trunc('day',sp.date_done) as date_done,
-                    date_trunc('day',sp.max_date) as max_date,
-                    to_char(sp.create_date, 'YYYY') as year,
-                    to_char(sp.create_date, 'MM') as month,
-                    to_char(sp.create_date, 'YYYY-MM-DD') as day,
-                    sp.address_id as partner_id,
-                    to_date(to_char(sp.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
-                    count(sm.id) as nbr,
-                    count(sp.id) as nbp,
-                    sum(sm.product_qty*u.factor) as product_qty,
-                    sum(sm.product_uos_qty) as product_uos_qty,
-                    sm.product_id as product_id,
-                    sm.location_dest_id as location_dest_id,
-                    sm.location_id as location_id,
-                    sp.type,
-                    sm.product_uos,
-                    sm.product_uom,
-                    sp.invoice_state,
-                    sp.company_id as company_id,
-                    avg(extract('epoch' from (sp.date_done-sp.create_date)))/(3600*24) as  avg_days_to_deliver,
-                    avg(extract('epoch' from (sp.date_done-sp.min_date)))/(3600*24) as  avg_days_late,
-                    sp.state
-                from stock_picking as sp
-                Inner join stock_move as sm ON (sm.picking_id=sp.id)
-                Inner join product_uom u on (u.id=sm.product_uom)
-                group by sp.type,
-                         sp.create_date,
-                         sp.address_id,
-                         sm.product_id,
-                         to_char(sp.create_date, 'YYYY'),
-                         sm.location_dest_id,
-                         sm.location_id,
-                         to_char(sp.create_date, 'MM'),
-                         to_char(sp.create_date, 'YYYY-MM-DD'),
-                         sm.product_uos,
-                         sm.product_uom,
-                         date_trunc('day',sp.min_date),
-                         date_trunc('day',sp.date),
-                         date_trunc('day',sp.date_done),
-                         date_trunc('day',sp.max_date),
-                         sp.invoice_state,
-                         sp.company_id,
-                         sp.state
-
-            )""")
-report_stock_picking()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
deleted file mode 100644
index 13cdd624cf2..00000000000
--- a/addons/stock/report/report_stock_picking_view.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-	<!--
-	Stock Picking Report
-	-->
-
-        <record id="view_report_report_stock_picking_tree" model="ir.ui.view">
-            <field name="name">report.stock.picking.tree</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree string="Picking">
-               		<field name="year" invisible="1"/>
-               		<field name="month" invisible="1"/>
-               		<field name="day" invisible="1"/>
-               		<field name="date" invisible="1"/>
-					<field name="company_id" invisible="1"/>
-					<field name="partner_id" invisible="1"/>
-					<field name="product_id" invisible="1"/>
-					<field name="min_date" invisible="1"/>
-					<field name="order_date" invisible="1"/>
-					<field name="date_done" invisible="1"/>
-					<field name="max_date" invisible="1"/>
-					<field name="type" invisible="1"/>
-					<field name="invoice_state" invisible="1"/>
-					<field name="state" invisible="1"/>
-					<field name="nbr" sum="# of Lines" />
-					<field name="product_qty" sum="# of Products" />
-          <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
-          <field name="avg_days_late" avg='Avg Due Days'/>
-				</tree>
-            </field>
-        </record>
-
-        <record id="view_report_report_stock_picking_graph" model="ir.ui.view">
-            <field name="name">report.stock.picking.graph</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Picking" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field name="product_qty" operator="+"/>
-                    <field name="nbp" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-		<record id="view_report_report_stock_picking_filter" model="ir.ui.view">
-            <field name="name">report.stock.picking.select</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="6">
-                   		<filter icon="terp-go-year" string="  365 Days  "
-	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="terp-go-month" string="   30 Days   "
-	                			name="month"
-	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                			help="Picking in last 30 days"/>
-	                	<filter icon="terp-go-week"
-                                string="    7 Days    "
-                                separator="1"
-                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                                help="Picking during last 7 days"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
-                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Shipping Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
-                    </group>
-                    <newline/>
-                	<group expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="product_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="type"/>
-	                    <field name="invoice_state"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                    <newline/>
-	                    <field name="order_date"/>
-	                    <field name="date_done"/>
-                      <field name="min_date"/>
-                      <field name="max_date"/>
-                	</group>
-
-               </search>
-            </field>
-        </record>
-        <record id="action_report_report_stock_picking" model="ir.actions.act_window">
-            <field name="name">Picking</field>
-            <field name="res_model">report.stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-            <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
-            <field name="context">{'search_default_Partner':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-        </record>
-
-       	<record model="ir.actions.act_window.view" id="action_report_report_stock_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_report_stock_picking_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_graph"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <menuitem name="Picking" action="action_report_report_stock_picking" 
-                id="menu_report_report_stock_pickings_tree" parent="stock.next_id_61" sequence="5"/>
-
-  </data>
-</openerp>
-

From f7ecd09dc975186abfedee3c412e6175e35ed2e1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 17:01:34 +0530
Subject: [PATCH 081/138] [Fix] stock: location report print the complete_name
 of location

bzr revid: sbh@tinyerp.com-20100924113134-791f76xauu0bh6yh
---
 addons/stock/report/lot_overview.py     | 3 ++-
 addons/stock/report/lot_overview_all.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index a96bdf38099..66230e2822c 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -37,7 +37,8 @@ class lot_overview(report_sxw.rml_parse):
     def process(self,location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
+         
+        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
         self.price_total = 0.0
         self.price_total += data['total_price']
         self.grand_total += data['total_price']
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index c523b9775d1..0b4edcaecf4 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -37,7 +37,7 @@ class lot_overview_all(report_sxw.rml_parse):
     def process(self,location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_all_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
+        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
         self.price_total = 0.0
         self.price_total += data['total_price']
         self.grand_total += data['total_price']

From a6bfefbf820d647a65703069709aaee3aa090cfb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Sep 2010 16:06:23 +0200
Subject: [PATCH 082/138] [IMP] stock: add shipping type "Others" for moves
 with no picking in Stock Analysis

bzr revid: odo@openerp.com-20100924140623-3ylclf95psz0lpga
---
 addons/stock/report/report_stock_move.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 5d16136bfe8..a137b8a380e 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -39,7 +39,7 @@ class report_stock_move(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
@@ -80,7 +80,7 @@ class report_stock_move(osv.osv):
                         al.state as state ,
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
-                        al.type as type,
+                        coalesce(al.type, 'other') as type,
                         al.stock_journal as stock_journal
                     FROM (SELECT
 

From 18f5d88a8b9a20009339a2414f917650294aadb1 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 27 Sep 2010 15:10:52 +0530
Subject: [PATCH 083/138] [FIX] stock: Removed access rules for deleted object.

bzr revid: uco@tinyerp.com-20100927094052-e47uj31luw669gux
---
 addons/stock/security/ir.model.access.csv | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a120ce0c571..285eebccde5 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -40,9 +40,6 @@
 "access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
 "access_report_stock_inventory_system","report.stock.inventory system","model_report_stock_inventory","base.group_system",1,0,0,0
-"access_report_stock_picking_user","report.stock.picking user","model_report_stock_picking","stock.group_stock_user",1,1,1,1
-"access_report_stock_picking_manager","report.stock.picking manager","model_report_stock_picking","stock.group_stock_manager",1,1,1,1
-"access_report_stock_picking_system","report.stock.picking system","model_report_stock_picking","base.group_system",1,0,0,0
 "access_stock_warehouse_system","stock.warehouse.system","model_stock_warehouse","base.group_system",1,1,1,1
 "access_stock_location_system","stock.location.system","model_stock_location","base.group_system",1,1,1,1
 "access_stock_journal_system","stock.journal.system","model_stock_journal","base.group_system",1,1,1,1

From edd52b6a0a5e09d15a62fecefbdff6de47e819d4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 13:19:47 +0200
Subject: [PATCH 084/138] [IMP] decimal_precision: add explicit index(select)
 on precision name (even though there was already one due to the unique
 constraint)

bzr revid: odo@openerp.com-20100928111947-2ssoruldvg7vx4gu
---
 addons/decimal_precision/decimal_precision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d67fba67d0c..7d7dadd13de 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -27,7 +27,7 @@ import pooler
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
     _columns = {
-        'name': fields.char('Usage', size=50, required=True),
+        'name': fields.char('Usage', size=50, select=True, required=True),
         'digits': fields.integer('Digits', required=True),
     }
     _defaults = {

From 70911f1e6859e4f03d8351e60e310cc25e5794f9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 13:23:47 +0200
Subject: [PATCH 085/138] [FIX+IMP] stock: corrected moves and inventory
 analysis computation + improved views + decimal_precision for shipping delays

bzr revid: odo@openerp.com-20100928112347-6h0u53ujl0fevth8
---
 addons/stock/report/report_stock_move.py      | 102 ++++++++++--------
 .../stock/report/report_stock_move_view.xml   |   8 +-
 addons/stock/stock_data.xml                   |   8 +-
 3 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index a137b8a380e..3aad21f4f9c 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -44,23 +44,22 @@ class report_stock_move(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
         'product_qty':fields.integer('Quantity',readonly=True),
-        'categ_id': fields.many2one('product.category', 'Product Category', ),                
+        'categ_id': fields.many2one('product.category', 'Product Category', ),
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),        
+        'day_diff2':fields.float('Lag (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'day_diff1':fields.float('Planned Lead Time (Days)',readonly=True, digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'day_diff':fields.float('Execution Lead Time (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),
     }
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_move')
         cr.execute("""
-            create or replace view report_stock_move as (
-                select
+            CREATE OR REPLACE view report_stock_move AS (
+                SELECT
                         min(sm_id) as id,
-                        sum(value) as value,
                         al.dp as date,
                         al.curr_year as year,
                         al.curr_month as month,
@@ -81,13 +80,25 @@ class report_stock_move(osv.osv):
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
                         coalesce(al.type, 'other') as type,
-                        al.stock_journal as stock_journal
+                        al.stock_journal as stock_journal,
+                        sum(al.in_value - al.out_value) as value
                     FROM (SELECT
-
                         CASE WHEN sp.type in ('out','delivery') THEN
-                            sum(sm.product_qty) END AS out_qty,
+                            sum(sm.product_qty * pu.factor)
+                            ELSE 0.0
+                            END AS out_qty,
                         CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty)  END AS in_qty,
+                            sum(sm.product_qty * pu.factor)
+                            ELSE 0.0
+                            END AS in_qty,
+                        CASE WHEN sp.type in ('out','delivery') THEN
+                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            ELSE 0.0
+                            END AS out_value,
+                        CASE WHEN sp.type in ('in') THEN
+                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            ELSE 0.0
+                            END AS in_value,
                         min(sm.id) as sm_id,
                         sm.date as dp,
                         to_char(date_trunc('day',sm.date), 'YYYY') as curr_year,
@@ -98,8 +109,7 @@ class report_stock_move(osv.osv):
                         avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
-                        sum(sm.product_qty) as product_qty ,
-                        (pt.standard_price *pu.factor* sum(sm.product_qty)) as value,
+                        sum(sm.product_qty) as product_qty,
                         pt.categ_id as categ_id ,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
@@ -108,23 +118,23 @@ class report_stock_move(osv.osv):
                             sm.state as state,
                             sm.product_uom as product_uom,
                             sp.type as type,
-                            sp.stock_journal_id as stock_journal
-                    from
+                            sp.stock_journal_id AS stock_journal
+                    FROM
                         stock_move sm
-                        left join stock_picking sp on (sm.picking_id=sp.id)
-                        left join product_product pp on (sm.product_id=pp.id)
-                        left join product_uom pu on (sm.product_uom=pu.id)
-                        left join product_template pt on (pp.product_tmpl_id=pt.id)
-                        left join stock_location sl on (sm.location_id = sl.id)
+                        LEFT JOIN stock_picking sp ON (sm.picking_id=sp.id)
+                        LEFT JOIN product_product pp ON (sm.product_id=pp.id)
+                        LEFT JOIN product_uom pu ON (sm.product_uom=pu.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN stock_location sl ON (sm.location_id = sl.id)
 
-                    group by
+                    GROUP BY
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
-                    as al
+                    AS al
 
-                    group by
+                    GROUP BY
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
@@ -157,42 +167,42 @@ class report_stock_inventory(osv.osv):
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_inventory')
         cr.execute("""
-create or replace view report_stock_inventory as (
-    (select
+CREATE OR REPLACE view report_stock_inventory AS (
+    (SELECT
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(-m.product_qty*u.factor)::decimal as product_qty,
-        sum(-pt.standard_price * m.product_qty * u.factor)::decimal as value
-    from
+        coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
+        coalesce(sum(-pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+    FROM
         stock_move m
-            left join stock_picking p on (m.picking_id=p.id)
-                left join product_product pp on (m.product_id=pp.id)
-                    left join product_template pt on (pp.product_tmpl_id=pt.id)
-            left join product_uom u on (m.product_uom=u.id)
-                left join stock_location l on (m.location_id=l.id)
-    group by
+            LEFT JOIN stock_picking p ON (m.picking_id=p.id)
+                LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_uom u ON (m.product_uom=u.id)
+                LEFT JOIN stock_location l ON (m.location_id=l.id)
+    GROUP BY
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
         m.date, m.state, l.usage, m.company_id,m.product_uom
-) union all (
-    select
+) UNION ALL (
+    SELECT
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(m.product_qty*u.factor)::decimal as product_qty,
-        sum(pt.standard_price * m.product_qty * u.factor)::decimal as value
-    from
+        coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
+        coalesce(sum(pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+    FROM
         stock_move m
-            left join stock_picking p on (m.picking_id=p.id)
-                left join product_product pp on (m.product_id=pp.id)
-                    left join product_template pt on (pp.product_tmpl_id=pt.id)
-            left join product_uom u on (m.product_uom=u.id)
-                left join stock_location l on (m.location_dest_id=l.id)
-    group by
+            LEFT JOIN stock_picking p ON (m.picking_id=p.id)
+                LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_uom u ON (m.product_uom=u.id)
+                LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
+    GROUP BY
         m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 7115048a411..0ee03fed220 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -31,8 +31,8 @@
                 <field name="product_qty_in" sum="Total incoming quantity" />
                 <field name="product_qty_out" sum="Total outgoing quantity"/>
                 <field name="value"  sum="Total value"/>
-                <field name="day_diff"/>
                 <field name="day_diff1"/>
+                <field name="day_diff"/>
                 <field name="day_diff2"/>
            </tree>
         </field>
@@ -141,7 +141,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'search_default_group_categ_id':1,'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
@@ -215,7 +215,7 @@
                     <field name="date"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." >
+                <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
@@ -238,7 +238,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  eval="False"/>
-        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
     <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 6933db289a0..b9aaff33e72 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -114,7 +114,13 @@
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_production')]"/>
             <field eval="'stock.location,'+str(location_production)" name="value"/>
         </record>
-        
+
+
+        <record forcecreate="True" id="decimal_shipping_delay" model="decimal.precision">
+            <field name="name">Shipping Delay</field>
+            <field name="digits" eval="2"/>
+        </record>
+
         <!--
     Resource: stock.warehouse
     -->

From fc2d8254e0bd1cad4bfda6bac2a259fe42e39497 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:29:04 +0200
Subject: [PATCH 086/138] [IMP] stock: finish renaming of
 stock.move.date_planned to stock.move.date

bzr revid: odo@openerp.com-20100928122904-refdktl1p0ks6qpc
---
 addons/stock/report/report_stock_move_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0ee03fed220..440c3548c91 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -58,16 +58,16 @@
             <search string="Moves Analysis">
                 <group>
                 <filter icon="terp-go-year" string="  Year  "
-                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-01-01'))]"
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Current year"/>
                 <filter icon="terp-go-month" string="   Month   "
                 name="month"
-                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                 help="Current month"/>
                 <filter icon="terp-go-month"
                  string="    Month-1    "
                  separator="1"
-                 domain="[('date_planned','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_planned','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>                    
                 <separator orientation="vertical"/>
                 <filter string="Done"
@@ -96,7 +96,7 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -117,7 +117,7 @@
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}" help="Month Planned"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
                 </group>
                 <newline/>

From 21fa7436db78dbeaf068f40468fbd84b2af28c69 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:29:49 +0200
Subject: [PATCH 087/138] [IMP] stock: code/labels cleanup

bzr revid: odo@openerp.com-20100928122949-hpbm9di13qmpvhhn
---
 addons/stock/stock.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bba58b1c77c..d1007375385 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1459,8 +1459,8 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date ', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
-        'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
+        'date': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done.", readonly=True),
+        'date_expected': fields.datetime('Date Expected', required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
@@ -1547,9 +1547,9 @@ class stock_move(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         if uid != 1:
+            frozen_fields = set(['product_qty', 'product_uom', 'product_uos_qty', 'product_uos', 'location_id', 'location_dest_id', 'product_id'])
             for move in self.browse(cr, uid, ids):
                 if move.state == 'done':
-                    frozen_fields = set(['product_qty', 'product_uom', 'product_uos_qty', 'product_uos', 'location_id', 'location_dest_id', 'product_id'])
                     if frozen_fields.intersection(vals):
                         raise osv.except_osv(_('Operation forbidden'),
                                              _('Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)'))
@@ -2305,8 +2305,7 @@ class stock_move(osv.osv):
                 user = users_obj.browse(cr, uid, uid)
                 context['currency_id'] = move.company_id.currency_id.id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                pricetype = 'standard_price'
-                if pricetype and qty > 0:
+                if qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
                             user.company_id.currency_id.id, product_price)
                     new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
@@ -2315,11 +2314,11 @@ class stock_move(osv.osv):
                         new_std_price = new_price
                     else:
                         # Get the standard price
-                        amount_unit = product.price_get(pricetype, context)[product.id]
+                        amount_unit = product.price_get('standard_price', context)[product.id]
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    product_obj.write(cr, uid, [product.id],{pricetype: new_std_price})
+                    product_obj.write(cr, uid, [product.id],{'standard_price': new_std_price})
 
                     # Record the values that were chosen in the wizard, so they can be
                     # used for inventory valuation if real-time valuation is enabled.

From cbbcc2f5935519f31c2d323da85f68034ba277f0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:38:42 +0200
Subject: [PATCH 088/138] [IMP] stock: make groups in picking search views more
 consistent + add journal

bzr revid: odo@openerp.com-20100928123842-bd2l7udwu9ylckz8
---
 addons/stock/stock_view.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f4f1b92e560..13e0ea66d90 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -788,8 +788,12 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -974,8 +978,12 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1190,9 +1198,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1402,6 +1414,8 @@
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1455,9 +1469,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>

From 9f6c10ca2a1258aae7d418c26f5083177e38b1a6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:28:30 +0200
Subject: [PATCH 089/138] [FIX] stock: correct assignation of production lots
 during partial processing + cleanup + correct date read-only status

bzr revid: odo@openerp.com-20100928152830-qvlgv4o470xp1gjl
---
 addons/stock/stock.py | 118 ++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d1007375385..dbf55768b3e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -642,7 +642,7 @@ class stock_picking(osv.osv):
                  "* Done: has been processed, can't be modified or cancelled anymore\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed. Will be set to date of actual processing if not specified."),
+                 method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed"),
         'date': fields.datetime('Order Date', help="Date of Order", select=True),
         'date_done': fields.datetime('Date Done', help="Date of Completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
@@ -1116,6 +1116,8 @@ class stock_picking(osv.osv):
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
+        import pdb
+        #pdb.set_trace()
         if context is None:
             context = {}
         else:
@@ -1124,7 +1126,6 @@ class stock_picking(osv.osv):
         move_obj = self.pool.get('stock.move')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
-        users_obj = self.pool.get('res.users')
         uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         sequence_obj = self.pool.get('ir.sequence')
@@ -1137,6 +1138,7 @@ class stock_picking(osv.osv):
             new_moves = []
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
+            prodlot_ids = {}
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
@@ -1147,7 +1149,8 @@ class stock_picking(osv.osv):
                 product_uom = partial_data.get('product_uom',False)
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
-                prodlot_id = partial_data.get('prodlot_id',False)
+                prodlot_id = partial_data.get('prodlot_id')
+                prodlot_ids[move.id] = prodlot_id
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1156,17 +1159,12 @@ class stock_picking(osv.osv):
                     too_many.append(move)
 
                 # Average price computation
-                # FIXME: we should not use the company of the user to determine the currency of the 
-                # product valuation field, we should use the company to which the destination location
-                # belongs! 
                 if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
                     product = product_obj.browse(cr, uid, move.product_id.id)
-                    user = users_obj.browse(cr, uid, uid)
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                    pricetype ='standard_price'
-                    if pricetype and qty > 0:
+                    if qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
                         new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
@@ -1175,12 +1173,12 @@ class stock_picking(osv.osv):
                             new_std_price = new_price
                         else:
                             # Get the standard price
-                            amount_unit = product.price_get(pricetype, context)[product.id]
+                            amount_unit = product.price_get('standard_price', context)[product.id]
                             new_std_price = ((amount_unit * product.qty_available)\
                                 + (new_price * qty))/(product.qty_available + qty)
 
                         # Write the field according to price type field
-                        product_obj.write(cr, uid, [product.id], {pricetype.field: new_std_price})
+                        product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
 
                         # Record the values that were chosen in the wizard, so they can be
                         # used for inventory valuation if real-time valuation is enabled.
@@ -1191,8 +1189,8 @@ class stock_picking(osv.osv):
 
             for move in too_few:
                 product_qty = move_product_qty[move.id]
-                if not new_picking:
 
+                if not new_picking:
                     new_picking = self.copy(cr, uid, pick.id,
                             {
                                 'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
@@ -1200,48 +1198,48 @@ class stock_picking(osv.osv):
                                 'state':'draft',
                             })
                 if product_qty != 0:
-
-                    new_obj = move_obj.copy(cr, uid, move.id,
-                        {
+                    defaults = {
                             'product_qty' : product_qty,
                             'product_uos_qty': product_qty, #TODO: put correct uos_qty
                             'picking_id' : new_picking,
                             'state': 'assigned',
                             'move_dest_id': False,
                             'price_unit': move.price_unit,
-                        })
+                    }
+                    prodlot_id = prodlot_ids[move.id]
+                    if prodlot_id:
+                        defaults.update(prodlot_id=prodlot_id)
+                    new_obj = move_obj.copy(cr, uid, move.id, defaults)
 
                 move_obj.write(cr, uid, [move.id],
                         {
                             'product_qty' : move.product_qty - product_qty,
                             'product_uos_qty':move.product_qty - product_qty, #TODO: put correct uos_qty
-
                         })
 
             if new_picking:
                 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-                for move in too_many:
-                    product_qty = move_product_qty[move.id]
-                    move_obj.write(cr, uid, [move.id],
-                            {
-                                'product_qty' : product_qty,
-                                'product_uos_qty': product_qty, #TODO: put correct uos_qty
-                                'picking_id': new_picking,
-                            })
-            else:
-                for move in too_many:
-                    product_qty = move_product_qty[move.id]
-                    move_obj.write(cr, uid, [move.id],
-                            {
-                                'product_qty': product_qty,
-                                'product_uos_qty': product_qty #TODO: put correct uos_qty
-                            })
+                for move in complete:
+                    if prodlot_ids.get(move.id):
+                        move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
+            for move in too_many:
+                product_qty = move_product_qty[move.id]
+                defaults = {
+                    'product_qty' : product_qty,
+                    'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                }
+                prodlot_id = prodlot_ids.get(move.id)
+                if prodlot_ids.get(move.id):
+                    defaults.update(prodlot_id=prodlot_id)
+                if new_picking:
+                    defaults.update(picking_id=new_picking)
+                move_obj.write(cr, uid, [move.id], defaults)
+
 
             # At first we confirm the new picking (if necessary)
             if new_picking:
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-            # Then we finish the good picking
-            if new_picking:
+                # Then we finish the good picking
                 self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
                 self.action_move(cr, uid, [new_picking])
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
@@ -1459,8 +1457,8 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done.", readonly=True),
-        'date_expected': fields.datetime('Date Expected', required=True, help="Scheduled date for the movement of the products"),
+        'date': fields.datetime('Date', required=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
+        'date_expected': fields.datetime('Scheduled Date', required=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
@@ -2259,11 +2257,12 @@ class stock_move(osv.osv):
                           like partner_id, address_id, delivery_date, delivery
                           moves with product_id, product_qty, uom
         """
+        import pdb
+        #pdb.set_trace()
         res = {}
         picking_obj = self.pool.get('stock.picking')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
-        users_obj = self.pool.get('res.users')
         uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         sequence_obj = self.pool.get('ir.sequence')
@@ -2278,6 +2277,7 @@ class stock_move(osv.osv):
 
         complete, too_many, too_few = [], [], []
         move_product_qty = {}
+        prodlot_ids = {}
         for move in self.browse(cr, uid, ids, context=context):
             if move.state in ('done', 'cancel'):
                 continue
@@ -2288,7 +2288,7 @@ class stock_move(osv.osv):
             product_uom = partial_data.get('product_uom',False)
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
-            prodlot_id = partial_data.get('prodlot_id',False)
+            prodlot_ids[move.id] = partial_data.get('prodlot_id')
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -2297,17 +2297,14 @@ class stock_move(osv.osv):
                 too_many.append(move)
 
             # Average price computation
-            # FIXME: we should not use the company of the user to determine the currency of the 
-            # product valuation field, we should use the company to which the destination location
-            # belongs! 
             if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                 product = product_obj.browse(cr, uid, move.product_id.id)
-                user = users_obj.browse(cr, uid, uid)
-                context['currency_id'] = move.company_id.currency_id.id
+                move_currency_id = move.company_id.currency_id.id
+                context['currency_id'] = move_currency_id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
                 if qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
-                            user.company_id.currency_id.id, product_price)
+                            move_currency_id, product_price)
                     new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
                             product.uom_id.id)
                     if product.qty_available <= 0:
@@ -2330,15 +2327,18 @@ class stock_move(osv.osv):
         for move in too_few:
             product_qty = move_product_qty[move.id]
             if product_qty != 0:
-                new_move = self.copy(cr, uid, move.id,
-                    {
-                        'product_qty' : product_qty,
-                        'product_uos_qty': product_qty,
-                        'picking_id' : move.picking_id.id,
-                        'state': 'assigned',
-                        'move_dest_id': False,
-                        'price_unit': move.price_unit,
-                    })
+                defaults = {
+                            'product_qty' : product_qty,
+                            'product_uos_qty': product_qty,
+                            'picking_id' : move.picking_id.id,
+                            'state': 'assigned',
+                            'move_dest_id': False,
+                            'price_unit': move.price_unit,
+                            }
+                prodlot_id = prodlot_ids[move.id]
+                if prodlot_id:
+                    defaults.update(prodlot_id=prodlot_id)
+                new_move = self.copy(cr, uid, move.id, defaults)
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
                     {
@@ -2356,8 +2356,8 @@ class stock_move(osv.osv):
             complete.append(move)
 
         for move in complete:
-            if prodlot_id:
-                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
+            if prodlot_ids.get(move.id):
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_ids.get(move.id)})
             self.action_done(cr, uid, [move.id], context=context)
             if  move.picking_id.id :
                 # TOCHECK : Done picking if all moves are done
@@ -2371,11 +2371,7 @@ class stock_move(osv.osv):
                     picking_obj.action_move(cr, uid, [move.picking_id.id])
                     wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
 
-        ref = {}
-        done_move_ids = []
-        for move in complete:
-            done_move_ids.append(move.id)
-        return done_move_ids
+        return [move.id for move in complete]
 
 stock_move()
 

From 71ee90c529380b85eb89f5dbaec56a128e23b7c1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:29:29 +0200
Subject: [PATCH 090/138] [IMP] product: default precision digits = 3 for
 Product UoM

bzr revid: odo@openerp.com-20100928152929-dhds0ig2154zq2e1
---
 addons/product/product_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 962f8aca560..83b36a1e130 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -158,7 +158,7 @@ parameter) will see those record just disappear.
         </record>
         <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
             <field name="name">Product UoM</field>
-            <field name="digits" eval="6"/>
+            <field name="digits" eval="3"/>
         </record>
     </data>
 </openerp>

From dea3d33eb3f4637a7b297d512f8205f529905067 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:30:03 +0200
Subject: [PATCH 091/138] [IMP] stock: return picking cleanup

bzr revid: odo@openerp.com-20100928153003-yy266nvttcqyeayj
---
 addons/stock/wizard/stock_return_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 9f34bbc5fac..88bc41e1aa7 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -109,7 +109,7 @@ class stock_return_picking(osv.osv_memory):
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
             for m in [line for line in pick.move_lines]:
                 quantity = m.product_qty
-                if m.state=='done' and quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
+                if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)

From 48a0ca06fcd7888f23b8e835d215aec1d83ae321 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:30:49 +0200
Subject: [PATCH 092/138] [IMP] stock: remove duplicate tooltips on picking
 list actions + make more consistent

bzr revid: odo@openerp.com-20100928153049-2ps3f2e0bst333bm
---
 addons/stock/stock_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 13e0ea66d90..576774a2107 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -624,7 +624,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
+                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -813,8 +813,8 @@
                     <field name="min_date"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
         </record>
@@ -927,7 +927,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1038,7 +1038,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1147,7 +1147,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1254,8 +1254,8 @@
                     <field name="invoice_state" groups="base.group_extended"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
+                    <button name="%(action_partial_picking)d" states="assigned" string="Receive products" type="action" icon="gtk-ok"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
         </record>
@@ -1549,7 +1549,7 @@
                     <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-ok"/>
                 </tree>
             </field>
         </record>

From 41d387d913c835e1008bc2e4cdf91abc450d589f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 18:36:49 +0200
Subject: [PATCH 093/138] [IMP] stock: move/inventory analysis review: correct
 report, add product category + improve views

bzr revid: odo@openerp.com-20100928163649-fueh01zap4ox8j86
---
 addons/stock/report/report_stock_move.py      | 24 ++++----
 .../stock/report/report_stock_move_view.xml   | 59 ++++++++-----------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 3aad21f4f9c..4bfd4537ec8 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,7 +153,7 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'product_uom':fields.many2one('product.uom', 'Product UOM', readonly=True),
+        'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
@@ -171,7 +171,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
@@ -179,18 +179,18 @@ CREATE OR REPLACE view report_stock_inventory AS (
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
-                LEFT JOIN product_product pp ON (m.product_id=pp.id)
-                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
-                LEFT JOIN stock_location l ON (m.location_id=l.id)
+            LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date, m.state, l.usage, m.company_id,m.product_uom
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
@@ -198,12 +198,12 @@ CREATE OR REPLACE view report_stock_inventory AS (
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
-                LEFT JOIN product_product pp ON (m.product_id=pp.id)
-                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
-                LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
+            LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 440c3548c91..12a43a5abbe 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -57,18 +57,18 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="  Year  "
+                <filter icon="terp-go-year" string="Year"
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Current year"/>
-                <filter icon="terp-go-month" string="   Month   "
+                <filter icon="terp-go-month"
+                 string="Month-1"
+                 separator="1"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Last month"/>
+                <filter icon="terp-go-month" string="Month"
                 name="month"
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                 help="Current month"/>
-                <filter icon="terp-go-month"
-                 string="    Month-1    "
-                 separator="1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                 help="Last month"/>                    
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
@@ -81,24 +81,15 @@
                     help = "Future Stock-Moves"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Receptions" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internals" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Packings" domain="[('type','=','out')]"/>
+                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
                 <filter icon="terp-go-home" name="delivery" string="Deliveries" domain="[('type','=','delivery')]"/>
                 <separator orientation="vertical"/>
-                <field name="product_id"/>
+                <field name="product_id" default_focus="1"/>
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="location_id" widget = "selection"/>
-                    <field name="location_dest_id"  widget = "selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
@@ -157,7 +148,7 @@
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="partner_id" invisible="1" context="{'contact_display':'partner'}"/>
-                <field name="product_uom" invisible="1"/>
+                <field name="product_categ_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
@@ -199,26 +190,16 @@
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
-                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="location_id"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
-                    <field name="product_uom" />
-                    <field name="prodlot_id"/>
-                    <field name="state"/>
-                    <field name="location_type"/>
-                    <field name="date"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                      <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
@@ -228,6 +209,16 @@
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="product_categ_id" />
+                    <field name="prodlot_id"/>
+                    <field name="state"/>
+                    <field name="location_type"/>
+                    <field name="date"/>
+                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
+                </group>
             </search>
         </field>
     </record>

From 4fd2e50269c56fbb484d0151b55c8bee818d2088 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 18:44:13 +0200
Subject: [PATCH 094/138] [IMP] stock: move o2m_list inside stock.picking
 should not have the redundant picking column

bzr revid: odo@openerp.com-20100928164413-4o1pdrmzqbrf8y66
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 576774a2107..639c22f226b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -663,7 +663,6 @@
                                         states="draft,waiting,confirmed,assigned" 
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
-                                    <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button
                                         name="%(stock.track_line)d"

From 11cc4b59d48c1767b164f2edfd2338fe7c4ff5de Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 19:25:47 +0200
Subject: [PATCH 095/138] [IMP] stock.picking return wizard: properly use uom +
 correct validation

bzr revid: odo@openerp.com-20100928172547-ngdqyn7g0etdz0u4
---
 addons/stock/wizard/stock_return_picking.py | 90 +++++++++++----------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 88bc41e1aa7..4bddc9a7ee4 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -69,15 +69,23 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
+            if pick.state not in ['done','confirmed','assigned']:
+                raise osv.except_osv(_('Warning !'), _("You may only return pickings that are Confirmed, Available or Done!"))
+            return_history = {}
+            valid_lines = 0
             for m in [line for line in pick.move_lines]:
-                if m.state=='done':
-                    if 'return%s'%(m.id) not in self._columns:
-                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                    if 'invoice_state' not in self._columns:
-                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
-                for rec in m.move_history_ids2:
-                    if rec.product_qty==m.product_qty:
-                        raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
+                if m.state == 'done':
+                    return_history[m.id] = 0
+                    for rec in m.move_history_ids2:
+                        return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
+                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                        valid_lines += 1
+                        if 'return%s'%(m.id) not in self._columns:
+                            self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                        if 'invoice_state' not in self._columns:
+                            self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+            if not valid_lines:
+                raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
@@ -98,16 +106,13 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
-            if pick.state not in['done','confirmed']:
-                raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
             return_history = {}
-            for m_line in pick.move_lines:
-                return_history[m_line.id] = 0
-                for rec in m_line.move_history_ids2:
-                    return_history[m_line.id] += rec.product_qty
             res['fields'].clear()
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
-            for m in [line for line in pick.move_lines]:
+            for m in pick.move_lines:
+                return_history[m.id] = 0
+                for rec in m.move_history_ids2:
+                    return_history[m.id] += rec.product_qty
                 quantity = m.product_qty
                 if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
@@ -146,6 +151,7 @@ class stock_return_picking(osv.osv_memory):
     
         move_ids = [m.id for m in [line for line in pick.move_lines]]
         set_invoice_state_to_none = True
+        returned_lines = 0
         for move in move_obj.browse(cr, uid, move_ids):
             if not new_picking:
                 if pick.type=='out':
@@ -167,34 +173,36 @@ class stock_return_picking(osv.osv_memory):
         
                 if returned_qty != new_qty:
                     set_invoice_state_to_none = False
-        
-                new_move=move_obj.copy(cr, uid, move.id, {
-                    'product_qty': new_qty,
-                    'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                        new_qty, move.product_uos.id),
-                    'picking_id':new_picking, 'state':'draft',
-                    'location_id':new_location, 'location_dest_id':move.location_id.id,
-                    'date':date_cur,})
-                move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
-        
+
+                if new_qty:
+                    returned_lines += 1 
+                    new_move=move_obj.copy(cr, uid, move.id, {
+                        'product_qty': new_qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+                            new_qty, move.product_uos.id),
+                        'picking_id':new_picking, 'state':'draft',
+                        'location_id':new_location, 'location_dest_id':move.location_id.id,
+                        'date':date_cur,})
+                    move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+
+        if not returned_lines:
+            raise osv.except_osv(_('Warning !'), _("Please specify at least one non-zero quantity!"))
+
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-        if new_picking:
-            if new_picking:
-                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-            pick_obj.force_assign(cr, uid, [new_picking], context)
-            return {
-                'domain': "[('id', 'in', ["+str(new_picking)+"])]",
-                'name': 'Picking List',
-                'view_type':'form',
-                'view_mode':'tree,form',
-                'res_model':'stock.picking',
-                'view_id':False,
-                'type':'ir.actions.act_window',
-                'context':context,
-            }            
-        return {}
-    
+        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+        pick_obj.force_assign(cr, uid, [new_picking], context)
+        return {
+            'domain': "[('id', 'in', ["+str(new_picking)+"])]",
+            'name': 'Picking List',
+            'view_type':'form',
+            'view_mode':'tree,form',
+            'res_model':'stock.picking',
+            'view_id':False,
+            'type':'ir.actions.act_window',
+            'context':context,
+        }
+
 stock_return_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From bb17e729bfc8340d44fc3ca03151c8abc9ea45b9 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 29 Sep 2010 10:22:19 +0530
Subject: [PATCH 096/138] [FIX] stock: Error while opening dashboard.

bzr revid: uco@tinyerp.com-20100929045219-a2q4dqsbu3el14yk
---
 addons/stock/stock.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dbf55768b3e..571b9643129 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2630,7 +2630,7 @@ class report_delivery_products_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
         cr.execute("""
             create or replace view report_delivery_products_planned as (
-                select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+                select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
@@ -2639,14 +2639,12 @@ class report_delivery_products_planned(osv.osv):
 
                     union
 
-               select stock.date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date as date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
                     where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date
-
-
+                    group by stock.date
                 )
         """)
 

From f44295b29789d5f6bdc9d3823ec6d98bb87d9a29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 11:44:01 +0530
Subject: [PATCH 097/138] [IMP] stock: Stock partial move and partial picking
 wizard  select only production lots for the product on that line

bzr revid: sbh@tinyerp.com-20100929061401-3c13j05vvprjwk5g
---
 addons/stock/wizard/stock_partial_move.py    | 4 ++--
 addons/stock/wizard/stock_partial_picking.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index dafb50cefe1..4825fa9c47e 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -104,8 +104,8 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                    <field name="move%s_prodlot_id" groups="base.group_extended" />                    
-                """%(m.id, m.id, m.id,m.id)
+                    <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]"  groups="base.group_extended" />                    
+                """%(m.id, m.id, m.id,m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 3bfe075eb0b..d52198170a6 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -105,8 +105,8 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
-                        <field name="move%s_prodlot_id" groups="base.group_extended" />
-                    """%(m.id, m.id, m.id, m.id)
+                        <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" groups="base.group_extended" />
+                    """%(m.id, m.id, m.id, m.id,m.id)
                     if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({
                             'move%s_product_price'%(m.id) : {

From 9583cb02310b090c950b08e2a4ca7fa7ed681004 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 12:43:40 +0530
Subject: [PATCH 098/138] [IMP] stock: change the action in  Warehouse
 Dashboard

bzr revid: sbh@tinyerp.com-20100929071340-3ngeu0s9tjx32uj7
---
 addons/stock/board_warehouse_view.xml | 27 ++++++++++++++++++++-------
 addons/stock/stock_view.xml           | 18 ++++++++++++++++++
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5704df7685b..2166dea00fd 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -5,14 +5,25 @@
             <field name="name">Warehouse</field>
         </record>
 
-		<record id="action_reception_picking_move_board" model="ir.actions.act_window">
-            <field name="name">Reception Picking Stock Move</field>
+    
+		<record id="action_incoming_product_board" model="ir.actions.act_window">
+            <field name="name">Incoming Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in'),('date','&lt;=',time.strftime('%Y-%m-%d 23:59:59'))]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>            
+			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+        </record>
+                
+		<record id="action_outgoing_product_board" model="ir.actions.act_window">
+            <field name="name">Outgoing Product</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>			
+			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
 		<record id="board_warehouse_form" model="ir.ui.view">
@@ -23,13 +34,15 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
+					    	<action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
+					    
                         </child1>
 
                         <child2>
+						<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />                        
 					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
-                        </child2>
+<!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
+-->                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 639c22f226b..c2af2715c4e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1724,6 +1724,24 @@
                 </tree>
             </field>
         </record>
+        <!-- test -->
+          <record id="view_move_tree_reception_picking_board" model="ir.ui.view">
+            <field name="name">stock.move.tree3</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="picking_id" string="Reference"/>
+                    <field name="partner_id" string="Partner"/>
+                    <field name="product_id"/>
+                    <field name="product_qty" />
+                    <field name="product_uom" string="UoM"/>
+                    <field name="date"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>

From 796cf9ba41226b4b9c49be332b72717a04bf0fa9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 12:56:25 +0530
Subject: [PATCH 099/138] procurement : Add the tree view for Warehouse
 Dashboard

bzr revid: sbh@tinyerp.com-20100929072625-9kbd9yhuovqf660n
---
 addons/procurement/board_mrp_procurement_view.xml | 11 ++++++++++-
 addons/procurement/procurement_view.xml           | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index d5f71f6d4bc..3b18a876f4f 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+		<record id="procurement_action_board" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">procurement.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception')]</field>
+			<field name="view_id" ref="procurement.procurement_tree_view_board"/>            
+        </record>
         <record id="board_mrp_procurement_form" model="ir.ui.view">
             <field name="name">board.mrp.procurement.form</field>
             <field name="model">board.board</field>
@@ -8,7 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
       		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(procurement.procurement_action5)d" string="Procurement Exceptions" width="510" />
+				<action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" />
 			</xpath>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fada5c18c28..e2e8c591f3f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -23,6 +23,21 @@
                     <field name="name" invisible="1"/>
                 </tree>
             </field>
+        </record>
+         <record id="procurement_tree_view_board" model="ir.ui.view">
+            <field name="name">procurement.order.tree.board</field>
+            <field name="model">procurement.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                    <field name="date_planned" widget="date"/>
+                    <field name="origin"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" string="UOM"/>
+                    <field name="message"/>
+                </tree>
+            </field>
         </record>
         <record id="procurement_form_view" model="ir.ui.view">
             <field name="name">procurement.order.form</field>

From 9321323c4c3da27b30965ae1ebcf663badf03141 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 29 Sep 2010 09:51:46 +0200
Subject: [PATCH 100/138] [IMP] sale_journal: renaming of date_planned field to
 date in stock.move

bzr revid: odo@openerp.com-20100929075146-bomk2f60oghucj0q
---
 addons/sale_journal/test/picking_journal.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_journal/test/picking_journal.yml b/addons/sale_journal/test/picking_journal.yml
index af4ee8ec8a0..9412c3d40d1 100644
--- a/addons/sale_journal/test/picking_journal.yml
+++ b/addons/sale_journal/test/picking_journal.yml
@@ -20,7 +20,7 @@
     move_lines:
       - company_id: base.main_company
         date_expected: '2010-08-04 14:09:38'
-        date_planned: '2010-08-04 14:09:38'
+        date: '2010-08-04 14:09:38'
         location_id: stock.stock_location_stock
         product_id: product.product_product_24
         product_qty: 50.0
@@ -84,4 +84,4 @@
 -
   !python {model: sale_journal.picking.journal}: |
     pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert (pick_jour.state == 'close'), "Journal is not in the open state"
\ No newline at end of file
+    assert (pick_jour.state == 'close'), "Journal is not in the open state"

From f3bb5ba6c9a1c2a1fba41a4a4e8bfd4a8a41d672 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 14:07:44 +0530
Subject: [PATCH 101/138] [IMP] stock: Improve the view of dashboard

bzr revid: sbh@tinyerp.com-20100929083744-84pl51rfc8h6z51d
---
 addons/stock/board_warehouse_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 2166dea00fd..20a99f0ab6a 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -32,14 +32,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board">
-                    <hpaned position="100">
+                    <hpaned position="200">
                         <child1>
 					    	<action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
-					    
+					    	<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
                         </child1>
 
                         <child2>
-						<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />                        
+						                        
 					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
 <!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
 -->                        </child2>

From 47502593c67c2f0e03b66420e8c942c1d29f8e1f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 18:48:42 +0530
Subject: [PATCH 102/138] [Fix] stock: Fix Error while opening dashboard for

bzr revid: sbh@tinyerp.com-20100929131842-ss1px9hwmmfr5gqt
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 571b9643129..d73266396ec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2595,7 +2595,7 @@ class report_products_to_received_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
         cr.execute("""
             create or replace view report_products_to_received_planned as (
-               select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+               select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
@@ -2604,7 +2604,7 @@ class report_products_to_received_planned(osv.osv):
 
                     union
 
-               select stock.date, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date as date , min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'

From 6f2bb74f1519e7d0382e6ec1c4a25e47758f91b8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 30 Sep 2010 11:59:05 +0530
Subject: [PATCH 103/138] [Fix] stock: Fix the product_value function check the
 loc_id is exist or not

bzr revid: sbh@tinyerp.com-20100930062905-ata7ijvy6frdy76d
---
 addons/stock/stock.py | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 969c468c8d3..3a70b387d49 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -123,25 +123,24 @@ class stock_location(osv.osv):
         currency_obj = self.pool.get('res.currency')
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
         currency_obj.round(cr, uid, currency, 300)
-
         for loc_id, product_ids in products_by_location.items():
             c = (context or {}).copy()
-            c['location'] = loc_id
-            for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
-                for f in field_names:
-                    if f == 'stock_real':
-                        result[loc_id][f] += prod.qty_available
-                    elif f == 'stock_virtual':
-                        result[loc_id][f] += prod.virtual_available
-                    elif f == 'stock_real_value':
-                        amount = prod.qty_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
-                    elif f == 'stock_virtual_value':
-                        amount = prod.virtual_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
-
+            if loc_id in ids:
+                c['location'] = loc_id
+                for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
+                    for f in field_names:
+                        if f == 'stock_real':
+                            result[loc_id][f] += prod.qty_available
+                        elif f == 'stock_virtual':
+                            result[loc_id][f] += prod.virtual_available
+                        elif f == 'stock_real_value':
+                            amount = prod.qty_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
+                        elif f == 'stock_virtual_value':
+                            amount = prod.virtual_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
         return result
 
     _columns = {

From 29f101668dae52eba19a58e9f1a35634488c9edd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 12:56:06 +0530
Subject: [PATCH 104/138] [Fix] stock: fix the graph view of  Moves
 Analysis,remove all views and code that are used  dashboard

bzr revid: sbh@tinyerp.com-20101004072606-n7n3q0dmi4kmxmll
---
 addons/stock/board_warehouse_view.xml         |  4 +-
 .../stock/report/report_stock_move_view.xml   |  2 +-
 addons/stock/security/ir.model.access.csv     |  2 -
 addons/stock/stock.py                         | 68 ------------------
 addons/stock/stock_view.xml                   | 72 -------------------
 5 files changed, 2 insertions(+), 146 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 20a99f0ab6a..04e4b592aef 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -40,9 +40,7 @@
 
                         <child2>
 						                        
-					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-<!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
--->                        </child2>
+                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 12a43a5abbe..df91f1f7737 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -45,7 +45,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="day_diff2" operator="avg"/>
+                 <field name="day_diff2" operator="+"/>
              </graph>
          </field>
     </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 285eebccde5..e879a03e9e1 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -32,8 +32,6 @@
 "access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
 "access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
-"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1
-"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
 "access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
 "access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0
 "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3a70b387d49..bdad93d7e5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2561,73 +2561,5 @@ class stock_picking_move_wizard(osv.osv_memory):
 
 stock_picking_move_wizard()
 
-class report_products_to_received_planned(osv.osv):
-    _name = "report.products.to.received.planned"
-    _description = "Received Products vs Planned"
-    _auto = False
-    _columns = {
-        'date':fields.date('Date'),
-        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
-        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
-
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
-        cr.execute("""
-            create or replace view report_products_to_received_planned as (
-               select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
-                   from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.create_date
-
-                    union
-
-               select stock.date as date , min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
-                    from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date
-                )
-        """)
-
-report_products_to_received_planned()
-
-class report_delivery_products_planned(osv.osv):
-    _name = "report.delivery.products.planned"
-    _description = "Delivered products vs Planned"
-    _auto = False
-    _columns = {
-        'date':fields.date('Date'),
-        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
-        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
-        cr.execute("""
-            create or replace view report_delivery_products_planned as (
-                select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
-                   from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.create_date
-
-                    union
-
-               select stock.date as date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
-                    from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
-                )
-        """)
-
-report_delivery_products_planned()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cd2c6439326..1a8a13c0f7b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1953,78 +1953,6 @@
             <field eval="True" name="object"/>
         </record>
 
-        <!-- Graph Views -->
-        <!--  Products To Received Vs Planned -->
-        <record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
-            <field name="name">Products To Received</field>
-            <field name="model">report.products.to.received.planned</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Products To Received" >
-                    <field name="qty" />
-                    <field name="planned_qty" />
-                    <field name="date"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_move_graph_reception_picking">
-            <field name="name">Products To Received</field>
-            <field name="model">report.products.to.received.planned</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-            <graph string="Products To Received" type="bar" orientation="vertical">
-                <field name="date"/>
-                <field name="qty" operator="+"/>
-                <field name="planned_qty" operator="+"/>
-            </graph>
-            </field>
-        </record>
-
-        <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-            <field name="name">Number of Products to receive Vs planned</field>
-            <field name="res_model">report.products.to.received.planned</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_move_graph_reception_picking"/>
-        </record>
-
-        <!--  Delivery Product Vs Planned -->
-        <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-            <field name="name">Delivery Products</field>
-            <field name="model">report.delivery.products.planned</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Products To Received" >
-                    <field name="qty" />
-                    <field name="planned_qty" />
-                    <field name="date"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-            <field name="name">Delivery Products</field>
-            <field name="model">report.delivery.products.planned</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-            <graph string="Products To Received" type="bar" orientation="vertical">
-                <field name="date"/>
-                <field name="qty" operator="+"/>
-                <field name="planned_qty" operator="+"/>
-            </graph>
-            </field>
-        </record>
-
-        <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-            <field name="name">Delivery Products Vs Planned</field>
-            <field name="res_model">report.delivery.products.planned</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
-        </record>
 
         <record id="action_picking_tree_out" model="ir.actions.act_window">
             <field name="name">Customers Packings</field>

From fc8f5385d627e82fbca9d27f60177952ea07c7f8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 16:02:32 +0530
Subject: [PATCH 105/138] [Fix] stock: Fix the buildbot-bug for stock_planing
 yml

bzr revid: sbh@tinyerp.com-20101004103232-1gsxkqkwjogm8df2
---
 addons/stock/product.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index bdaec60832e..e1d4c71b46c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -233,9 +233,11 @@ class product_product(osv.osv):
         to_date = context.get('to_date',False)
         date_str = False
         date_values = False
+        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
         if from_date and to_date:
             date_str = "date>=%s and date<=%s"
-            date_values = [from_date, to_date]
+            where.append(tuple([from_date]))
+            where.append(tuple([to_date]))
         elif from_date:
             date_str = "date>=%s"
             date_values = [from_date] 
@@ -243,7 +245,7 @@ class product_product(osv.osv):
             date_str = "date<=%s"
             date_values = [to_date]
 
-        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
+       
         if date_values:
             where.append(tuple(date_values))
         if 'in' in what:

From 6fda5961668407082984d69bb6708a8068ba9025 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 18:51:32 +0530
Subject: [PATCH 106/138] [IMP] stock: Add the action for incoming and outgoing
 delay product

bzr revid: sbh@tinyerp.com-20101004132132-2ljae0lzcf6bvnz8
---
 addons/stock/board_warehouse_view.xml         | 21 +++++++++++++++++--
 .../stock/report/report_stock_move_view.xml   |  1 +
 addons/stock/stock_view.xml                   |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 04e4b592aef..1dae20ffec2 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -25,7 +25,23 @@
 			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>			
 			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
-
+        
+		<record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
+			<field name="res_model">report.stock.move</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		    <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
+			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+         </record>
+		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
+			<field name="res_model">report.stock.move</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		    <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
+			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+         </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
             <field name="model">board.board</field>
@@ -39,7 +55,8 @@
                         </child1>
 
                         <child2>
-						                        
+							<action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>						                              
+							<action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index df91f1f7737..a4c1e2a7c6b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,6 +44,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
+             	 <field name="day" group="True"/>
                  <field name="product_id"/>
                  <field name="day_diff2" operator="+"/>
              </graph>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1a8a13c0f7b..ef046414bd6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1731,7 +1731,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel')" string="Moves">
+                <tree string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>

From e1834aef40723c9f76a2d2ad0725f56bdb0f3332 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 19:14:15 +0530
Subject: [PATCH 107/138] [Fix]: stock: fix the stock_demo data for yml test

bzr revid: sbh@tinyerp.com-20101004134415-o78uo0gcrjwdfn5e
---
 addons/stock/stock_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 91acb5c6406..1249317a2e4 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -274,6 +274,7 @@
             <field name="type">out</field>
             <field name="move_type">direct</field>
             <field name="invoice_state">2binvoiced</field>
+            <field name="address_id"  ref="base.main_address"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
     </data>

From 8364c38fda539cb720279ccef2ba614050bea3b1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 10:53:18 +0530
Subject: [PATCH 108/138] [Fix] project_timesheet:Fix the buildbot-bug foryml

bzr revid: sbh@tinyerp.com-20101005052318-azg6kccngrq0qy72
---
 .../test/worktask_entry_to_timesheetline_entry.yml              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 42e780642bf..2a08d863fff 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -7,6 +7,8 @@
     login: hr
     name: HR Manager
     password: hr
+    groups_id:
+      - base.group_hr_manager   
             
 - 
   Create a product with type service used to specifies employees designation

From afcaaf5d5321d664c5c5a61b8c8391835ea93256 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 11:26:04 +0530
Subject: [PATCH 109/138] [IMP] stock: Improve set the groups to menuitems

bzr revid: sbh@tinyerp.com-20101005055604-0hni5yhjg0i77iav
---
 addons/stock/__openerp__.py | 4 ++--
 addons/stock/stock_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 7a20abe2fb0..79d6c860e65 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -45,6 +45,8 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
+        "security/stock_security.xml",  
+        "security/ir.model.access.csv",                  
         "stock_data.xml",
         "wizard/stock_move_view.xml",
         "wizard/stock_partial_picking_view.xml",
@@ -68,8 +70,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "partner_view.xml",
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
-        "security/stock_security.xml",
-        "security/ir.model.access.csv",
         "board_warehouse_view.xml"
     ],
     'test': ['test/stock_test.yml',
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ef046414bd6..bc4f7b2ab67 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="5"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" parent="" groups="group_stock_manager" sequence="5"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
-        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="base.group_system"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_system"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 

From 9ea6b85f745ddac46ccbd3ec76fb145649f1def6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 14:51:42 +0530
Subject: [PATCH 110/138] [IMP] stock: Improve set the groups for Configuration
 menu

bzr revid: sbh@tinyerp.com-20101005092142-oqio0u9lg59xf1f2
---
 addons/stock/stock_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bc4f7b2ab67..0979341dd63 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" parent="" groups="group_stock_manager" sequence="5"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,base.group_extended"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" groups="group_stock_manager,group_stock_user" sequence="5"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,group_stock_user,base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_system"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager,base.group_system"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -508,7 +508,7 @@
             <field name="search_view_id" ref="view_location_search"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system"/>
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system,group_stock_manager"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -568,7 +568,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="base.group_system"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
 
         <record id="stock_picking_move_wizard_form" model="ir.ui.view">
             <field name="name">stock.picking.move.wizard.form</field>
@@ -2053,7 +2053,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="base.group_extended"
+            groups="group_stock_manager,base.group_extended"
             parent="menu_warehouse_config" />
 
     </data>

From 139269c5c8ad182afbb8286b6d02ba6b09ac21bc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 14:58:47 +0530
Subject: [PATCH 111/138] [IMP] stock: set the multi_company group on company
 filter

bzr revid: sbh@tinyerp.com-20101005092847-81m7ec0cesm5vt4b
---
 addons/stock/report/report_stock_move_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a4c1e2a7c6b..3708bafb612 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -204,7 +204,7 @@
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                      <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_company" string="Company" context="{'group_by':'company_id'}"/>
+                    <filter name="group_company" string="Company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>

From 4f14f61d006ac51db67bb7fd3f7af05badd7d795 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 16:24:38 +0530
Subject: [PATCH 112/138] [IMP] stock: Improve filter and dashboard action

bzr revid: sbh@tinyerp.com-20101005105438-1deq7glo2u4agjrf
---
 addons/stock/board_warehouse_view.xml          | 8 ++++----
 addons/stock/report/report_stock_move_view.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 1dae20ffec2..8191a53374f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -30,17 +30,17 @@
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+		    <field name="domain">[('type','=','in')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+		    <field name="domain">[('type','=','out')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 3708bafb612..cb5ff177050 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,7 +44,6 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
-             	 <field name="day" group="True"/>
                  <field name="product_id"/>
                  <field name="day_diff2" operator="+"/>
              </graph>
@@ -63,6 +62,7 @@
                 help="Current year"/>
                 <filter icon="terp-go-month"
                  string="Month-1"
+                 name="month-1"
                  separator="1"
                  domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>

From d14cee5c3140dd249c7657559daffe3fcc9de1de Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 10:53:40 +0530
Subject: [PATCH 113/138] [Fix] account: Remove the extra menu of account board

bzr revid: sbh@tinyerp.com-20101006052340-2di98zk18o7ly9nu
---
 addons/account/board_account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 5ae2890fd20..3c7879e86c3 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -51,6 +51,6 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
+        
     </data>
 </openerp>

From d607cfb5ce055f89c17d5de5208330d39d67297e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 11:34:25 +0530
Subject: [PATCH 114/138] [Fix] crm, email_template: fix the warining of the
 buildbot

bzr revid: sbh@tinyerp.com-20101006060425-due2y7k9tsnpzt7x
---
 addons/crm/crm_opportunity.py           | 5 ++---
 addons/email_template/email_template.py | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 2b0062eb9d5..9047007d52c 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
-from osv import fields,osv,orm
+from osv import fields,osv
 from tools.translate import _
 import crm
 import time
@@ -121,7 +120,7 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'stage_id': False})
-        return True
+        return res
    
  
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index ee82c917351..02ebb1c0bb6 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -31,10 +31,8 @@ TEMPLATE_ENGINES = []
 
 from osv import osv, fields
 from tools.translate import _
-from mako.template import Template  #For backward combatibility
 try:
     from mako.template import Template as MakoTemplate
-    from mako import exceptions
     TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
 except:
     LOGGER.notifyChannel(
@@ -302,7 +300,6 @@ This is useful for CRM leads for example"),
 
     def unlink_action(self, cr, uid, ids, context):
         for template in self.browse(cr, uid, ids, context):
-            obj = self.pool.get(template.object_name.model)
             try:
                 if template.ref_ir_act_window:
                     self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)

From 1a87577d4ca17bb2b802bdc3d597cc0b5d4dca63 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 11:40:09 +0530
Subject: [PATCH 115/138] [Fix] event: Fix the warining of pylint

bzr revid: sbh@tinyerp.com-20101006061009-ee2cco8sn1rnz21n
---
 addons/event/event.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 88910f01914..6682a703ea5 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -22,8 +22,6 @@
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
 import time
 import tools
 import decimal_precision as dp
@@ -354,12 +352,6 @@ class event_registration(osv.osv):
 
         val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-        partner_address_id = val_invoice['value']['address_invoice_id']
-
-        value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-
-        l = inv_lines_pool.read(cr, uid, lines)
-
         val_invoice['value'].update({
                 'origin': reg.event_product,
                 'reference': False,
@@ -595,7 +587,6 @@ class event_registration(osv.osv):
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
 
-        contact_id = contact_obj.browse(cr, uid, contact)
         if partner:
             partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
             job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])

From ab3fe9358ce567c2423bda9f2aa3df3f74b3fb7a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 17:53:26 +0530
Subject: [PATCH 116/138] [IMP] stock: Incoming shipment  product field in move
 line should not be readonly in draft state

bzr revid: sbh@tinyerp.com-20101006122326-0p2hp6cbgs9esc15
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2f4d0a2e48b..f5f1c854d6f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1281,9 +1281,9 @@
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
-                                    <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1"/>
-                                    <field name="product_uom" string="UoM" readonly="1"/>
+                                    <field name="product_id" />
+                                    <field name="product_qty" />
+                                    <field name="product_uom" string="UoM" />
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"

From 2c58ba2bfab9cc917ea2098e065932ad35193dc8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:14:45 +0530
Subject: [PATCH 117/138] [IMP] stock: set the groups on dashobard

bzr revid: sbh@tinyerp.com-20101006124445-5rwks6iphs87bwlv
---
 addons/stock/board_warehouse_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 8191a53374f..37ab496c3a6 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -71,9 +71,9 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-		<menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" action="open_board_warehouse"/>
+		<menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph"    id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
+         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"   groups="group_stock_manager,base.group_system" action="open_board_warehouse"/>
 
     </data>
 </openerp>

From c57aed2e0520c40bab5bb6abc762ea4e99b3660d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:38:06 +0530
Subject: [PATCH 118/138] [IMP] stock:Add the day wise grouping

bzr revid: sbh@tinyerp.com-20101006130806-b0caho7dff41ua8n
---
 addons/stock/board_warehouse_view.xml          | 12 ++++++------
 addons/stock/report/report_stock_move_view.xml | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 37ab496c3a6..7bc58cbb589 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -31,16 +31,16 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
 		    <field name="domain">[('type','=','in')]</field>	
-			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
 		    <field name="domain">[('type','=','out')]</field>	
-			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
@@ -72,8 +72,8 @@
         </record>
 
 		<menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph"    id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"   groups="group_stock_manager,base.group_system" action="open_board_warehouse"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
+         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index cb5ff177050..353b8b6bc9c 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -49,6 +49,17 @@
              </graph>
          </field>
     </record>
+    <record id="view_stock_graph_board" model="ir.ui.view">
+         <field name="name">report.stock.move.graph</field>
+         <field name="model">report.stock.move</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Moves Analysis" type="bar">
+                 <field name="day"/>
+                 <field name="day_diff2" operator="+"/>
+             </graph>
+         </field>
+    </record>
 
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>

From 712fc52fceb40df68f24151efccd8b288f5aaa82 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:55:59 +0530
Subject: [PATCH 119/138] [IMP] stock : Remove the domain and put in search
 default

bzr revid: sbh@tinyerp.com-20101006132559-vctqot3uwqi3l0zf
---
 addons/stock/board_warehouse_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 7bc58cbb589..84a24f3d0b2 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -30,17 +30,15 @@
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','in')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','out')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>

From 56d2aac9268fb7b4361cec266ee405dbaec5a4be Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:49:37 +0200
Subject: [PATCH 120/138] [IMP] stock: some whitespace removed

bzr revid: odo@openerp.com-20101005124937-3wwifrj712ifwqhc
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d24696ff734..1333fb59dec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2008,7 +2008,7 @@ class stock_move(osv.osv):
                     'product_id': move.product_id and move.product_id.id or False,
                     'quantity': move.product_qty,
                     'ref': move.picking_id and move.picking_id.name or False,
-                    'date': time.strftime('%Y-%m-%d')   ,
+                    'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
                     'debit': reference_amount,
                     'account_id': dest_account_id,
@@ -2018,7 +2018,7 @@ class stock_move(osv.osv):
                     'product_id': move.product_id and move.product_id.id or False,
                     'quantity': move.product_qty,
                     'ref': move.picking_id and move.picking_id.name or False,
-                    'date': time.strftime('%Y-%m-%d')   ,
+                    'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
                     'credit': reference_amount,
                     'account_id': src_account_id,

From c750ac729b3ee9115e721481cedd543a380659a7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:50:28 +0200
Subject: [PATCH 121/138] [FIX] procurement: date_planned field has been
 removed from stock.picking

bzr revid: odo@openerp.com-20101005125028-sfyd78eddtta99l5
---
 addons/procurement/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e1b9b5af40b..e85602d79aa 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -343,7 +343,7 @@ class procurement_order(osv.osv):
                         'product_id': procurement.product_id.id,
                         'product_qty': procurement.product_qty,
                         'product_uom': procurement.product_uom.id,
-                        'date_planned': procurement.date_planned,
+                        'date_expected': procurement.date_planned,
                         'state': 'draft',
                         'company_id': procurement.company_id.id,
                     })

From 4ab62afb16475d096c5e850718d1e3da3ef9e426 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 18:12:34 +0200
Subject: [PATCH 122/138] [IMP] procurement,stock_location: improve module
 description + some code cleanup in procurement wkf

bzr revid: odo@openerp.com-20101006161234-sm86b86v584u0rpq
---
 addons/procurement/procurement.py    | 21 ++---------
 addons/stock_location/__openerp__.py | 55 ++++++++++++++++++++++++----
 addons/stock_location/mrp_pull.py    |  1 -
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e85602d79aa..318e572d597 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -157,34 +157,19 @@ class procurement_order(osv.osv):
         """ Checks product type.
         @return: True or False
         """
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.type in ('product', 'consu'):
-                return True
-        return False
+        return all(procurement.product_id.type in ('product', 'consu') for procurement in self.browse(cr, uid, ids))
 
     def check_move_cancel(self, cr, uid, ids, context={}):
         """ Checks if move is cancelled or not.
         @return: True or False.
         """
-        res = True
-        ok = False
-        for procurement in self.browse(cr, uid, ids, context):
-            if procurement.move_id:
-                ok = True
-                if not procurement.move_id.state == 'cancel':
-                    res = False
-        return res and ok
+        return all(procurement.move_id.state != 'cancel' for procurement in self.browse(cr, uid, ids))
 
     def check_move_done(self, cr, uid, ids, context={}):
         """ Checks if move is done or not.
         @return: True or False.
         """
-        res = True
-        for proc in self.browse(cr, uid, ids, context):
-            if proc.move_id:
-                if not proc.move_id.state == 'done':
-                    res = False
-        return res
+        return all(procurement.move_id.state == 'done' for procurement in self.browse(cr, uid, ids))
 
     #
     # This method may be overrided by objects that override procurement.order
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index beb24997fb8..bb9651bb1eb 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -21,20 +21,59 @@
 
 
 {
-    'name': 'Stock Location Paths',
+    'name': 'Warehouse Locations Paths',
     'version': '1.0',
     'category': 'Generic Modules/Inventory Control',
     'description': """
-Manages product's path in locations.
+This module supplements the Warehouse application by adding support for per-product
+location paths, effectively implementing Push and Pull inventory flows.
 
-This module may be useful for different purposes:
-* Manages the product in his whole manufacturing chain
-* Manages different default locations by products
-* Define paths within the warehouse to route products based on operations:
+Typically this could be used to:
+* Manage product manufacturing chains
+* Manage default locations per product
+* Define routes within your warehouse according to business needs, such as:
    - Quality Control
    - After Sales Services
-   - Supplier Return
-* Manage products to be rent.
+   - Supplier Returns
+* Help rental management, by generating automated return moves for rented products
+
+Once this module is installed, an additional tab appear on the product form, where you can add
+Push and Pull flow specifications.
+
+Push flows
+----------
+Push flows are useful when the arrival of certain products in a given location should always
+be followed by a corresponding move to another location, optionally after a certain delay.
+The original Warehouse application already supports such Push flow specifications on the
+Locations themselves, but these cannot be refined per-product.
+
+A push flow specification indicates which location is chained with which location, and with
+what parameters. As soon as a given quantity of products is moved in the source location,
+a chained move is automatically foreseen according to the parameters set on the flow specification
+(destination location, delay, type of move, journal, etc.) The new move can be automatically
+processed, or require a manual confirmation, depending on the parameters.
+
+Pull flows
+----------
+Pull flows are a bit different from Pull flows, in the sense that they are not related to
+the processing of product moves, but rather to the processing of procurement orders.
+What is being pulled is a need, not directly products.
+A classical example of Push flow is when you have an Outlet company, with a parent Company
+that is responsible for the supplies of the Outlet.
+
+  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]
+
+When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives
+in the Outlet, it is converted into another procurement (B, via a Push flow of type 'move')
+requested from the Holding. When procurement order B is processed by the Holding company, and
+if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier
+(Push flow of type Purchase). The result is that the procurement order, the need, is pushed
+all the way between the Customer and Supplier.
+
+Technically, Pull flows allow to process procurement orders differently, not only depending on
+the product being considered, but also depending on which location holds the "need" for that
+product (i.e. the destination location of that procurement order).
+
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement','stock'],
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 231a814e671..489d2281746 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -32,7 +32,6 @@ class procurement_order(osv.osv):
     def check_buy(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
-                
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='buy'
         return super(procurement_order, self).check_buy(cr, uid, ids)

From fa99a1d9c04f0859a4d185a55a27780f4d2da4c1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 09:59:19 +0530
Subject: [PATCH 123/138] [Fix] stock_location: Fixed pylint warnings

bzr revid: sbh@tinyerp.com-20101007042919-y4cq1qlpm59e210s
---
 addons/stock_location/mrp_pull.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 489d2281746..4ad3f445763 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -18,13 +18,8 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import tools
-import ir
-import pooler
+from osv import osv
 import netsvc
-from mx import DateTime
-import time
 from tools.translate import _
 
 class procurement_order(osv.osv):
@@ -56,6 +51,7 @@ class procurement_order(osv.osv):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
         location_obj = self.pool.get('stock.location')
+        picking_obj=self.pool.get('stock.picking')
         wf_service = netsvc.LocalService("workflow")
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
@@ -64,7 +60,7 @@ class procurement_order(osv.osv):
                     break
             assert line, 'Line can not be False if we are on this state of the workflow'
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+            picking_id =picking_obj.create(cr, uid, {
                 'origin': origin,
                 'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
@@ -74,7 +70,7 @@ class procurement_order(osv.osv):
                 'note': line.name, # TODO: note on procurement ?
                 'invoice_state': line.invoice_state,
             })
-            move_id = self.pool.get('stock.move').create(cr, uid, {
+            move_id =move_obj.create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
                 'company_id':  line.company_id and line.company_id.id or False,
@@ -96,10 +92,10 @@ class procurement_order(osv.osv):
                 'note': line.name, # TODO: same as above
             })
             if proc.move_id and proc.move_id.state in ('confirmed'):
-                self.pool.get('stock.move').write(cr,uid, [proc.move_id.id],  {
+                move_obj.write(cr,uid, [proc.move_id.id],  {
                     'state':'waiting'
                 }, context=context)
-            proc_id = self.pool.get('procurement.order').create(cr, uid, {
+            proc_id = proc_obj.create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
                 'company_id':  line.company_id and line.company_id.id or False,
@@ -119,7 +115,7 @@ class procurement_order(osv.osv):
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
             wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
             if proc.move_id:
-                self.pool.get('stock.move').write(cr, uid, [proc.move_id.id],
+                move_obj.write(cr, uid, [proc.move_id.id],
                     {'location_id':proc.location_id.id})
 
             self.write(cr, uid, [proc.id], {'state':'running','message':_('Moved from other location')})

From 47409685f8e7fb0cc0cb4bb5eb450302f6c7b750 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 10:36:06 +0530
Subject: [PATCH 124/138] [Fix] stock: set  grouped by partner_id  in incoming
 shipment

bzr revid: sbh@tinyerp.com-20101007050606-r42yqhjcccq7dfg6
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f5f1c854d6f..93925e6a9da 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1406,7 +1406,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />

From 9e1ee6bc40d5898da2b52a5d26c56de5a89a7cc5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 11:02:55 +0530
Subject: [PATCH 125/138] [Fix] stock_location: fix the yml and remove the
 unused object

bzr revid: sbh@tinyerp.com-20101007053255-eef0ofabip6sk3jr
---
 addons/stock_location/mrp_pull.py             |  1 -
 addons/stock_location/test/stock_location.yml | 47 ++++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 4ad3f445763..f4c9868a58f 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -50,7 +50,6 @@ class procurement_order(osv.osv):
     def action_move_create(self, cr, uid, ids,context=None):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
-        location_obj = self.pool.get('stock.location')
         picking_obj=self.pool.get('stock.picking')
         wf_service = netsvc.LocalService("workflow")
         for proc in proc_obj.browse(cr, uid, ids, context=context):
diff --git a/addons/stock_location/test/stock_location.yml b/addons/stock_location/test/stock_location.yml
index c5360ce67c5..609d0af4147 100644
--- a/addons/stock_location/test/stock_location.yml
+++ b/addons/stock_location/test/stock_location.yml
@@ -227,33 +227,34 @@
     lot_stock_id: stock_location_suppiler0
     name: OpenERP S.A.
     partner_address_id: res_partner_address_0
--
-  I create Sale order for HP CD writers.
 - 
-  !record {model: sale.order, id: sale_order_01}:
-    date_order: '2010-04-20'
-    invoice_quantity: order
-    name: Test/location
-    order_line:
-      - name: HP CD writers
-        price_unit: 1000.0
+  I create outgoing picking order for HP CD writers.
+- 
+  !record {model: stock.picking, id: stock_picking_out0}:
+    address_id: base.res_partner_address_1
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - date_expected: '2010-10-07 10:52:54'
+        location_dest_id: stock.stock_location_customers
+        location_id: stock_location_suppiler0
+        name: '[MB1] Mainboard ASUStek A7N8X'
+        product_id: product.product_product_mb1
+        product_qty: 1.0
         product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        product_id: product_product_hpcdwriters0
-        type: make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+        product_uos_qty: 1.0
+    move_type: direct
+    name: OUT/00007
+    type: out
 - 
-  I confirm the sale order.
+  I confirm the picking.
 - 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_01}     
+   !python {model: stock.picking}: |
+    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
+      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree")],
+      "active_id": ref("stock.menu_action_picking_tree"), })
+
 -
   I check the delay mentioned in pushed flow in move. 
 -  

From 482a8c763558ae1c9aecedcc3388128f290568b3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 12:10:34 +0530
Subject: [PATCH 126/138] [ADD] stock_location: Add the demo data

bzr revid: sbh@tinyerp.com-20101007064034-c9fr8t28uvzp7vap
---
 addons/stock_location/__openerp__.py          |  3 +-
 addons/stock_location/stock_location_demo.xml | 55 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 addons/stock_location/stock_location_demo.xml

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index bb9651bb1eb..a0d2118b754 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -79,7 +79,8 @@ product (i.e. the destination location of that procurement order).
     'depends': ['procurement','stock'],
     'init_xml': [],
     'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
-    'demo_xml': [],
+    'demo_xml': ['stock_location_demo.xml',],
+    
     'installable': True,
     'test':[
             'test/stock_location.yml'
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
new file mode 100644
index 00000000000..4c808f7e2e4
--- /dev/null
+++ b/addons/stock_location/stock_location_demo.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data noupdate="1">
+	
+		<record id="stock_location_path_0" model="stock.location.path">
+			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="1" name="delay"/>
+			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="stock_location_path_1" model="stock.location.path">
+			<field name="location_from_id" ref="stock.stock_location_output"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="1" name="delay"/>
+			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="product_pulled_flow_l0" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_id" ref="stock.stock_location_shop0"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">move</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_order</field>
+			<field name="picking_type">out</field>
+			<field name="name">L001</field>
+		</record>
+		<record id="product_pulled_flow_l1" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
+			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">move</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_order</field>
+			<field name="picking_type">out</field>
+			<field name="name">L002</field>
+		</record>
+		<record id="product_pulled_flow_l2" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_id" ref="stock.stock_location_suppliers"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">buy</field>
+			<field name="name">L003</field>
+		</record>
+	</data>
+</openerp>

From 0d207facc46c0fd4247595e928480890257b9c84 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 12:19:49 +0530
Subject: [PATCH 127/138] [IMP] stock_location: Imrpove  demo data

bzr revid: sbh@tinyerp.com-20101007064949-183ita9g1a83vlng
---
 addons/stock_location/stock_location_demo.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 4c808f7e2e4..f79026f66fc 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data noupdate="1">
-	
+	     <record id="product.product_product_cpu1" model="product.product">
+            <field name="description">This product use for  push/pull path </field>
+        </record>
 		<record id="stock_location_path_0" model="stock.location.path">
 			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>

From a431d9c3d80b56ce68480e6c82b6e09710687d56 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 14:29:17 +0530
Subject: [PATCH 128/138] [IMP] stock: set groups in menuitems

bzr revid: sbh@tinyerp.com-20101007085917-gw8835467p3uwgbx
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 93925e6a9da..d4e9cbc5dc0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -212,7 +212,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="base.group_extended"
+            groups="base.group_extended,group_stock_user"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -369,7 +369,7 @@
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="group_stock_user,group_stock_manager,base.group_extended"/>
 
         #
         # Lot composition (history)
@@ -529,7 +529,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended" sequence="20"/>
+        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>

From 05ed5b453100d4d0cbb09af0856be5978df82ce7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 10:46:10 +0530
Subject: [PATCH 129/138] [Fix] hr_attendance: Fix the pylint warning

bzr revid: sbh@tinyerp.com-20101008051610-glvci1rbuc5ytuyo
---
 addons/hr_attendance/report/timesheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index b0845422655..abedddd50c5 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -83,7 +83,6 @@ class report_custom(report_rml):
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if att['action'] == 'sign_out':
                             week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
-                        ldt = dt
 
                 # Week xml representation
                 week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]

From 2605be141302923ae37df3e36468af9407aa374f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 16:28:14 +0530
Subject: [PATCH 130/138] [IMP] Imrpove the demo data [ADD] Add new yml for
 push and pull flow and remove the old yml

bzr revid: sbh@tinyerp.com-20101008105814-9cc86y4h0hj12a5r
---
 addons/stock_location/__openerp__.py          |   6 +-
 addons/stock_location/stock_location_demo.xml |  53 +++-
 addons/stock_location/test/stock_location.yml | 271 ------------------
 .../test/stock_location_pull_flow.yml         | 226 +++++++++++++++
 .../test/stock_location_push_flow.yml         | 133 +++++++++
 5 files changed, 401 insertions(+), 288 deletions(-)
 delete mode 100644 addons/stock_location/test/stock_location.yml
 create mode 100644 addons/stock_location/test/stock_location_pull_flow.yml
 create mode 100644 addons/stock_location/test/stock_location_push_flow.yml

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index a0d2118b754..b4d6c5577ac 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -82,8 +82,10 @@ product (i.e. the destination location of that procurement order).
     'demo_xml': ['stock_location_demo.xml',],
     
     'installable': True,
-    'test':[
-            'test/stock_location.yml'
+    'test':[''
+            'test/stock_location.yml',
+            'test/stock_location_pull_flow.yml',
+            'test/stock_location_push_flow.yml',
             ],
     'active': False,
     'certificate': '0046505115101',
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index f79026f66fc..461579eabce 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -4,35 +4,58 @@
 	     <record id="product.product_product_cpu1" model="product.product">
             <field name="description">This product use for  push/pull path </field>
         </record>
-		<record id="stock_location_path_0" model="stock.location.path">
+		<record id="stock_location_input0" model="stock.location">
+			<field name="location_id" ref="stock.stock_location_company"/>
+			<field eval="0" name="scrap_location"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="usage">internal</field>
+			<field name="chained_location_type">none</field>
+			<field eval="1" name="active"/>
+			<field eval="27" name="parent_right"/>
+			<field name="name">Input</field>
+			<field name="chained_auto_packing">manual</field>
+			<field eval="26" name="parent_left"/>
+		</record>
+		<record id="stock_location_qualitytest0" model="stock.location">
+				<field name="location_id" ref="stock.stock_location_company"/>
+				<field eval="0" name="scrap_location"/>
+				<field name="company_id" ref="base.main_company"/>
+				<field name="usage">internal</field>
+				<field name="chained_location_type">none</field>
+				<field eval="1" name="active"/>
+				<field eval="25" name="parent_right"/>
+				<field name="name">Quality test</field>
+				<field name="chained_auto_packing">manual</field>
+				<field eval="24" name="parent_left"/>
+			</record> 
+		<record id="stock_location_path_3" model="stock.location.path">
 			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="auto">auto</field>
 			<field name="invoice_state">none</field>
 			<field eval="1" name="delay"/>
-			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
 			<field name="picking_type">out</field>
 		</record>
-		<record id="stock_location_path_1" model="stock.location.path">
-			<field name="location_from_id" ref="stock.stock_location_output"/>
+		<record id="stock_location_path_4" model="stock.location.path">
+			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="auto">auto</field>
 			<field name="invoice_state">none</field>
 			<field eval="1" name="delay"/>
+			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="stock_location_path_5" model="stock.location.path">
+			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="5" name="delay"/>
 			<field name="location_dest_id" ref="stock.stock_location_stock"/>
 			<field name="picking_type">out</field>
 		</record>
-		<record id="product_pulled_flow_l0" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_id" ref="stock.stock_location_shop0"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">move</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_order</field>
-			<field name="picking_type">out</field>
-			<field name="name">L001</field>
-		</record>
+		
 		<record id="product_pulled_flow_l1" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
diff --git a/addons/stock_location/test/stock_location.yml b/addons/stock_location/test/stock_location.yml
deleted file mode 100644
index 609d0af4147..00000000000
--- a/addons/stock_location/test/stock_location.yml
+++ /dev/null
@@ -1,271 +0,0 @@
-
--
-  In order to test the stock location module, I will create product, locations, SO, warehouse. 
-  
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_asset0}:
-    close_method: balance
-    code: asset
-    name: Asset
-    sign: 1
-    
-
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: income
-    name: Income
-    sign: 1
-    
-    
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: expense
-    name: Expense
-    sign: 1    
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_receivable0}:
-    close_method: balance
-    code: receivable
-    name: Receivable
-    sign: 1
--
- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: '40000'
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_left: 1
-    parent_right: 2
-    type: receivable
-    user_type: account_account_type_receivable0
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_payable0}:
-    code: '440000'
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_left: 3
-    parent_right: 4
-    type: payable
-    user_type: account_account_type_expense0    
-- 
-  Creating a account.journal record
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: pur
-    company_id: base.main_company
-    name: Purchase Journal
-    sequence_id:  account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_bank_view
-    
-- 
-  Creating a account.journal record
-- 
-  !record {model: account.journal, id: account_journal_salejouran0}:
-    code: sal
-    company_id: base.main_company
-    name: Sale Jouran
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
-    
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_expenseaccount0}:
-    code: Expe
-    company_id: base.main_company
-    currency_mode: current
-    name: Expense Account
-    parent_left: 5
-    parent_right: 6
-    type: consolidation
-    user_type: account_account_type_asset0
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_productsale0}:
-    code: '001'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Sale
-    type: other
-    user_type: account_account_type_income0
-
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Purchase
-    type: other
-    user_type: account_account_type_expense0
-        
-- 
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_shawtrust0}:
-    address:
-      - country_id: base.in    
-      - street: St James House, Vicar Lane, Sheffield
-    lang: en_US
-    name: 'Shaw Trust '
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0
--    
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_diasorinltd0}:
-    address:
-      - country_id: base.in
-        street: Ash House, Ash Road
-    name: DiaSorin Ltd
-    supplier: true
-    
-        
--
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
-    name: Micro Link Technologies
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0   
-    supplier: true        
-    
--
-  Creating a res.partner.address record
-- 
-  !record {model: res.partner.address, id: res_partner_address_0}:
-    country_id: base.in
-    partner_id: res_partner_microlinktechnologies0
-    street: Ash House, Ash Road
-    title: base.res_partner_title_miss
-    
-               
--     
-  Creating a product.category record
-- 
-  !record {model: product.category, id: product_category_computer0}:
-    name: Computer
--
-  Creating a stock.location record
-- 
-  !record {model: stock.location, id: stock_location_suppiler0}:
-    chained_auto_packing: auto
-    chained_delay: 15
-    chained_location_type: none
-    company_id: base.main_company
-    name: Suppiler1
-    usage: supplier
-- 
-
-  Creating a product.product record
-- 
-  !record {model: product.product, id: product_product_hpcdwriters0}:
-    categ_id: product_category_computer0
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: HP CD writers
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: res_partner_shawtrust0
-        min_qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    property_account_expense: account_account_productpurchase0
-    property_account_income: account_account_productsale0
-    path_ids:
-      - auto: auto
-        delay: 30
-        location_dest_id: stock.location_inventory
-        location_from_id: stock_location_suppiler0
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  Creating a stock.location record
-- 
-  !record {model: stock.location, id: stock_location_suppiler0}:
-    address_id: res_partner_address_0
-    chained_auto_packing: manual
-    chained_delay: 20
-    chained_location_type: none
-    company_id: base.main_company
-    name: Suppiler 1
-    usage: internal
--
-  I create warehouse.
-- 
-  !record {model: stock.warehouse, id: warehouse0}:
-    company_id: base.main_company
-    lot_input_id: stock.stock_location_stock
-    lot_output_id: stock_location_suppiler0
-    lot_stock_id: stock_location_suppiler0
-    name: OpenERP S.A.
-    partner_address_id: res_partner_address_0
-- 
-  I create outgoing picking order for HP CD writers.
-- 
-  !record {model: stock.picking, id: stock_picking_out0}:
-    address_id: base.res_partner_address_1
-    company_id: base.main_company
-    invoice_state: none
-    move_lines:
-      - date_expected: '2010-10-07 10:52:54'
-        location_dest_id: stock.stock_location_customers
-        location_id: stock_location_suppiler0
-        name: '[MB1] Mainboard ASUStek A7N8X'
-        product_id: product.product_product_mb1
-        product_qty: 1.0
-        product_uom: product.product_uom_unit
-        product_uos_qty: 1.0
-    move_type: direct
-    name: OUT/00007
-    type: out
-- 
-  I confirm the picking.
-- 
-   !python {model: stock.picking}: |
-    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {"lang": "en_US",
-      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
-      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree")],
-      "active_id": ref("stock.menu_action_picking_tree"), })
-
--
-  I check the delay mentioned in pushed flow in move. 
--  
-  !python {model: stock.move}: |
-    product_id=self.pool.get('product.product').search(cr,uid,[('name','=','HP CD writers')])
-    location_id=self.pool.get('stock.location').search(cr,uid,[('name','=','Inventory loss')])
-    move_ids =self.search(cr, uid, [('product_id','in',product_id),('location_dest_id','=',location_id)])
-    if move_ids:
-      move_obj=self.browse(cr,uid,move_ids)[0]
-      import time
-      from_dt = time.mktime(time.strptime(move_obj.date,'%Y-%m-%d %H:%M:%S'))
-      to_dt = time.mktime(time.strptime(move_obj.date_planned,'%Y-%m-%d %H:%M:%S'))
-      diff_day = (to_dt-from_dt)/(3600*24)
-      assert (round(diff_day)+1 ==30)    
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
new file mode 100644
index 00000000000..b51f82ae92c
--- /dev/null
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -0,0 +1,226 @@
+-
+  In order to test the product pulled flow , I create ,partner,product,procument 
+- 
+  I create a account type Asset.
+- 
+  !record {model: account.account.type, id: account_account_type_asset0}:
+    close_method: balance
+    code: asset
+    name: Asset
+    sign: 1
+- 
+  I create a account type income.
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: income
+    name: Income
+    sign: 1
+- 
+  I create a account type Expense.
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: expense
+    name: Expense
+    sign: 1    
+- 
+  I create a account type Receivable.
+- 
+  !record {model: account.account.type, id: account_account_type_receivable0}:
+    close_method: balance
+    code: receivable
+    name: Receivable
+    sign: 1
+-
+ 
+  I create a account  Receivable.
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: '40000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_left: 1
+    parent_right: 2
+    type: receivable
+    user_type: account_account_type_receivable0
+- 
+  I create a account  Payable.
+- 
+  !record {model: account.account, id: account_account_payable0}:
+    code: '440000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_left: 3
+    parent_right: 4
+    type: payable
+    user_type: account_account_type_expense0    
+- 
+  I create a Purchase Journal.
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: pur
+    company_id: base.main_company
+    name: Purchase Journal
+    sequence_id:  account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_bank_view
+    
+- 
+  I create a Sale Journal.
+- 
+  !record {model: account.journal, id: account_journal_salejouran0}:
+    code: sal
+    company_id: base.main_company
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+- 
+  I create a Sale Journal.
+- 
+  !record {model: account.account, id: account_account_expenseaccount0}:
+    code: Expe
+    company_id: base.main_company
+    currency_mode: current
+    name: Expense Account
+    parent_left: 5
+    parent_right: 6
+    type: consolidation
+    user_type: account_account_type_asset0
+- 
+  I create  Product Sale account.
+- 
+  !record {model: account.account, id: account_account_productsale0}:
+    code: '001'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Sale
+    type: other
+    user_type: account_account_type_income0
+
+- 
+  I create  Product Product Purchase.
+- 
+  !record {model: account.account, id: account_account_productpurchase0}:
+    code: '0002'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Purchase
+    type: other
+    user_type: account_account_type_expense0
+- 
+  I create  Supplier.
+- 
+  !record {model: res.partner, id: res_partner_shawtrust0}:
+    address:
+      - country_id: base.in    
+      - street: St James House, Vicar Lane, Sheffield
+    lang: en_US
+    name: 'Shaw Trust '
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0  
+-     
+  I create product category.
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+-
+  I create product and define the  pulled flow condition for stock move.
+  I set shipping type Sending Goods. and set Procurement type move.
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_shawtrust0
+        min_qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_productpurchase0
+    property_account_income: account_account_productsale0
+    flow_pull_ids:
+      - invoice_state: none
+        location_id: stock.stock_location_shop0
+        location_src_id: stock.stock_location_shop1
+        name: E001
+        partner_address_id: base.res_partner_address_2
+        picking_type: out
+        procure_method: make_to_stock
+        type_proc: move
+      - invoice_state: none
+        location_id: stock.stock_location_shop1
+        location_src_id: stock.stock_location_suppliers
+        name: E002
+        partner_address_id: base.res_partner_address_7
+        picking_type: out
+        procure_method: make_to_stock
+        type_proc: move
+      - invoice_state: none
+        location_id: stock.stock_location_suppliers
+        location_src_id: stock.stock_location_stock
+        name: E003
+        type_proc: buy
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    qty_available: 15
+-   
+  I create procurement order.
+- 
+  !record {model: procurement.order, id: procurement_order_test0}:
+    company_id: base.main_company
+    date_planned: '2010-10-07 18:24:24'
+    location_id: stock.stock_location_shop0
+    name: Testing pulled flow
+    priority: '1'
+    procure_method: make_to_order
+    product_id: product_product_hpcdwriters0
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos: product.product_uom_unit
+    product_uos_qty: 0.0
+- 
+  I confirm  procurement order.
+- 
+  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_test0}
+- 
+  I launch the scheduler to compute  procurement.
+-  
+  !python {model: procurement.order.compute.all}: |
+    proc_obj = self.pool.get('procurement.order')
+    proc_obj._procure_confirm(cr,uid)
+-
+  I check the state of procurement order is cancel and stock move is cancel.  
+-  
+  !python {model: procurement.order }: |  
+   from tools.translate import _   
+   procurement_ids=self.search(cr, uid, [('id', '=', ref('procurement_order_test0'))])
+   if procurement_ids:
+    order=self.browse(cr,uid,procurement_ids)[0]
+    assert(order.state=='cancel')  
+-
+  I check the new of procurement order  create .
+-
+  !python {model: procurement.order }: |  
+   from tools.translate import _   
+   procurement_ids=self.search(cr, uid, [('name','=','E001')])
+   assert len(procurement_ids), "Procurement order hasn't Created."  
+-
+  I check the Outgoing Picking  is create for source location Shop 2 and destination shop1.
+-
+  !python {model: stock.picking }: |
+    from tools.translate import _   
+    picking_id = self.search(cr, uid, [('origin','=','Testing pulled flow:E001'),('type','=','out')])
+    assert len(picking_id), "Picking  hasn't Created."  
+    
\ No newline at end of file
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
new file mode 100644
index 00000000000..480feae0b91
--- /dev/null
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -0,0 +1,133 @@
+-
+  In order to test the product pushed flow , I create account ,partner,product,shipment
+  Push flow specification indicates which location is chained with which location.
+-
+  I create product category.
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+        
+-
+  I create Supplier.
+- 
+  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
+    address:
+      - street: Kailash Vaibhav, Parksite
+    name: Micro Link Technologies
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0   
+    supplier: true        
+    
+-
+  I create Supplier address.
+- 
+  !record {model: res.partner.address, id: res_partner_address_0}:
+    country_id: base.in
+    partner_id: res_partner_microlinktechnologies0
+    street: Ash House, Ash Road
+    title: base.res_partner_title_miss
+    
+-
+  I create product and define the pushed flow .
+-
+  I set the chain location Supplier to stock Input
+  Stock Input to Quality test and Quality test -Stock  .  
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_diasorinltd0
+        min_qty: 5.0
+    path_ids:
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock_location.stock_location_input0
+        location_from_id: stock.stock_location_suppliers
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock_location.stock_location_qualitytest0
+        location_from_id: stock_location.stock_location_input0
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock.stock_location_stock
+        location_from_id: stock_location.stock_location_qualitytest0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+-
+  In order to test pushed flow .I buy the product from Micro Link Technologies supplier. I create a Picking.
+- 
+   !record {model: stock.picking , id: stock_picking_in0}:
+    address_id: res_partner_address_0
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - date_expected: '2010-10-08 15:36:53'
+        location_dest_id: stock_location.stock_location_input0
+        location_id: stock.stock_location_suppliers
+        name: 'HP CD writers'
+        product_id: product_product_hpcdwriters0
+        product_qty: 6.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 6.0
+    name: Pushed Flow Test
+    type: in
+-
+  I confirm picking.    
+-
+  !python {model: stock.picking }: |
+    self.draft_force_assign(cr, uid, [ref("stock_picking_in0")], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
+      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree4")],
+      "active_id": ref("stock.menu_action_picking_tree4"), })
+-
+  I check that the outgoing order of the supplier  is create with two move line.
+  Stock/Input To Quality test and Quality test  To Stock.  
+  I check the move is in waiting state.
+-  
+  !python {model: stock.picking }: |
+   from tools.translate import _
+   picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      for move in pick.move_lines:
+         assert(move.state == 'waiting'), _('Stock  is  not in waiting state')
+-
+  I receive the order of the supplier DiaSorin from the Incoming Shipments menu.
+-
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('address_id.partner_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      move =pick.move_lines[0]
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, picking_id,partial_datas)  
+-
+  I check the Outgoing Orders is automatically  done.
+-  
+  !python {model: stock.picking }: |
+   from tools.translate import _
+   picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      assert(pick.state == 'done'), _('Picking  is  not in done state')

From f0175be9248729074c4860c83decba78af59dd1d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 17:09:47 +0530
Subject: [PATCH 131/138] [IMP] Improve yml

bzr revid: sbh@tinyerp.com-20101008113947-b91cg9mnubkdh1n2
---
 addons/stock_location/__openerp__.py                    | 1 -
 addons/stock_location/test/stock_location_pull_flow.yml | 2 +-
 addons/stock_location/test/stock_location_push_flow.yml | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index b4d6c5577ac..befec3a55ae 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -83,7 +83,6 @@ product (i.e. the destination location of that procurement order).
     
     'installable': True,
     'test':[''
-            'test/stock_location.yml',
             'test/stock_location_pull_flow.yml',
             'test/stock_location_push_flow.yml',
             ],
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index b51f82ae92c..a6f7a8e913a 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the product pulled flow , I create ,partner,product,procument 
+  In order to test the product pulled flow , I create ,partner,product,procurement  
 - 
   I create a account type Asset.
 - 
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 480feae0b91..8463daf3196 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -42,7 +42,7 @@
     procure_method: make_to_stock
     seller_ids:
       - delay: 1
-        name: res_partner_diasorinltd0
+        name: res_partner_microlinktechnologies0
         min_qty: 5.0
     path_ids:
       - auto: auto
@@ -103,7 +103,7 @@
       for move in pick.move_lines:
          assert(move.state == 'waiting'), _('Stock  is  not in waiting state')
 -
-  I receive the order of the supplier DiaSorin from the Incoming Shipments menu.
+  I receive the order of the supplier Micro Link Technologies from the Incoming Shipments menu.
 -
   !python {model: stock.picking }: |
    import time

From 594c9f9357c13854d0ed93841b6e2283c039c690 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 17:27:11 +0530
Subject: [PATCH 132/138] [IMP] stock_location: Imrpove the demo data

bzr revid: sbh@tinyerp.com-20101008115711-3p5931w34aafjois
---
 addons/stock_location/__openerp__.py           |  2 +-
 addons/stock_location/stock_location_demo.xml  | 18 +++++++++++-------
 .../test/stock_location_push_flow.yml          |  3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index befec3a55ae..e5d6f767975 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -38,7 +38,7 @@ Typically this could be used to:
 * Help rental management, by generating automated return moves for rented products
 
 Once this module is installed, an additional tab appear on the product form, where you can add
-Push and Pull flow specifications.
+Push and Pull flow specifications. The demo data of  CPU1 product for that push/pull :
 
 Push flows
 ----------
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 461579eabce..012602735e7 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -56,25 +56,29 @@
 			<field name="picking_type">out</field>
 		</record>
 		
-		<record id="product_pulled_flow_l1" model="product.pulled.flow">
+		<record id="product_pulled_flow_l0" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="location_src_id" ref="stock.stock_location_stock"/>
+			<field name="location_id" ref="stock.stock_location_shop0"/>
+			<field name="partner_address_id" ref="base.main_address"/>
 			<field name="invoice_state">none</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="type_proc">move</field>
 			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_order</field>
+			<field name="procure_method">make_to_stock</field>
 			<field name="picking_type">out</field>
-			<field name="name">L002</field>
+			<field name="name">L001</field>
 		</record>
-		<record id="product_pulled_flow_l2" model="product.pulled.flow">
+		<record id="product_pulled_flow_l1" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="location_id" ref="stock.stock_location_suppliers"/>
 			<field name="invoice_state">none</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="type_proc">buy</field>
-			<field name="name">L003</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_stock</field>
+			<field name="picking_type">out</field>
+			<field name="name">L002</field>
 		</record>
 	</data>
 </openerp>
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 8463daf3196..989134c13bb 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -92,7 +92,8 @@
       "active_id": ref("stock.menu_action_picking_tree4"), })
 -
   I check that the outgoing order of the supplier  is create with two move line.
-  Stock/Input To Quality test and Quality test  To Stock.  
+  Stock/Input To Quality test and Quality test  To Stock.
+-
   I check the move is in waiting state.
 -  
   !python {model: stock.picking }: |

From 1b852f4de3a92c43a339116b2899cf9a1bcc73f0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 11 Oct 2010 11:25:09 +0530
Subject: [PATCH 133/138] [Fix]account_accountant : Fix the warining of pylint

bzr revid: sbh@tinyerp.com-20101011055509-j8bzy46nvuksp6p8
---
 addons/account_accountant/security/account_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 9daabddfef8..4aceb12d266 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="base.user_admin" model="res.users">
-            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
     </data>

From e322b982c67bdf68a84192b0643a5e204d765ae3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 11 Oct 2010 15:22:55 +0530
Subject: [PATCH 134/138] [Fix] stock: Stock move set readonly if state is done

bzr revid: sbh@tinyerp.com-20101011095255-c6qyw1t8rt2050h8
---
 addons/stock/stock.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9cd194175f7..c84862e7f59 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1442,16 +1442,16 @@ class stock_move(osv.osv):
         'create_date': fields.datetime('Creation Date', readonly=True),
         'date': fields.datetime('Date', required=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
         'date_expected': fields.datetime('Scheduled Date', required=True, help="Scheduled date for the processing of this move"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True,states={'done': [('readonly', True)]}),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
         'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM')),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
-        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
-        'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True, select=True, help="Location where the system will stock the finished products."),
+        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True,states={'done': [('readonly', True)]}, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
         'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
@@ -1462,7 +1462,7 @@ class stock_move(osv.osv):
         'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them", select=True),
         'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History (child moves)'),
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
-        'picking_id': fields.many2one('stock.picking', 'Picking List', select=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking List', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\

From 6a4845aee0a0c50b50d813993b7c513ad0898564 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:17:40 +0200
Subject: [PATCH 135/138] [FIX] procurement: corrected check in
 check_move_cancel

bzr revid: odo@openerp.com-20101011171740-1d47qzv071lzvtdz
---
 addons/procurement/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 318e572d597..62ff6cc961e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -163,7 +163,7 @@ class procurement_order(osv.osv):
         """ Checks if move is cancelled or not.
         @return: True or False.
         """
-        return all(procurement.move_id.state != 'cancel' for procurement in self.browse(cr, uid, ids))
+        return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids))
 
     def check_move_done(self, cr, uid, ids, context={}):
         """ Checks if move is done or not.

From 4c2125ca0acea5eb3ab52ac63f8dd38e6939b72c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:18:05 +0200
Subject: [PATCH 136/138] [IMP] stock_location: improved demo data for
 push/pull flows

bzr revid: odo@openerp.com-20101011171805-2bfar259c3bic9w8
---
 addons/stock_location/stock_location_demo.xml | 165 +++++++++---------
 1 file changed, 85 insertions(+), 80 deletions(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 012602735e7..f739f2325c5 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -1,84 +1,89 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-	     <record id="product.product_product_cpu1" model="product.product">
-            <field name="description">This product use for  push/pull path </field>
+    <data noupdate="1">
+         <record id="product.product_product_cpu1" model="product.product">
+            <field name="description">This product is configured with example of push/pull flows</field>
         </record>
-		<record id="stock_location_input0" model="stock.location">
-			<field name="location_id" ref="stock.stock_location_company"/>
-			<field eval="0" name="scrap_location"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="usage">internal</field>
-			<field name="chained_location_type">none</field>
-			<field eval="1" name="active"/>
-			<field eval="27" name="parent_right"/>
-			<field name="name">Input</field>
-			<field name="chained_auto_packing">manual</field>
-			<field eval="26" name="parent_left"/>
-		</record>
-		<record id="stock_location_qualitytest0" model="stock.location">
-				<field name="location_id" ref="stock.stock_location_company"/>
-				<field eval="0" name="scrap_location"/>
-				<field name="company_id" ref="base.main_company"/>
-				<field name="usage">internal</field>
-				<field name="chained_location_type">none</field>
-				<field eval="1" name="active"/>
-				<field eval="25" name="parent_right"/>
-				<field name="name">Quality test</field>
-				<field name="chained_auto_packing">manual</field>
-				<field eval="24" name="parent_left"/>
-			</record> 
-		<record id="stock_location_path_3" model="stock.location.path">
-			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="1" name="delay"/>
-			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
-			<field name="picking_type">out</field>
-		</record>
-		<record id="stock_location_path_4" model="stock.location.path">
-			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="1" name="delay"/>
-			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
-			<field name="picking_type">out</field>
-		</record>
-		<record id="stock_location_path_5" model="stock.location.path">
-			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="5" name="delay"/>
-			<field name="location_dest_id" ref="stock.stock_location_stock"/>
-			<field name="picking_type">out</field>
-		</record>
-		
-		<record id="product_pulled_flow_l0" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_src_id" ref="stock.stock_location_stock"/>
-			<field name="location_id" ref="stock.stock_location_shop0"/>
-			<field name="partner_address_id" ref="base.main_address"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">move</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_stock</field>
-			<field name="picking_type">out</field>
-			<field name="name">L001</field>
-		</record>
-		<record id="product_pulled_flow_l1" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_id" ref="stock.stock_location_suppliers"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">buy</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_stock</field>
-			<field name="picking_type">out</field>
-			<field name="name">L002</field>
-		</record>
-	</data>
+        <record id="stock_location_input0" model="stock.location">
+            <field name="location_id" ref="stock.stock_location_company"/>
+            <field eval="0" name="scrap_location"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="usage">internal</field>
+            <field name="chained_location_type">none</field>
+            <field name="name">Input</field>
+            <field name="chained_auto_packing">manual</field>
+        </record>
+        <record id="stock_location_qualitytest0" model="stock.location">
+                <field name="location_id" ref="stock.stock_location_company"/>
+                <field eval="0" name="scrap_location"/>
+                <field name="company_id" ref="base.main_company"/>
+                <field name="usage">internal</field>
+                <field name="chained_location_type">none</field>
+                <field name="name">Quality test</field>
+                <field name="chained_auto_packing">manual</field>
+        </record>
+        <record id="stock.warehouse0" model="stock.warehouse">
+            <field name="lot_input_id" ref="stock_location_input0"/>
+        </record>
+        <record id="stock_location_path_3" model="stock.location.path">
+            <field name="location_from_id" ref="stock.stock_location_suppliers"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="1" name="delay"/>
+            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
+            <field name="picking_type">out</field>
+        </record>
+        <record id="stock_location_path_4" model="stock.location.path">
+            <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="1" name="delay"/>
+            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
+            <field name="picking_type">out</field>
+        </record>
+        <record id="stock_location_path_5" model="stock.location.path">
+            <field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="5" name="delay"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="picking_type">out</field>
+        </record>
+
+        <record id="product_pulled_flow_l0" model="product.pulled.flow">
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_id" ref="stock.stock_location_shop0"/>
+            <field name="partner_address_id" ref="base.main_address"/>
+            <field name="invoice_state">none</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="type_proc">move</field>
+            <field eval="0" name="cancel_cascade"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="picking_type">internal</field>
+            <field name="name">L001</field>
+        </record>
+        <record id="product_pulled_flow_l1" model="product.pulled.flow">
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="location_id" ref="stock.stock_location_suppliers"/>
+            <field name="invoice_state">none</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="type_proc">buy</field>
+            <field eval="0" name="cancel_cascade"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="picking_type">out</field>
+            <field name="name">L002</field>
+        </record>
+        <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
+            <field name="product_max_qty">10.0</field>
+            <field name="product_min_qty">20.0</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
+            <field name="location_id" ref="stock.stock_location_shop0"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
+        </record>
+    </data>
 </openerp>

From aa27e8aae4be8d5f88b738868925b3e6051c3728 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:59:58 +0200
Subject: [PATCH 137/138] [IMP] stock_location: improved demo data for min
 stock rules

bzr revid: odo@openerp.com-20101011175958-g4vnek9v99i1klsl
---
 addons/stock_location/stock_location_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index f739f2325c5..a828eb76f2d 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -78,8 +78,8 @@
             <field name="name">L002</field>
         </record>
         <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">10.0</field>
-            <field name="product_min_qty">20.0</field>
+            <field name="product_max_qty">20.0</field>
+            <field name="product_min_qty">10.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>

From 9e5a2d4e2706b897d518cfc4102533d24a876e09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 21:16:13 +0200
Subject: [PATCH 138/138] [FIX] stock: correct destination location for order
 point + autovalidate chained moves for procurements

bzr revid: odo@openerp.com-20101011191613-aw9753wodzb57wq2
---
 addons/procurement/procurement.py | 1 +
 addons/procurement/schedulers.py  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index ce59251b9fc..c8cb8f460f0 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -331,6 +331,7 @@ class procurement_order(osv.osv):
                         'date_expected': procurement.date_planned,
                         'state': 'draft',
                         'company_id': procurement.company_id.id,
+                        'auto_validate': True,
                     })
                     move_obj.action_confirm(cr, uid, [id], context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 777a8de45cc..06cbb86957a 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -241,7 +241,7 @@ class procurement_order(osv.osv):
                             'product_id': op.product_id.id,
                             'product_qty': qty,
                             'product_uom': op.product_uom.id,
-                            'location_id': op.warehouse_id.lot_input_id.id,
+                            'location_id': op.location_id.id,
                             'procure_method': 'make_to_order',
                             'origin': op.name
                         })