From eafc82a2eb662cca3832507b977e9d8b74133f7b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 17:56:10 +0530
Subject: [PATCH 1/5] [IMP]:  Unrecieved product Improve the view

bzr revid: sbh@tinyerp.com-20100621122610-x3bbplo0tocnbch2
---
 addons/stock/stock_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 31579978ba8..72db0c2a06f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -550,13 +550,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Entry Lines">
+                	<group height="200" width="500">
                     <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
                     <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"/><newline/>
+                    <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 name="action_move" string="Add" type="object" icon="gtk-add"/>
                     </group>
+                    </group>
                 </form>
                </field>
         </record>

From 16304581b52e7e174c452a6ed8157c9cf12dc52a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 18:10:27 +0530
Subject: [PATCH 2/5] [IMP] stock: Improve the view of Split in lots

bzr revid: sbh@tinyerp.com-20100621124027-l598mf63e2izg900
---
 addons/stock/wizard/stock_move_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 71626e7d161..32c234c38e9 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -103,7 +103,8 @@
 	            <field name="model">stock.move.split</field>
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
-              <form string="Split in lots">
+				<form string="Split in lots">
+				<group width="660" height="300">
                   <field name="product_id" colspan="4" readonly="1"/>
                   <newline/>
                   <group colspan="4" col="4">
@@ -148,6 +149,7 @@
 	                		string="Cancel" />
 	                	<button name="split_lot" string="Ok"
 	                		type="object" icon="gtk-ok" />
+					</group>	                		
 	                </form>
 	            </field>
 	        </record>

From 417a94d199a65cd10666aad44c3d832ad4b62ad7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 18:13:05 +0530
Subject: [PATCH 3/5] [IMP] stock: Improve the view of Split in lots

bzr revid: sbh@tinyerp.com-20100621124305-gsilce359d4lommn
---
 addons/stock/wizard/stock_move_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 32c234c38e9..a8267213f0a 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -104,7 +104,7 @@
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
 				<form string="Split in lots">
-				<group width="660" height="300">
+				<group width="660" height="275">
                   <field name="product_id" colspan="4" readonly="1"/>
                   <newline/>
                   <group colspan="4" col="4">

From 26d0a0d6eeeae5e0337e0600c059208381b2a36c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 18:27:32 +0530
Subject: [PATCH 4/5] [IMP] stock: Improve the view of Production Lot Revisions

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

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 72db0c2a06f..440af030fa3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -213,7 +213,8 @@
                     <newline/>
                     <field name="author_id" readonly="1"/>
                     <newline/>
-                    <field name="description"/>
+					<separator string="Description" colspan="4"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>

From de589d0d73f81d5d116b04d50148c0ccfdbbbbd7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 21 Jun 2010 19:36:24 +0530
Subject: [PATCH 5/5] [Fix] stock_planning: Fix the problem of department_user

bzr revid: sbh@tinyerp.com-20100621140624-dogb0z6rdwd84gj4
---
 addons/stock_planning/stock_planning.py       | 2 +-
 addons/stock_planning/stock_planning_view.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index ef9fa7e65dd..1fa6ccc7f17 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -412,7 +412,7 @@ class stock_sale_forecast(osv.osv):
                     dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
                     dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
                     dept_ids_set = ','.join(map(str,dept_ids))
-                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" %(tuple(dept_ids_set),))
+                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN (%s))" %(dept_ids_set,))
                     dept_users = [x for x, in cr.fetchall()]
                     dept_users_set =  ','.join(map(str,dept_users))
                 else:
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index e4200cb3d7b..49b384794f2 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -161,7 +161,6 @@
                         <label string = "Per User :"/>
                         <label string = "Per Department :"/>
                         <label string = "Per Warehouse :"/>
-                        <label string = "Per Company :"/>
                         <label string = "Periods :"/>
                         <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
                         <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />