From 1a61a20dbbc0ea716aed59b3d71374a8a2b2e4fc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 29 Jun 2012 17:53:47 +0530
Subject: [PATCH 1/9] [IMP] stock : Destination address should be the company
 by default.

bzr revid: mdi@tinyerp.com-20120629122347-iswqb89471fas9gg
---
 addons/stock/stock.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a279b8bea6c..1407f96f05b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1726,10 +1726,16 @@ class stock_move(osv.osv):
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
         return location_id
+    
+    def _default_destination_address(self, cr, uid, context=None):
+        partner_obj = self.pool.get('res.partner')
+        partner_ids = partner_obj.search(cr, uid, [('name', '=', 'Your Company')], context=context)
+        return partner_ids and partner_ids[0] or False
 
     _defaults = {
         'location_id': _default_location_source,
         'location_dest_id': _default_location_destination,
+        'partner_id': _default_destination_address,
         'state': 'draft',
         'priority': '1',
         'product_qty': 1.0,

From eb2d0483ce746fbbbba2a12333f027bc3299ba3a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 2 Jul 2012 10:58:16 +0530
Subject: [PATCH 2/9] [IMP] procurement, stock : Added groups to restrict the
 fields.

bzr revid: mdi@tinyerp.com-20120702052816-ct29279dygwg1mgl
---
 addons/procurement/procurement_view.xml | 8 ++++----
 addons/stock/stock_view.xml             | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fde8b4ea2fe..f9d9f3533e1 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -170,10 +170,10 @@
             <field name="arch" type="xml">
                 <tree string="Reordering Rules">
                     <field name="name"/>
-                    <field name="warehouse_id"/>
+                    <field name="warehouse_id" groups="stock.group_locations"/>
                     <field name="location_id" groups="stock.group_locations"/>
                     <field name="product_id"/>
-                    <field name="product_uom"/>
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="product_min_qty"/>
                     <field name="product_max_qty"/>
                 </tree>
@@ -216,8 +216,8 @@
                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
                             </group>
                             <group>
-                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                                <field name="product_uom"/>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
+                                <field name="product_uom" groups="product.group_uom"/>
                                 <field name="location_id" groups="stock.group_locations"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3107f0c9f14..5ab99bf789a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -139,7 +139,7 @@
                     <page string="General Informations">
                         <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
-                                <field domain="[('usage','=','internal')]" name="location_id"/>
+                                <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom" groups="product.group_uom"/>
@@ -1258,7 +1258,7 @@
 
                         </group>
                         <group>
-                            <label for="tracking_id"/>
+                            <label for="tracking_id" groups="stock.group_tracking_lot"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
@@ -1266,7 +1266,7 @@
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed"/>
                             </div>
-                            <label for="prodlot_id"/>
+                            <label for="prodlot_id" groups="stock.group_production_lot"/>
                             <div>
                                 <field name="prodlot_id" groups="stock.group_production_lot"
                                     context="{'location_id':location_id, 'product_id':product_id}"
@@ -1425,7 +1425,7 @@
                                 icon="gtk-convert" context="{'scrap': True}"
                                 states="draft,waiting,confirmed,assigned"/>
                         </div>
-                        <label for="product_uos_qty"/>
+                        <label for="product_uos_qty" groups="product.group_uos"/>
                         <div>
                             <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>

From 2796fded5d3b6403008421cab94d05196be1836c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 3 Jul 2012 15:51:18 +0530
Subject: [PATCH 3/9] [IMP] stock : Destination address should be company by
 default.

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

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1407f96f05b..4e5cce3234e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1728,9 +1728,11 @@ class stock_move(osv.osv):
         return location_id
     
     def _default_destination_address(self, cr, uid, context=None):
-        partner_obj = self.pool.get('res.partner')
-        partner_ids = partner_obj.search(cr, uid, [('name', '=', 'Your Company')], context=context)
-        return partner_ids and partner_ids[0] or False
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
+        partner_id = company_obj.browse(cr, uid, company_id, context=context).partner_id.id
+        return partner_id
 
     _defaults = {
         'location_id': _default_location_source,

From 1cefa6c529d0c0ce112ce0be42fa5cbbc055ac40 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 3 Jul 2012 16:10:42 +0530
Subject: [PATCH 4/9] [IMP] stock : Improved the code.

bzr revid: mdi@tinyerp.com-20120703104042-zdl2ohizu6lhhbe5
---
 addons/stock/stock.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4e5cce3234e..59ca3af6287 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1728,10 +1728,8 @@ class stock_move(osv.osv):
         return location_id
     
     def _default_destination_address(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        company_obj = self.pool.get('res.company')
-        company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
-        partner_id = company_obj.browse(cr, uid, company_id, context=context).partner_id.id
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        partner_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).partner_id.id
         return partner_id
 
     _defaults = {

From 61d3ca3044900ac27a5a93c59790f9c656ad7c5b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 10 Jul 2012 13:59:43 +0530
Subject: [PATCH 5/9] [IMP] stock : Fix the broken view.

bzr revid: mdi@tinyerp.com-20120710082943-9vx7cxwqai03sp94
---
 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 bf635c6e39e..221c18274a2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1426,7 +1426,7 @@
                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
                         </div>
                         <label for="product_uos_qty" groups="product.group_uos"/>
-                        <div>
+                        <div groups="product.group_uos">
                             <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
                             <field name="product_uos" groups="product.group_uos" class="oe_inline"/>

From 86c430370131a8faf33b9d9c9a2d01eb4aee08d2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 10 Jul 2012 14:17:22 +0530
Subject: [PATCH 6/9] [IMP] stock : Removed the groups from individual fields.

bzr revid: mdi@tinyerp.com-20120710084722-pcntgcu923znjkvf
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 221c18274a2..806d4a215eb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1427,9 +1427,9 @@
                         </div>
                         <label for="product_uos_qty" groups="product.group_uos"/>
                         <div groups="product.group_uos">
-                            <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
+                            <field name="product_uos_qty" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                            <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
+                            <field name="product_uos" class="oe_inline"/>
                         </div>
                         <field name="name" string="Reason"/>
                         <field name="company_id" groups="base.group_multi_company"/>

From 102049d6b0f6c7c29d0eeb140630fcfe03fb5f53 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 18 Jul 2012 12:25:11 +0530
Subject: [PATCH 7/9] [IMP] stock : Traceability section must go to tracking
 lot group.

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

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 81484e0f5a3..f0f0e989e87 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1268,23 +1268,22 @@
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                             <field name="date" groups="base.group_no_one" />
                         </group>
-                        <group string="Tracability">
-                            <label for="tracking_id" groups="stock.group_tracking_lot"/>
+                        <group string="Tracability" groups="stock.group_tracking_lot">
+                            <label for="tracking_id"/>
                             <div>
-                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed"/>
                             </div>
-                            <label for="prodlot_id" groups="stock.group_production_lot"/>
+                            <label for="prodlot_id"/>
                             <div>
-                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
-                                    groups="stock.group_tracking_lot"
                                     states="draft,waiting,confirmed,assigned"
                                     string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
                             </div>

From 82f87ca7f99ae0eb142dc9eaebba995e1447634a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Jul 2012 15:51:27 +0200
Subject: [PATCH 8/9] [IMP] stock: simplify double browse used for chaining
 relations

bzr revid: rco@openerp.com-20120725135127-6y3km4b35ebx96lr
---
 addons/stock/stock.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 59ca3af6287..6d8f6bb6fec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1728,9 +1728,8 @@ class stock_move(osv.osv):
         return location_id
     
     def _default_destination_address(self, cr, uid, context=None):
-        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        partner_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).partner_id.id
-        return partner_id
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.company_id.partner_id.id
 
     _defaults = {
         'location_id': _default_location_source,

From c24ce8448d7c03f842a0c56c9f224a201884b6a4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Jul 2012 16:30:16 +0200
Subject: [PATCH 9/9] [IMP] stock: fix groups in views

bzr revid: rco@openerp.com-20120725143016-aukz7yf3ksw94qsx
---
 addons/stock/stock_view.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f23437de3dc..d4acd4906ad 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1266,21 +1266,23 @@
                         </group>
                         <group name="destination_grp" string="Destination">
                             <field name="location_dest_id" groups="stock.group_locations"/>
-                            <field name="partner_id" context="{'contact_display':'partner'}"/>
+                            <field name="partner_id" context="{'contact_display':'partner'}"
+                                groups="stock.group_locations"/>
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                             <field name="date" groups="base.group_no_one"/>
                         </group>
-                        <group string="Tracability" groups="stock.group_tracking_lot">
-                            <label for="tracking_id"/>
-                            <div>
+                        <group string="Tracability"
+                            groups="stock.group_tracking_lot,stock.group_production_lot">
+                            <label for="tracking_id" groups="stock.group_tracking_lot"/>
+                            <div groups="stock.group_tracking_lot">
                                 <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed"/>
                             </div>
-                            <label for="prodlot_id"/>
-                            <div>
+                            <label for="prodlot_id" groups="stock.group_production_lot"/>
+                            <div groups="stock.group_production_lot">
                                 <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"