From 760b5f1e7acbc756ec7424903a617a6a06fece7a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 8 Jun 2011 19:51:49 +0530
Subject: [PATCH] [IMP]Allmodule:set sequnce for merging wizards

bzr revid: aag@tinyerp.co.in-20110608142149-6opzcib2in0dxumx
---
 addons/account/account_installer.xml          |  2 +-
 addons/association/profile_association.xml    |  2 +-
 addons/base_setup/base_setup_installer.xml    | 30 +++++++++++++++++++
 addons/crm/crm_installer_view.xml             |  2 +-
 addons/hr/hr_installer.xml                    |  2 +-
 addons/knowledge/knowledge_installer.xml      |  2 +-
 addons/marketing/marketing_view.xml           |  2 +-
 addons/mrp/mrp_installer.xml                  |  2 +-
 addons/profile_tools/misc_tools_installer.xml |  2 +-
 addons/project/project_installer.xml          |  2 +-
 addons/purchase/wizard/purchase_installer.xml |  2 +-
 .../report_designer_installer.xml             |  2 +-
 addons/sale/sale_installer.xml                |  2 +-
 13 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 006d4b58c1c..ca8eb6d01e5 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -50,7 +50,7 @@
             <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='report_designer']" position="after">
+                    <xpath expr="//group[@name='account_accountant']" position="replace">
                     <newline/>
                     <separator  string="Accounting &amp; Finance Features" colspan="4" />
                     <field name="account_voucher"/>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 131deb37b83..9147fd4ebc7 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-                <xpath expr="//field[@name='product_expiry']" position="after">
+                <xpath expr="//group[@name='association']" position="replace">
                     <newline/>
                     <separator  string="Associations Features" colspan="4" />
                     <field name="project" />
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e202ce3026a..86ca48d9fcf 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -44,6 +44,36 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <group  name="crm">
+            </group>
+            <group  name="sale">
+            </group>
+            <group  name="project">
+            </group>
+            <group  name="knowledge">
+            </group>
+            <group  name="stock">
+            </group>
+            <group  name="mrp">
+            </group>
+            <group  name="account_voucher">
+            </group>
+            <group  name="account_accountant">
+            </group>
+            <group  name="purchase">
+            </group>
+            <group  name="hr">
+            </group>
+            <group  name="profile_tools">
+            </group>
+            <group  name="marketing">
+            </group>
+            <group  name="point_of_sale">
+            </group>
+            <group  name="report_designer">
+            </group>
+            <group  name="association">
+            </group>
           </group>
         </data>
       </field>
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 6af46e5aa21..e5566e2f7b0 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='crm']" position="replace">
             <newline/>
             <separator  string="Customer Relationship Management Features" colspan="4" />
             <field name="crm_claim" groups="base.group_extended" />
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6610db4f15c..154e189b242 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -9,7 +9,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-           <xpath expr="//field[@name='report_designer']" position="after">
+           <xpath expr="//group[@name='hr']" position="replace">
             <newline/>
             <separator  string="Human Resources Features" colspan="4" />
             <field name="hr_holidays"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 61dccaa4789..d9a4a45df66 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='knowledge']" position="replace">
             <newline/>
             <separator  string="Knowledge Management Features" colspan="4" />
             <field name="document_ftp" />
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index aee61903e6a..b4539cfef33 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='report_designer']" position="after">
+                    <xpath expr="//group[@name='marketing']" position="replace">
                         <newline/>
                         <separator  string="Marketing Features" colspan="4" />
                         <field name="marketing_campaign" />
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index e20ec3089e7..8d82d16a7ec 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='mrp']" position="replace">
             <newline/>
             <separator  string="Manufacturing Features" colspan="4" />
             <field name="stock_location" />
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index fd3337820bc..6804e1dadd0 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='profile_tools']" position="replace">
             <newline/>
             <separator  string="Extra Tools Features" colspan="4" />
             <field name="share" />
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 318dfbb0383..d6538ac1310 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -8,7 +8,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
           <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='project']" position="replace">
             <newline/>
             <separator  string="Project Management Features" colspan="4" />
             <field name="project_issue" />
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 4640657315a..bc3ca11aa7b 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='purchase']" position="replace">
             <newline/>
             <separator  string="Purchase Management Features" colspan="4" />
             <field name="purchase_requisition" />
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 4f7408325e1..d8d1798578e 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='report_designer']" position="replace">
             <newline/>
             <separator  string="Advanced Reporting Features" colspan="4" />
             <field name="base_report_designer" />
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 956f9636bb0..38b1de7d2b8 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <xpath expr="//field[@name='report_designer']" position="after">
+          <xpath expr="//group[@name='sale']" position="replace">
             <newline/>
             <separator  string="Sales Management Features" colspan="4" />
             <field name="delivery" />