From 724a9ec9d77f4bb22e597dd47f1837bcd3422d4a Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 8 Jun 2012 17:29:18 +0530
Subject: [PATCH 1/2] [IMP]IMprove of res_config_xml in account_sequence and
 base_Report_designer

bzr revid: sgo@tinyerp.com-20120608115918-0rizytmr4hberhb9
---
 .../account_sequence_installer_view.xml       | 31 +++++++++----------
 .../base_report_designer_installer.xml        | 31 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 97158e50c12..2fd585c229b 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -11,24 +11,23 @@
             <form position="attributes">
                 <attribute name="string">Account Sequence Application Configuration</attribute>
             </form>
-            <separator string="title" position="attributes">
+            <separator string="title" position="before">
+	            <label string="You can enhance the Account Sequence Application by installing ."/>
+            </separator>
+          <xpath expr="//separator[@string='title']" position="after">
+	          <group colspan="8" position="inside">
+	            <field name="name" colspan="4"/>
+	            <field name="prefix"/>
+	            <field name="suffix"/>
+	            <field name="number_next"/>
+	            <field name="number_increment"/>
+	            <field name="padding"/>
+	            <field name="company_id" groups="base.group_multi_company"/>
+	          </group>
+	       </xpath>
+	       <separator string="title" position="attributes">
                 <attribute name="string">Configure Your Account Sequence Application</attribute>
             </separator>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                <attribute name="string"/>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the Account Sequence Application by installing .</attribute>
-            </xpath>
-          <group colspan="8" position="inside">
-            <field name="name" colspan="4"/>
-            <field name="prefix"/>
-            <field name="suffix"/>
-            <field name="number_next"/>
-            <field name="number_increment"/>
-            <field name="padding"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-          </group>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
               <attribute name="string">Configure</attribute>
           </xpath>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index d85c9531733..f97cf39462e 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -12,12 +12,10 @@
               <form position="attributes">
                   <attribute name="string">OpenERP Report Designer Configuration</attribute>
               </form>
-              <separator string="title" position="attributes">
-                   <attribute name="string">OpenERP Report Designer</attribute>
+              
+             <separator string="title" position="before">
+                 <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
               </separator>
-              <xpath expr="//label[@string='description']" position="attributes">
-                  <attribute name="string">This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer.</attribute>
-              </xpath>
               <xpath expr="//button[@string='Install Modules']" position="replace">
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
                 <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
@@ -25,18 +23,17 @@
               <xpath expr="//button[@string='Cancel']" position="replace">
                 <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                  <attribute name="rowspan">15</attribute>
-                </xpath>
-                <group colspan="8" position="replace">
-              <group colspan="8" height="450" width="750">
-                  <field name="name" invisible="1"/>
-                  <field name="plugin_file" filename="name"/>
-                  <separator string="Installation and Configuration Steps" colspan="4"/>
-                  <field name="description" nolabel="1" colspan="8"/>
-              </group>
-              </group>
+                 <xpath expr="//separator[@string='title']" position="after">
+	              <group colspan="8" height="450" width="750">
+	                  <field name="name" invisible="1"/>
+	                  <field name="plugin_file" filename="name"/>
+	                  <separator string="Installation and Configuration Steps" colspan="4"/>
+	                  <field name="description" nolabel="1" colspan="8"/>
+	              </group>
+              </xpath>
+              <separator string="title" position="attributes">
+                   <attribute name="string">OpenERP Report Designer</attribute>
+              </separator>
           </data>
       </field>
     </record>

From 0bd2ff6ec91e56787ed781b5588da1229b7a58c4 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 8 Jun 2012 18:02:35 +0530
Subject: [PATCH 2/2] [IMP]xpath changes in l10n_be_hr_payroll

bzr revid: sgo@tinyerp.com-20120608123235-81iryazpal3g9sx3
---
 .../l10n_be_hr_payroll_view.xml               | 10 ++---
 addons/plugin_outlook/plugin_outlook.xml      | 18 ++++----
 .../plugin_thunderbird/plugin_thunderbird.xml | 42 +++++++++----------
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 9135499f7bc..970c4761067 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
+                 <xpath expr="//page[@name='information']/group/group[@name='right_column']/field[@name='advantages']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
                     <field name="misc_onss_deduction"/>
@@ -20,7 +20,7 @@
                     <field name="additional_net_amount"/>
                     <field name="retained_net_amount"/>
                  </xpath>
-                 <xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
+                 <xpath expr="//field[@name='trial_date_end']" position="after">
                     <group colspan="2" col="2">
                         <separator string="by Worker" colspan="2"/>
                         <field name="insurance_employee_deduction"/>
@@ -54,14 +54,14 @@
                 <!-- <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
                     <field name="marital" required="True"/>
                 </xpath> -->
-                <xpath expr="/form/notebook/page/group/field[@name='gender']" position="before">
+                <xpath expr="//field[@name='gender']" position="before">
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
-                <xpath expr="/form/notebook/page/group/field[@name='marital']" position="after">
+                <xpath expr="//field[@name='marital']" position="after">
                     <field name="spouse_fiscal_status" attrs="{'invisible':[('marital','!=','married')],'required':[('marital','=','married')]}" colspan="1" help="if spouse has professionnel income or not"/> 
                     <field name="disabled_spouse_bool" attrs="{'invisible':[('marital','!=','married')]}" colspan="1"/>
                 </xpath>
-                <xpath expr="/form/notebook/page/group/field[@name='children']" position="after">
+                <xpath expr="//field[@name='children']" position="after">
                     <field name="disabled_children_bool"/>
                     <field name="disabled_children_number" attrs="{'invisible':[('disabled_children_bool','!=',True)]}" colspan="1" help="number of dependent children declared as disabled"/>
                 </xpath>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 4b849f0824b..92f5814fff0 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -10,22 +10,15 @@
                     <form position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
-                    <separator string="title" position="attributes">
-                        <attribute name="string">Install Outlook Plug-In</attribute>
+                    <separator string="title" position="before">
+                        <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">This plug-in allows you to create and link outlook emails with openerp objects.</attribute>
-                    </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
                     </xpath>
                     <xpath expr="//button[@string='Cancel']" position="replace">
                     </xpath>
-                    <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                        <attribute name="string"/>
-                        <attribute name="rowspan">15</attribute>
-                    </xpath>
-                    <group colspan="8" position="replace">
+                   <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" widget="url" colspan="4"/>
                             <field name="name2" widget="url" colspan="4"/>
@@ -33,7 +26,10 @@
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
-                    </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">Install Outlook Plug-In</attribute>
+                    </separator>
                 </data>
             </field>
         </record>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b5601e7904a..34b9350ae5b 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,36 +11,32 @@
               <form position="attributes">
                   <attribute name="string">Install Thunderbird Plug-In</attribute>
               </form>
-              <separator string="title" position="attributes">
-                   <attribute name="string">Install Thunderbird Plug-In</attribute>
+               <separator string="title" position="before">
+                  <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
               </separator>
-              <xpath expr="//label[@string='description']" position="attributes">
-                  <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
-              </xpath>
               <xpath expr="//button[@string='Install Modules']" position="replace">
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
               </xpath>
               <xpath expr="//button[@string='Cancel']" position="replace">
               </xpath>
-              <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                  <attribute name="rowspan">15</attribute>
+              <xpath expr="//separator[@string='title']" position="after">
+	              <group colspan="8" height="450" width="750">
+	                  <field name="thunderbird" invisible="1"/>
+	                  <field name="name" invisible="1"/>
+	                  <field name="pdf_name" invisible="1"/>
+	                  <newline/>
+	
+	                  <field name="plugin_file" filename="name" widget="url"/>
+	                  <newline/>
+	                  <field name="pdf_file" filename="pdf_name" widget="url"/>
+	                  <newline/>
+	                  <separator string="Installation and Configuration Steps" colspan="4"/>
+	                  <field name="description" nolabel="1" colspan="8"/>
+	              </group>
               </xpath>
-              <group colspan="8" position="replace">
-              <group colspan="8" height="450" width="750">
-                  <field name="thunderbird" invisible="1"/>
-                  <field name="name" invisible="1"/>
-                  <field name="pdf_name" invisible="1"/>
-                  <newline/>
-
-                  <field name="plugin_file" filename="name" widget="url"/>
-                  <newline/>
-                  <field name="pdf_file" filename="pdf_name" widget="url"/>
-                  <newline/>
-                  <separator string="Installation and Configuration Steps" colspan="4"/>
-                  <field name="description" nolabel="1" colspan="8"/>
-              </group>
-              </group>
+              <separator string="title" position="attributes">
+                   <attribute name="string">Install Thunderbird Plug-In</attribute>
+              </separator>
           </data>
       </field>
     </record>