From 780a261720fc9fef9fabb174607e28f5c44c4831 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 25 Aug 2010 15:10:32 +0530
Subject: [PATCH 1/5] [IMP] process: Improved views of Process and Process
 Nodes.

bzr revid: uco@tinyerp.com-20100825094032-9qch22uc1a9nxiql
---
 addons/process/process_view.xml | 98 ++++++++++++---------------------
 1 file changed, 34 insertions(+), 64 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 2b94827ce1a..3a5e9ffdbf6 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -15,10 +15,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
+                <group colspan="4" col="6">
+                    <field name="name"/>
+                    <field name="model_id"/>
                     <field name="active"/>
-                    <field name="model_id" select="1"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Nodes">
@@ -180,80 +180,50 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
-                    <field name="flow_start"/>
+                <group colspan="4" col="6">
+                    <field name="name"/>
                     <field name="process_id"/>
                     <newline/>
+                    <field name="kind" select="1"/>
+                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    <field name="flow_start"/>
+                </group>
+                <separator string="Properties" colspan="4"/>
+                <group colspan="4" col="6">
                     <field name="model_id" select="1"/>
                     <field name="menu_id"/>
-                    <newline/>
-                    <field name="kind" select="1"/>
                     <field name="help_url" widget="url"/>
-                    <field name="model_states"/>
-                    <field name="subflow_id" attrs="{'readonly':[('kind','=','state')]}"/>
                 </group>
-                <notebook colspan="4">
-                    <page string="Outgoing Transitions">
-                        <field name="transition_out" colspan="4" nolabel="1">
-                            <tree string="Transitions">
+                <separator string="Conditions" colspan="4"/>
+                <field name="model_states"/>
+                <field name="condition_ids" nolabel="1" colspan="4">
+	                <tree string="Other Conditions" editable="1">
+	                    <field name="name"/>
+	                    <field name="model_id"/>
+	                    <field name="model_states"/>
+	                </tree>
+                </field>
+                <separator string="Transitions" colspan="4"/>
+                <group colspan="4" col="4">
+                    <group colspan="2" col="2">
+                        <field name="transition_in" nolabel="1">
+                            <tree string="Incoming Transitions">
                                 <field name="name"/>
                                 <field name="target_node_id"/>
                             </tree>
-                            <form string="Transition">
-                                <group colspan="4" string="Details">
-                                    <field name="name"/>
-                                    <newline/>
-                                    <field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Buttons">
-                                        <field name="action_ids" colspan="4" nolabel="1">
-                                            <tree string="Actions">
-                                                <field name="name"/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </tree>
-                                            <form string="Actions">
-                                                <field name="name" colspan="4"/>
-                                                <newline/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </form>
-                                        </field>
-                                    </page>
-                                    <page string="Roles Required">
-                                        <field name="role_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Roles from Workflow">
-                                        <field name="transition_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Extra Information">
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
                         </field>
-                    </page>
-                    <page string="Conditions">
-                        <field name="condition_ids" nolabel="1" colspan="4">
-                            <tree string="Conditions">
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="transition_out" nolabel="1">
+                            <tree string="Outgoing Transitions">
                                 <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="model_states"/>
+                                <field name="source_node_id"/>
                             </tree>
-                            <form string="Condition">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <newline/>
-                                <field name="model_states" colspan="4"/>
-                            </form>
                         </field>
-                    </page>
-                    <page string="Extra Information">
-                        <field name="note" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
+                    </group>
+                </group>
+                <separator string="Notes" colspan="4"/>        
+                <field name="note" nolabel="1" colspan="4"/>
             </form>
         </field>
     </record>

From d4954fd1a65924e748871de9bdd3178b67dfaf98 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 26 Aug 2010 10:20:46 +0530
Subject: [PATCH 2/5] [IMP] process: Small change.

bzr revid: uco@tinyerp.com-20100826045046-t34o0pofyftwd51t
---
 addons/process/process_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 3a5e9ffdbf6..d28b4ae30eb 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -197,7 +197,7 @@
                 <separator string="Conditions" colspan="4"/>
                 <field name="model_states"/>
                 <field name="condition_ids" nolabel="1" colspan="4">
-	                <tree string="Other Conditions" editable="1">
+	                <tree string="Other Conditions" editable="top">
 	                    <field name="name"/>
 	                    <field name="model_id"/>
 	                    <field name="model_states"/>

From 0b1d4ab941c294662d074a10e2c34f7e041b7be9 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 26 Aug 2010 11:21:17 +0530
Subject: [PATCH 3/5] [IMP] process: Improved view of Process Node.

bzr revid: uco@tinyerp.com-20100826055117-s77uwrydwb50zyy6
---
 addons/process/process_view.xml | 77 ++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index d28b4ae30eb..ead05446f25 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -188,42 +188,47 @@
                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
                     <field name="flow_start"/>
                 </group>
-                <separator string="Properties" colspan="4"/>
-                <group colspan="4" col="6">
-                    <field name="model_id" select="1"/>
-                    <field name="menu_id"/>
-                    <field name="help_url" widget="url"/>
-                </group>
-                <separator string="Conditions" colspan="4"/>
-                <field name="model_states"/>
-                <field name="condition_ids" nolabel="1" colspan="4">
-	                <tree string="Other Conditions" editable="top">
-	                    <field name="name"/>
-	                    <field name="model_id"/>
-	                    <field name="model_states"/>
-	                </tree>
-                </field>
-                <separator string="Transitions" colspan="4"/>
-                <group colspan="4" col="4">
-                    <group colspan="2" col="2">
-                        <field name="transition_in" nolabel="1">
-                            <tree string="Incoming Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                        </field>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="transition_out" nolabel="1">
-                            <tree string="Outgoing Transitions">
-                                <field name="name"/>
-                                <field name="source_node_id"/>
-                            </tree>
-                        </field>
-                    </group>
-                </group>
-                <separator string="Notes" colspan="4"/>        
-                <field name="note" nolabel="1" colspan="4"/>
+                <notebook colspan="4">
+	                <page string="Properties">
+		                <group colspan="4" col="6">
+		                    <field name="model_id" select="1"/>
+		                    <field name="menu_id"/>
+		                    <field name="help_url" widget="url"/>
+		                </group>
+		                <separator string="Conditions" colspan="4"/>
+		                <field name="model_states"/>
+		                <field name="condition_ids" nolabel="1" colspan="4">
+			                <tree string="Other Conditions" editable="top">
+			                    <field name="name"/>
+			                    <field name="model_id"/>
+			                    <field name="model_states"/>
+			                </tree>
+		                </field>
+		            </page>
+	                <page string="Transitions">
+		                <group colspan="4" col="4">
+		                    <group colspan="2" col="2">
+		                        <field name="transition_in" nolabel="1" height="400">
+		                            <tree string="Incoming Transitions">
+		                                <field name="name"/>
+		                                <field name="source_node_id"/>
+		                            </tree>
+		                        </field>
+		                    </group>
+		                    <group colspan="2" col="2">
+		                        <field name="transition_out" nolabel="1" height="400">
+		                            <tree string="Outgoing Transitions">
+		                                <field name="name"/>
+		                                <field name="target_node_id"/>
+		                            </tree>
+		                        </field>
+		                    </group>
+		                </group>
+		            </page>
+	                <page string="Notes">        
+	                   <field name="note" nolabel="1" colspan="4"/>
+	                </page>
+	            </notebook>
             </form>
         </field>
     </record>

From a97545d4fe30ecbb940f73c71fcb9f735f6f61de Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 26 Aug 2010 16:15:28 +0530
Subject: [PATCH 4/5] [ADD] board: Added search view for Dashboard definition.

bzr revid: uco@tinyerp.com-20100826104528-ixwr6sdxyqi90u1u
---
 addons/board/board_view.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 79e3ff5dd9d..984a17caa51 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -88,7 +88,7 @@
             <field eval="1" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Dashboard">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <button colspan="2"
                         name="%(action_board_menu_create)d"
                         string="Create Menu" type="action"
@@ -113,6 +113,18 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_board_search" model="ir.ui.view">
+            <field name="name">board.board.search</field>
+            <field name="model">board.board</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Dashboard">
+                    <field name="name"/>
+                    <field name="line_ids"/>
+                </search>
+            </field>
+        </record>
 
     <!-- Action for DashBoard Definition form -->
 
@@ -121,6 +133,7 @@
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_board_search"/>
         </record>
 
         <menuitem

From 6a7868c19fdd5d5a46b99c2e6d795375fd5b042e Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 30 Aug 2010 10:05:34 +0530
Subject: [PATCH 5/5] [IMP] mrp: Improved procurement yaml.

bzr revid: uco@tinyerp.com-20100830043534-7sgh7p4o6nb75bad
---
 addons/mrp/test/mrp_procurement.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index cf9e5d9cb50..5ce256ab7d9 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -318,7 +318,7 @@
     from tools.translate import _
     prod_obj = self.pool.get('mrp.production')
     prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
-    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+    self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
 -
   I create record for remaining products with quantity 35.00.
 -
@@ -334,7 +334,7 @@
     from tools.translate import _
     stock_obj = self.pool.get('stock.move')
     stock_ids = stock_obj.search(cr, uid, [('product_id.name','=','Buttons')])
-    self.do_move_consume(cr, uid, [1], context={'active_ids': stock_ids})
+    self.do_move_consume(cr, uid, [ref('stock_move_consume0')], context={'active_ids': stock_ids})
 -
   And finally production order is done.
 -