From 3222e81ef687c88237af4171a656b24c874d4bd9 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 16:11:04 +0530
Subject: [PATCH 1/5] [IMP]Improve product actions

bzr revid: vja@tinyerp.com-20130220104104-91l7ox1rie02ap3p
---
 .../account_analytic_default_view.xml         | 24 ++++++++-----
 addons/mrp/mrp_view.xml                       | 36 ++++++++-----------
 .../wizard/product_margin_view.xml            | 26 +++++++++-----
 addons/purchase/purchase_view.xml             | 20 +++++------
 addons/sale/sale_view.xml                     | 25 ++++++++-----
 addons/stock/product_view.xml                 |  4 +++
 addons/stock/report/report_stock_view.xml     |  7 ----
 addons/stock/stock_view.xml                   | 25 ++++++-------
 8 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index ff09fb4b0db..d2b6a13d046 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -68,6 +68,22 @@
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
             <field name="context">{"search_default_current":1}</field>
         </record>
+        
+        <record id="action_product_default_list" model="ir.actions.act_window">
+            <field name="name">Analytic Defaults</field>
+            <field name="res_model">account.analytic.default</field>
+            <field name="context">{'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_default_analytic_button">
+            <field name="name">product.product.stock.move</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Analytic Rules" name= "%(action_product_default_list)d" type="action" groups="analytic.group_analytic_accounting" />
+                </xpath>
+            </field>
+        </record>
 
         <act_window
             name="Entries"
@@ -99,13 +115,5 @@
             context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
             groups="analytic.group_analytic_accounting"/>
 
-        <act_window
-            name="Analytic Rules"
-            res_model="account.analytic.default"
-            id="analytic_rule_action_product"
-            src_model="product.product"
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            groups="analytic.group_analytic_accounting"/>
-
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 00e8369e6b7..02d7945fd29 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -980,26 +980,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_product_id': [active_id]}"
-            id="act_product_manufacturing_open"
-            name="Manufacturing Orders"
-            view_id="mrp_production_tree_view"
-            res_model="mrp.production"
-            src_model="product.product"/>
-
-        <act_window
-            id="action_product_bom_structure"
-            name="Product BoM Structure"
-            domain="[('product_id', 'in', active_ids),('bom_id','=',False)]"
-            context="{'default_product_id': active_id}"
-            view_type="tree"
-            view_mode="tree"
-            view_id="mrp_bom_tree_view"
-            res_model="mrp.bom"
-            src_model="product.product"
-            groups="mrp.group_mrp_user"/>
-
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
@@ -1034,14 +1014,24 @@
                 id="menu_mrp_production_order_action" name="Order Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
-
+        <record id="act_product_mrp_bom_open" model="ir.actions.act_window">
+            <field name="name">Product BoM Structure</field>
+            <field name="context">{'default_product_id': active_id}</field>
+            <field name="domain">[('product_id', 'in', active_ids),('bom_id','=',False)]</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
         <record model="ir.actions.act_window" id="product_open_bom">
             <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
             <field name="name">Bill of Materials</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="res_model">mrp.bom</field>
         </record>
-
+        <record id="act_product_mrp_production" model="ir.actions.act_window">
+            <field name="context">{'search_default_product_id': [active_id]}</field>
+            <field name="name">Manufacturing Orders</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_id" ref="mrp_production_tree_view"/>
+        </record>
         <record model="ir.ui.view" id="product_form_view_bom_button">
             <field name="name">product.product.procurement</field>
             <field name="model">product.product</field>
@@ -1049,6 +1039,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                    <button string="Product BoM Structure" name="%(act_product_mrp_bom_open)d" type="action" groups="mrp.group_mrp_user"/>
+                    <button string="Manufacturing Orders" name="%(act_product_mrp_production)d" type="action" groups="mrp.group_mrp_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 7c11133ce7d..6ee3a7ddc20 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -19,14 +19,22 @@
                 </form>
             </field>
         </record>
-
-        <act_window name="Product Margins"
-            res_model="product.margin"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="product_margin_act_window"/>
-
+        <record id="action_product_margin_form" model="ir.actions.act_window">
+            <field name="name">Product Margins</field>
+            <field name="res_model">product.margin</field>
+            <field name="src_model">product.product</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_margin">
+             <field name="name">product.product.margin</field>
+             <field name="model">product.product</field>
+             <field name="inherit_id" ref="product.product_normal_form_view"/>
+             <field name="arch" type="xml">
+                 <xpath expr="//div[@name='buttons']" position="inside">
+                     <button string="Product Margins" name="%(action_product_margin_form)d" type="action" groups="base.group_sale_manager"/>
+                 </xpath>
+             </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3317c3bde59..dea558abeef 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -492,15 +492,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="action_purchase_line_product_tree"
-            name="Purchases"
-            res_model="purchase.order.line"
-            src_model="product.product"
-            groups="purchase.group_purchase_user"/>
-
-
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
@@ -613,12 +604,20 @@
                 </field>
             </field>
         </record>
-  
+        <record model="ir.actions.act_window" id="action_purchase_line_product_tree">
+            <field name="context">{'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+            <field name="name">Purchases</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+        </record>
         <record id="view_product_account_purchase_ok_form" model="ir.ui.view">
             <field name="name">product.account.purchase.ok.form.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                   <button string="Purchase" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
+                </xpath>
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
                      <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
                 </xpath>
@@ -627,6 +626,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 18fdb739923..f35b3c94168 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -538,15 +538,22 @@
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
             <field name="filter" eval="True"/>
         </record>
-
-        <act_window
-            context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
-            id="action_order_line_product_tree"
-            name="Sales Order Lines"
-            res_model="sale.order.line"
-            src_model="product.product"
-            groups="base.group_sale_salesman"/>
-
+        <record id="action_order_line_product_tree" model="ir.actions.act_window">
+            <field name="context">{'search_default_product_id': active_id, 'default_product_id': active_id}</field>
+            <field name="name">Sales Order Lines</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_id" ref="view_order_line_tree"/>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_sale_order_button">
+            <field name="name">product.product.sale.order</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Sales Order Lines" name="%(action_order_line_product_tree)d" type="action" groups="base.group_sale_salesman"/>
+                </xpath>
+            </field>
+        </record>
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
         <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 594843eff8d..b40809071ee 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -68,6 +68,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}"  groups="base.group_locations"/>
+                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="base.group_stock_user"/>
+                </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">
                         <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index f56d738636d..e8bb6621355 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <act_window
-            context="{'product_id': active_id}"
-            id="act_stock_product_location_open"
-            name="Stock by Location"
-            res_model="stock.location"
-            src_model="product.product"/>
-
         <act_window
             domain="[('tracking_id', '=', active_id)]"
             id="act_stock_tracking_lot_2_stock_report_tracklots"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a559aad9aac..96735c040c5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -632,6 +632,16 @@
                 </tree>
             </field>
         </record>
+        <record model="ir.actions.act_window" id="action_product_location_tree">
+            <field name="context">"{'product_id': active_id}</field>
+            <field name="name">Stock by Location</field>
+            <field name="res_model">stock.location</field>
+        </record>
+        <record id="act_product_stock_move_open" model="ir.actions.act_window">
+            <field name="context">{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+            <field name="name">Move</field>
+            <field name="res_model">stock.move</field>
+        </record>
         <record id="action_location_tree" model="ir.actions.act_window">
             <field name="name">Location Structure</field>
             <field name="res_model">stock.location</field>
@@ -1562,21 +1572,6 @@
             res_model="product.product"
             src_model="stock.location"/>
 
-        <act_window
-            context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="act_product_stock_move_open"
-            name="Inventory Move"
-            res_model="stock.move"
-            src_model="product.product"/>
-
-        <act_window
-            context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            domain="[('state','in',('waiting','confirmed','assigned'))]"
-            id="act_product_stock_move_futur_open"
-            name="Future Stock Moves"
-            res_model="stock.move"
-            src_model="product.product"/>
-
         <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>

From 78311c1ee4b9b6e9b2662aed472683bd807ae5d0 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 16:44:12 +0530
Subject: [PATCH 2/5] [IMP]Improve code

bzr revid: vja@tinyerp.com-20130220111412-ph853pkq0z1dwubd
---
 addons/product_margin/wizard/product_margin_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 6ee3a7ddc20..29df55c260a 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -19,7 +19,7 @@
                 </form>
             </field>
         </record>
-        <record id="action_product_margin_form" model="ir.actions.act_window">
+        <record id="product_margin_act_window" model="ir.actions.act_window">
             <field name="name">Product Margins</field>
             <field name="res_model">product.margin</field>
             <field name="src_model">product.product</field>
@@ -32,7 +32,7 @@
              <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
                  <xpath expr="//div[@name='buttons']" position="inside">
-                     <button string="Product Margins" name="%(action_product_margin_form)d" type="action" groups="base.group_sale_manager"/>
+                     <button string="Product Margins" name="%(product_margin_act_window)d" type="action" groups="base.group_sale_manager"/>
                  </xpath>
              </field>
         </record>

From 289dd74646912687740ed9d27b905193391bea08 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 18:49:06 +0530
Subject: [PATCH 3/5] [imp]Minor changes

bzr revid: vja@tinyerp.com-20130220131906-mxxgyaebybgdu0tj
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index b40809071ee..6ce6ad6b551 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -69,8 +69,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}"  groups="base.group_locations"/>
-                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="base.group_stock_user"/>
+                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_locations"/>
+                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
                 </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">

From efd26394f8172aa8868c8a7c4b10efab07941eb5 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 21 Feb 2013 15:29:34 +0530
Subject: [PATCH 4/5] [Fix] correct typo in button names: Move => Moves,
 Purchase => Purchases

bzr revid: vja@tinyerp.com-20130221095934-rrvakpyklngu37sz
---
 addons/purchase/purchase_view.xml | 2 +-
 addons/stock/product_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index dea558abeef..51cb4c8662e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -616,7 +616,7 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Purchase" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
+                   <button string="Purchases" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
                 </xpath>
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
                      <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 6ce6ad6b551..9d15511b006 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -70,7 +70,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                    <button string="Stock by Location" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_locations"/>
-                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
+                   <button string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
                 </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">

From f54c6dcd0b36b080902baba42ed0a3a62f3e07d1 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 21 Feb 2013 19:12:54 +0530
Subject: [PATCH 5/5] [IMP]typo

bzr revid: vja@tinyerp.com-20130221134254-jmoi7krnnorwq2n1
---
 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 96735c040c5..6d8008206ea 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -639,7 +639,7 @@
         </record>
         <record id="act_product_stock_move_open" model="ir.actions.act_window">
             <field name="context">{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
-            <field name="name">Move</field>
+            <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
         </record>
         <record id="action_location_tree" model="ir.actions.act_window">