From 0fb838686c78ee24a0ea2cce0247d782ce0b97d9 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 17 Jul 2012 18:25:07 +0200
Subject: [PATCH 01/24] [IMP] give higher sequence numbers (with wider gaps) to
 top menu items it should now be easier to insert new elements wherever we
 want in the main menu

bzr revid: abo@openerp.com-20120717162507-eezg0luxap793wrx
---
 openerp/addons/base/base_menu.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 90c7dd348e6..6c8055ff8d4 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_reporting" name="Reporting" sequence="90" groups="base.group_user"/>
+
+        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
-        <menuitem id="menu_administration" name="Settings" sequence="100"/>
+
+        <menuitem id="menu_administration" name="Settings" sequence="180"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
@@ -12,11 +14,13 @@
             <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
                 <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
                 <menuitem id="menu_translation_export" name="Import / Export" parent="menu_translation" sequence="3" groups="base.group_no_one"/>
+
             <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
                 <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
                 <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
+
     </data>
 </openerp>

From dbd2f400a60512471e96914c5a45a48dacc7887a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 12:11:29 +0200
Subject: [PATCH 02/24] [FIX] some wrong ordering sequences in top menus

bzr revid: abo@openerp.com-20120718101129-2l8yyzx4wu34yggr
---
 openerp/addons/base/base_menu.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 6c8055ff8d4..770e0e2d329 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -2,11 +2,18 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="170" groups="base.group_user"/>
+        <!-- Top menu item -->
+        <menuitem name="Reporting"
+            id="menu_reporting"
+            groups="base.group_user"
+            sequence="170"/>
             <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0"/>
             <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="base.group_system"/>
 
-        <menuitem id="menu_administration" name="Settings" sequence="180"/>
+        <!-- Top menu item -->
+        <menuitem name="Settings"
+            id="menu_administration"
+            sequence="500"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>

From c3da84fbca92ae84d74d8bb4304b3901f2f54431 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 18 Jul 2012 16:27:57 +0530
Subject: [PATCH 03/24] [IMP] improve layout of project config wizard

bzr revid: fka@tinyerp.com-20120718105757-8k57h899qhip3jzw
---
 addons/project/res_config_view.xml       | 80 +++++++++++++++++++-----
 addons/project_issue/res_config_view.xml | 11 ++--
 2 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 6248efde5d2..9ca47621546 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -6,29 +6,79 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project" version="7.0">
+                <form string="Configure Project" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
+                    <group col="1">
                         <group>
-                            <separator string="Project" colspan="2"/>
-                            <field name="module_project_mrp"/>
-                            <field name="module_project_timesheet"/>
-                            <field name="module_pad"/>
-                            <field name="group_tasks_work_on_tasks"/>
-                            <field name="group_time_work_estimation_tasks"/>
-                            <field name="group_manage_delegation_task"/>
-                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
+                            <div>
+                            <separator string="Project"/>
+                            <group>
+                                <label for="id" string="Project Option"/>
+                                <div>
+                                    <div>
+                                        <field name="module_project_mrp" class="oe_inline"/>
+                                        Create<label for="module_project_mrp" string="Project Tasks"/>from a Sale Order
+                                    </div>
+                                    <div>
+                                        <field name="module_project_timesheet" class="oe_inline"/>
+                                        Allow<label for="module_project_timesheet" string="Timesheets"/>per Task
+                                    </div>
+                                    <div>
+                                        <field name="module_pad" class="oe_inline"/>
+                                        Use<label for="module_pad" string="Collaborative Note Pads"/>for Tasks
+                                    </div>
+                                    <div>
+                                        <field name="group_tasks_work_on_tasks" class="oe_inline"/>
+                                        Allow<label for="group_tasks_work_on_tasks" string="Task's Work"/>on Tasks
+                                    </div>
+                                    <div>
+                                        <field name="group_time_work_estimation_tasks" class="oe_inline"/>
+                                        Allow<label for="group_time_work_estimation_tasks" string="Time Estimation"/>on Tasks
+                                    </div>
+                                    <div>
+                                        <field name="group_manage_delegation_task" class="oe_inline"/>
+                                        Manage<label for="group_manage_delegation_task" string="Task Delegation"/>
+                                    </div>
+                                    <div>
+                                        The Default<label for="time_unit"/>is:
+                                        <field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
+                                    </div>
+                                </div>
+                            </group>
+                            </div>
                         </group>
                         <group name="project_left_column">
-                            <separator string="Planing" colspan="2"/>
-                            <field name="module_project_long_term"/>
-                            <separator string="Helpdesk and Support" colspan="2"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
+                            <div>
+                            <separator string="Planing"/>
+                            <group>    
+                                <label for="id" string="Project Planing"/>
+                                <div>
+                                    <div>
+                                        <field name="module_project_long_term" class="oe_inline"/>
+                                        Manage<label for="module_project_long_term" string="Gantt and Resource"/>Planning
+                                    </div>
+                                </div>
+                            </group>
+                            
+                            <separator string="Helpdesk and Support"/>
+                            <group>
+                                <label for="id" string="Helpdesk and Support"/>
+                                <div>
+                                    <div>
+                                        <field name="module_project_issue" class="oe_inline"/>
+                                        Provides<label for="module_project_issue" string="Issues and Bug Tracking"/>in Projects
+                                    </div>
+                                    <div name="module_project_issue_sheet">
+                                        <field name="module_project_issue_sheet" class="oe_inline"/>
+                                        Provides<label for="module_project_issue_sheet" string="timesheet support"/>for the issues and Bug Tracking
+                                    </div>
+                                </div>
+                            </group>
+                            </div>
                         </group>
                     </group>
                 </form>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 81426e2b8a4..c6ab495e6b0 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -8,14 +8,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_project_issue_sheet" position="after">
-                    <label for="fetchmail_issue"/>
+                <div name="module_project_issue_sheet" position="after">
+                    
                     <div>
-                        <field name="fetchmail_issue"/>
+                        <field name="fetchmail_issue" class="oe_inline"/>
+                        Create<label for="fetchmail_issue" string="Issues"/>from Incoming Mails
                         <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
+                            attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
                     </div>
-                </field>
+                </div>
             </field>
         </record>
 

From 0ec54ee4731a20bebe5aca96a358a5e1739f0073 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 18 Jul 2012 13:35:34 +0200
Subject: [PATCH 04/24] [FIX] add a missing name attribute to the user's form
 view 'view_users_form_simple_modif' this name attribute is used by a xpath in
 the point_of_sale module (cf. 'res_users_form_preference_view' view)

bzr revid: abo@openerp.com-20120718113534-g9kd95y75t2x71c0
---
 openerp/addons/base/res/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 4f8fb9f94fd..546c1c063b8 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -58,7 +58,7 @@
                             <field name="comment"/>
                         </page>
                     </notebook>
-                  </sheet>  
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -199,7 +199,7 @@
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)
                     </h1>
-                    <group col="4">
+                    <group name="preferences" col="4">
                         <field name="context_lang" readonly="0"/>
                         <field name="company_id" readonly="0"
                             groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>

From a29a608533d46b3726644a07fbdcd0b27b5ea7e3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 18 Jul 2012 18:51:29 +0530
Subject: [PATCH 05/24] [IMP]Make changes into the purchases wizard

bzr revid: rma@tinyerp.com-20120718132129-yfylbf3mut8dgpns
---
 addons/purchase/res_config_view.xml           | 62 ++++++++++++++-----
 .../purchase_double_validation_installer.xml  |  7 ++-
 2 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 9cfcf4ea3d6..21d56727e5d 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -1,6 +1,5 @@
 <openerp>
     <data>
-
         <record id="view_purchase_configuration" model="ir.ui.view">
             <field name="name">purchase settings</field>
             <field name="model">purchase.config.settings</field>
@@ -13,20 +12,53 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group>
-                            <separator string="Purchase Order" colspan="2"/>
-                            <field name="group_purchase_pricelist"/>
-                            <field name="group_uom"/>
-                            <field name="group_purchase_delivery_address"/>
-                            <field name="module_purchase_double_validation"/>
-                            <field name="module_purchase_requisition"/>
-                            <field name="module_warning"/>
-                            <field name="module_purchase_analytic_plans"/>
-                        </group>
-			<group>
-                            <separator string="Invoicing" colspan="2"/>
-                            <field name="default_invoice_method" class="oe_inline"/>
-                            <field name="decimal_precision" class="oe_inline"/>
+                        <separator string="Purchase Order" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Purchase Order Setting"/>   
+                            <div>
+                                <div>
+                                    <field name="group_purchase_pricelist" class="oe_inline"/>
+                                    Pricelist Per<label for="group_purchase_pricelist" string="Supplier"/>
+                                </div>    
+                                <div>
+                                    <field name="group_uom" class="oe_inline"/>
+                                    Manage Different <label for="group_uom" string="Units of Measure"/>For Products 
+                                </div>                   
+                                <div>
+                                    <field name="group_purchase_delivery_address" class="oe_inline"/>
+                                     Allow Different Addresses for <label for="group_purchase_delivery_address" string="Delivery and Invoice"/>
+                                </div>    
+                                <div>
+                                    <field name="module_purchase_double_validation" class="oe_inline"/>
+                                    Two Levels of<label for="module_purchase_double_validation" string="Approval"/>
+                                </div>     
+                                <div>
+                                    <field name="module_purchase_requisition" class="oe_inline"/>
+                                    Manage<label for="module_purchase_requisition" string="Purchase Requisitions"/>
+                                </div>
+                                <div>    
+                                    <field name="module_warning" class="oe_inline"/>
+                                    Alert By<label for="module_warning" string="Products or Supplier"/>
+                                </div>
+                                <div>
+                                    <field name="module_purchase_analytic_plans" class="oe_inline"/>
+                                    Use<label for="module_purchase_analytic_plans" string="Multiple Analytic Accounts"/>On Purchases
+                                </div>
+                            </div>    
+			            </group>
+			            <separator string="Invoicing" colspan="2"/>
+			            <group colspan="2">
+                            <label for="id" string="Invoicing Setting"/>   
+                            <div>
+                                <div>
+                                    Default <label for="default_invoice_method" string="Invoicing Control"/>Method
+                                    <field name="default_invoice_method" class="oe_inline"/>
+                                </div>
+                                <div>
+                                     <label for="decimal_precision " string="Decimal"/>Precision
+                                     <field name="decimal_precision" class="oe_inline"/>
+                                </div>
+                            </div>            
                         </group>
                     </group>
                 </form>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 426dcae859a..d9080cea6b5 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,8 +7,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_purchase_double_validation" position="after">
-                    <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/>
+                <field name="module_purchase_double_validation" position="before">
+                    <div>
+                        Limit to Require a <label for="limit_amount" string="Second Approval "/>
+                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                    </div>
                 </field>
             </field>
         </record>

From 6daaaf039d9f29983c0d19f0451de1abaf40d1dd Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 19 Jul 2012 11:37:38 +0530
Subject: [PATCH 06/24] [IMP]Make changes in Manufacturing wizard

bzr revid: rma@tinyerp.com-20120719060738-brs727pse6xbazxk
---
 addons/mrp/res_config_view.xml | 77 ++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8d81a3d2d0a..691f872ea76 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -1,38 +1,81 @@
 <openerp>
     <data>
-
         <record id="view_mrp_config" model="ir.ui.view">
             <field name="name">mrp settings</field>
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" version="7.0">
+                <form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                            <separator string="Logistics" colspan="2"/>
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
+                    <separator string="Manufacturing Order" colspan="4" />
+                        <group colspan="2">
+                            <label for="id" string="Manufacturing Order Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_mrp_operations" class="oe_inline"/>
+                                    Detailed Planning Of <label for="module_mrp_operations" string="Work Orders"/>
+                                </div>
+                                <div>
+                                    <field name="module_stock_planning" class="oe_inline"/>
+                                    Master<label for="module_stock_planning" string="Production"/>Schedule
+                                </div>    
+                                <div>
+                                    <field name="module_mrp_subproduct" class="oe_inline"/>
+                                    Produce Several Products from One<label for="module_mrp_subproduct" string=" Manufacturing Order"/>                               
+                                </div>
+                                <div>
+                                    <field name="module_mrp_repair" class="oe_inline"/>
+                                    Manage<label for="module_mrp_repair" string="Product Repairs"/>
+                                </div>                            
+                            </div>
                         </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
-                            <separator string="Bill Of Material" colspan="2"/>
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
+                        <separator string="Logistics" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Logistics Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_mrp_jit" class="oe_inline"/>
+                                    <label for="module_mrp_jit" string="Real-Time"/>Scheduling
+                                </div>
+                                <div>
+                                     <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                     Manual Picking to Fulfill<label for="module_stock_no_autopicking" string="Manufacturing Orders"/>
+                                </div>
+                            </div>    
                         </group>
-                    </group>
+                        <separator string="Products" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Product Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="module_product_manufacturer" class="oe_inline"/>
+                                    Define<label for="module_product_manufacturer" string="Manufacturers"/>on Products
+                                </div>
+                            </div>    
+                        </group>                           
+                        <separator string="Bill Of Material" colspan="2"/>
+                        <group colspan="2">
+                            <label for="id" string="Bill Of Material Settings"/>   
+                            <div>
+                                <div>
+                                    <field name="group_mrp_routings" class="oe_inline"/>
+                                    Manage<label for="group_mrp_routings" string="Routings and Work Orders"/>
+                                </div>
+                                <div>
+                                    <field name="group_mrp_properties" class="oe_inline"/>
+                                    Allows Several<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                </div>
+                            </div>
+                        </group>
+                   </group>
                 </form>
             </field>
         </record>
-
         <record id="action_mrp_configuration" model="ir.actions.act_window">
             <field name="name">Configure Manufacturing</field>
             <field name="type">ir.actions.act_window</field>

From be0643296d12a2b12f24a044a4933242ede41f76 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 19 Jul 2012 15:05:20 +0530
Subject: [PATCH 07/24] [IMP]Make Changes into the Purchase wizard

bzr revid: rma@tinyerp.com-20120719093520-oif61hk5zj3p1bh4
---
 addons/purchase/res_config_view.xml            | 18 +++++++++---------
 .../purchase_double_validation_installer.xml   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 21d56727e5d..fd0b398ed5a 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -18,31 +18,31 @@
                             <div>
                                 <div>
                                     <field name="group_purchase_pricelist" class="oe_inline"/>
-                                    Pricelist Per<label for="group_purchase_pricelist" string="Supplier"/>
+                                    <label for="group_purchase_pricelist"/>As Per Supplier Category
                                 </div>    
                                 <div>
                                     <field name="group_uom" class="oe_inline"/>
-                                    Manage Different <label for="group_uom" string="Units of Measure"/>For Products 
+                                    <label for="group_uom" />In Purchase Order 
                                 </div>                   
                                 <div>
                                     <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                     Allow Different Addresses for <label for="group_purchase_delivery_address" string="Delivery and Invoice"/>
+                                    <label for="group_purchase_delivery_address"/>To Suppliers
                                 </div>    
                                 <div>
                                     <field name="module_purchase_double_validation" class="oe_inline"/>
-                                    Two Levels of<label for="module_purchase_double_validation" string="Approval"/>
+                                    Manage<label for="module_purchase_double_validation"/>
                                 </div>     
                                 <div>
                                     <field name="module_purchase_requisition" class="oe_inline"/>
-                                    Manage<label for="module_purchase_requisition" string="Purchase Requisitions"/>
+                                    <label for="module_purchase_requisition"/>For Purchase Documentation
                                 </div>
                                 <div>    
                                     <field name="module_warning" class="oe_inline"/>
-                                    Alert By<label for="module_warning" string="Products or Supplier"/>
+                                    To Set<label for="module_warning"/>
                                 </div>
                                 <div>
                                     <field name="module_purchase_analytic_plans" class="oe_inline"/>
-                                    Use<label for="module_purchase_analytic_plans" string="Multiple Analytic Accounts"/>On Purchases
+                                    Allow To<label for="module_purchase_analytic_plans"/>
                                 </div>
                             </div>    
 			            </group>
@@ -51,11 +51,11 @@
                             <label for="id" string="Invoicing Setting"/>   
                             <div>
                                 <div>
-                                    Default <label for="default_invoice_method" string="Invoicing Control"/>Method
+                                    <label for="default_invoice_method" />Selection
                                     <field name="default_invoice_method" class="oe_inline"/>
                                 </div>
                                 <div>
-                                     <label for="decimal_precision " string="Decimal"/>Precision
+                                     To Set<label for="decimal_precision"/>
                                      <field name="decimal_precision" class="oe_inline"/>
                                 </div>
                             </div>            
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index d9080cea6b5..c58ee681a89 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <field name="module_purchase_double_validation" position="before">
                     <div>
-                        Limit to Require a <label for="limit_amount" string="Second Approval "/>
+                        <label for="limit_amount"/>On Purchase Order
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </div>
                 </field>

From a913bee60826c780cd9a43180d0170bd18d6181a Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 19 Jul 2012 15:13:09 +0530
Subject: [PATCH 08/24] [IMP]Make Changes into the Manufacturing Wizard

bzr revid: rma@tinyerp.com-20120719094309-p6y2ws172ybg8zbj
---
 addons/mrp/res_config_view.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 691f872ea76..65f8ed5c2aa 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -14,37 +14,37 @@
                     <group>
                     <separator string="Manufacturing Order" colspan="4" />
                         <group colspan="2">
-                            <label for="id" string="Manufacturing Order Settings"/>   
+                            <label for="id" string="Manufacturing Order Settings"/>
                             <div>
                                 <div>
                                     <field name="module_mrp_operations" class="oe_inline"/>
-                                    Detailed Planning Of <label for="module_mrp_operations" string="Work Orders"/>
+                                    Manage<label for="module_mrp_operations" />
                                 </div>
                                 <div>
                                     <field name="module_stock_planning" class="oe_inline"/>
-                                    Master<label for="module_stock_planning" string="Production"/>Schedule
+                                    <label for="module_stock_planning"/>Of Products
                                 </div>    
                                 <div>
                                     <field name="module_mrp_subproduct" class="oe_inline"/>
-                                    Produce Several Products from One<label for="module_mrp_subproduct" string=" Manufacturing Order"/>                               
+                                    <label for="module_mrp_subproduct"/>For Sub-Prodcuts                               
                                 </div>
                                 <div>
                                     <field name="module_mrp_repair" class="oe_inline"/>
-                                    Manage<label for="module_mrp_repair" string="Product Repairs"/>
+                                    Allow To<label for="module_mrp_repair"/>
                                 </div>                            
                             </div>
                         </group>
-                        <separator string="Logistics" colspan="2"/>
+                        <separator string="Logistics" />Prodouction
                         <group colspan="2">
-                            <label for="id" string="Logistics Settings"/>   
+                            <label for="id" string="Logistics Settings"/>Of Products   
                             <div>
                                 <div>
                                     <field name="module_mrp_jit" class="oe_inline"/>
-                                    <label for="module_mrp_jit" string="Real-Time"/>Scheduling
+                                    Manage<label for="module_mrp_jit" string="Real-Time"/>Logistics
                                 </div>
                                 <div>
                                      <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                     Manual Picking to Fulfill<label for="module_stock_no_autopicking" string="Manufacturing Orders"/>
+                                     <label for="module_stock_no_autopicking" />
                                 </div>
                             </div>    
                         </group>
@@ -54,7 +54,7 @@
                             <div>
                                 <div>
                                     <field name="module_product_manufacturer" class="oe_inline"/>
-                                    Define<label for="module_product_manufacturer" string="Manufacturers"/>on Products
+                                    Manage<label for="module_product_manufacturer"/>For Productions
                                 </div>
                             </div>    
                         </group>                           
@@ -64,11 +64,11 @@
                             <div>
                                 <div>
                                     <field name="group_mrp_routings" class="oe_inline"/>
-                                    Manage<label for="group_mrp_routings" string="Routings and Work Orders"/>
+                                    <label for="group_mrp_routings"/>For BoMs
                                 </div>
                                 <div>
                                     <field name="group_mrp_properties" class="oe_inline"/>
-                                    Allows Several<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                    To Set<label for="group_mrp_properties" string="BoMs Per Product"/>
                                 </div>
                             </div>
                         </group>

From 84985583b9e8b87bf45ebeb7107110293709fa34 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 19 Jul 2012 15:38:09 +0530
Subject: [PATCH 09/24] [IMP] remove string and col

bzr revid: fka@tinyerp.com-20120719100809-xn74gwcajxo2xk6o
---
 addons/project/res_config_view.xml       | 27 +++++++++++-------------
 addons/project_issue/res_config_view.xml |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9ca47621546..010f02ae83d 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,36 +12,35 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group col="1">
                         <group>
                             <div>
-                            <separator string="Project"/>
+                            <separator string="Project and Planing"/>
                             <group>
-                                <label for="id" string="Project Option"/>
+                                <label for="id" string="Project"/>
                                 <div>
                                     <div>
                                         <field name="module_project_mrp" class="oe_inline"/>
-                                        Create<label for="module_project_mrp" string="Project Tasks"/>from a Sale Order
+                                        <label for="module_project_mrp"/>
                                     </div>
                                     <div>
                                         <field name="module_project_timesheet" class="oe_inline"/>
-                                        Allow<label for="module_project_timesheet" string="Timesheets"/>per Task
+                                        Allow<label for="module_project_timesheet"/>
                                     </div>
                                     <div>
                                         <field name="module_pad" class="oe_inline"/>
-                                        Use<label for="module_pad" string="Collaborative Note Pads"/>for Tasks
+                                        Use<label for="module_pad"/>
                                     </div>
                                     <div>
                                         <field name="group_tasks_work_on_tasks" class="oe_inline"/>
-                                        Allow<label for="group_tasks_work_on_tasks" string="Task's Work"/>on Tasks
+                                        Allow<label for="group_tasks_work_on_tasks" />
                                     </div>
                                     <div>
                                         <field name="group_time_work_estimation_tasks" class="oe_inline"/>
-                                        Allow<label for="group_time_work_estimation_tasks" string="Time Estimation"/>on Tasks
+                                        Allow<label for="group_time_work_estimation_tasks"/>
                                     </div>
                                     <div>
                                         <field name="group_manage_delegation_task" class="oe_inline"/>
-                                        Manage<label for="group_manage_delegation_task" string="Task Delegation"/>
+                                        <label for="group_manage_delegation_task"/>
                                     </div>
                                     <div>
                                         The Default<label for="time_unit"/>is:
@@ -53,13 +52,12 @@
                         </group>
                         <group name="project_left_column">
                             <div>
-                            <separator string="Planing"/>
                             <group>    
-                                <label for="id" string="Project Planing"/>
+                                <label for="id" string="Planing"/>
                                 <div>
                                     <div>
                                         <field name="module_project_long_term" class="oe_inline"/>
-                                        Manage<label for="module_project_long_term" string="Gantt and Resource"/>Planning
+                                        <label for="module_project_long_term"/>
                                     </div>
                                 </div>
                             </group>
@@ -70,17 +68,16 @@
                                 <div>
                                     <div>
                                         <field name="module_project_issue" class="oe_inline"/>
-                                        Provides<label for="module_project_issue" string="Issues and Bug Tracking"/>in Projects
+                                        Provides<label for="module_project_issue"/>
                                     </div>
                                     <div name="module_project_issue_sheet">
                                         <field name="module_project_issue_sheet" class="oe_inline"/>
-                                        Provides<label for="module_project_issue_sheet" string="timesheet support"/>for the issues and Bug Tracking
+                                        Provides<label for="module_project_issue_sheet"/>
                                     </div>
                                 </div>
                             </group>
                             </div>
                         </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index c6ab495e6b0..43ac0e4a8be 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -12,7 +12,7 @@
                     
                     <div>
                         <field name="fetchmail_issue" class="oe_inline"/>
-                        Create<label for="fetchmail_issue" string="Issues"/>from Incoming Mails
+                        <label for="fetchmail_issue"/>
                         <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
                     </div>

From 2a19e799d7489d254081692a80c6a3e86d93a366 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 19 Jul 2012 15:39:24 +0530
Subject: [PATCH 10/24] [IMP]: Place crm_meeting demo & data file at right
 location in base_calendar

bzr revid: cha@tinyerp.com-20120719100924-61t3jqsqzj61squb
---
 addons/base_calendar/__openerp__.py                |  5 +++--
 addons/{crm => base_calendar}/crm_meeting_data.xml |  0
 addons/{crm => base_calendar}/crm_meeting_demo.xml | 12 ++++++------
 addons/crm/__openerp__.py                          |  2 --
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%)
 rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca129f6f..c7df187dd87 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml'
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "demo_xml": [],
+    "demo_xml": ['crm_meeting_demo.xml'],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
similarity index 100%
rename from addons/crm/crm_meeting_data.xml
rename to addons/base_calendar/crm_meeting_data.xml
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
similarity index 89%
rename from addons/crm/crm_meeting_demo.xml
rename to addons/base_calendar/crm_meeting_demo.xml
index dda6d5a03a8..ad88c11bb1b 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet1"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet3"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_id" ref="crm.categ_meet2"/>
+            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..9fb1a4db28d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
-        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
-        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [

From 2ad16d53ba8850f3c7f97a9bb3c43874281d4d16 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 19 Jul 2012 16:51:03 +0530
Subject: [PATCH 11/24] [IMP]hr:hr config_wizard view improvement

bzr revid: sgo@tinyerp.com-20120719112103-gt818a5mgshjlccn
---
 addons/hr/res_config_view.xml                 | 70 ++++++++++++++-----
 addons/hr_payroll/res_config_view.xml         |  7 +-
 addons/hr_recruitment/res_config_view.xml     | 26 ++++---
 addons/hr_timesheet_sheet/res_config_view.xml | 14 ++--
 4 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index cf35654475d..2ea32a94411 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,27 +20,65 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                        <group string="Additional Features" name="left_column">
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_holidays"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_contract"/>
-                            <label for="module_hr_payroll"/>
+                        <separator string="Additional Features"/>
+                        <group>
+                            <label for="id" string="Additional Features"/>
                             <div>
-                                <field name="module_hr_payroll"/>
-                                <button name="%(open_payroll_modules)d" type="action"
+                                <div>
+                                    <field name="module_hr_expense" class="oe_inline"/>
+                                    <label for="module_hr_expense"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_evaluation" class="oe_inline"/>
+                                    <label for="module_hr_evaluation"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_holidays" class="oe_inline"/>
+                                    <label for="module_hr_holidays"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_expense" class="oe_inline"/>
+                                    <label for="module_hr_expense"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_expense" class="oe_inline"/>
+                                    <label for="module_hr_expense"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_recruitment" class="oe_inline"/>
+                                    <label for="module_hr_recruitment"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_contract" class="oe_inline"/>
+                                    <label for="module_hr_contract"/>
+                                </div>
+                                <div name="hr_payroll">
+                                    <field name="module_hr_payroll" class="oe_inline"/>
+                                    <label for="module_hr_payroll"/>
+                                    <button name="%(open_payroll_modules)d" type="action"
                                     string="Install Country-Specific Payroll" icon="gtk-go-forward"
-                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
+                                </div>
                             </div>
                         </group>
-                        <group string="Timesheets" name="right_column">
-                            <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
-                            <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
-                            <field name="module_hr_timesheet_sheet"/>
+                        <separator string="Timesheets"/>
+                        <group name="timesheet_grp">
+                            <label for="id" string="Timesheet Features"/>
+                            <div>
+                                <div>
+                                    <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
+                                    <label for="module_hr_attendance"/>
+                                </div>
+                                <div>
+                                    <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
+                                    <label for="module_hr_timesheet"/>
+                                </div>
+                                <div name="hr_timesheet">
+                                    <field name="module_hr_timesheet_sheet" class="oe_inline"/>
+                                    <label for="module_hr_timesheet_sheet"/>
+                                </div>
+                            </div>
                         </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c62281892e8..eb486a7a8d5 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -8,8 +8,11 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
-                <xpath expr="//group[@name='left_column']" position="inside">
-                    <field name="module_hr_payroll_account"/>
+                <xpath expr="//div[@name='hr_payroll']" position="after">
+                    <div>
+                        <field name="module_hr_payroll_account" class="oe_inline"/>
+                        <label for="module_hr_payroll_account"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 60d6d8d152d..442eca839d6 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,15 +7,23 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="right_column" position="inside">
-                    <separator string="Recruitment" colspan="2"/>
-                    <field name="module_document_ftp"/>
-                    <label for="fetchmail_applicants"/>
-                    <div>
-                        <field name="fetchmail_applicants"/>
-                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
-                    </div>
+                <group name="timesheet_grp" position="after">
+                    <separator string="Recruitment"/>
+                    <group>
+                        <label for="id" string="Recruitment Features"/>
+                        <div>
+                            <div>
+                                <field name="module_document_ftp" class="oe_inline"/>
+                                <label for="module_document_ftp"/>
+                            </div>
+                            <div>
+                                <field name="fetchmail_applicants" class="oe_inline"/>
+                                <label for="fetchmail_applicants"/>
+                                <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
+                            </div>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 61ebee2412b..1dcc721e697 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -7,10 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_timesheet_sheet" position="after">
-                    <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                    <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                </field>
+                <xpath expr="//div[@name='hr_timesheet']" position="after">
+                    <div>
+                        <label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
+                        <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
+                    </div>
+                </xpath>
             </field>
         </record>
     </data>

From f41efa7f9edec3b9444b40415a30b3a5a6099af8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 19 Jul 2012 16:55:51 +0530
Subject: [PATCH 12/24] [IMP] improve base general settings config wizard

bzr revid: fka@tinyerp.com-20120719112551-i2kmnp79xci2q6t0
---
 addons/base_setup/res_config_view.xml | 46 +++++++++++++++++++--------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..13466e83962 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -13,22 +13,42 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group>
+                        <separator string="Company Settings" colspan="2"/>
+                            <group>
+                                <label for="id" string="Company"/>
+                                <div>
+                                    <field name="module_multi_company" class="oe_inline"/>
+                                    Manage<label for="module_multi_company"/>
+                                </div>
+                            </group>
                             <div>
-                                You will also find several configuration options on your company data:
-                                address for the header and footer, overdue payments texts, etc.
+                                <div>
+                                    You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc.
+                                </div>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_link"/>
                             </div>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            <separator string="Others" colspan="2"/>
+                    </group>
+                    <separator string="External Accesses" colspan="2"/>
+                    <group>
+                        <label for="id" string="External Accesses"/>
+                        <div>
+                            <div>
+                                <field name="module_share" class="oe_inline"/>
+                                <label for="module_share"/>
+                            </div>
+                            <div>
+                                <field name="module_portal" class="oe_inline"/>
+                                <label for="module_portal"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <separator string="Others" colspan="2"/>
+                        <group>
                             <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
+                                <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute" class="oe_link"/>
                         </group>
                         
                     </group>

From 38f8cf9820f25a911d73a40bfeb09dd63a9f85f7 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 19 Jul 2012 17:59:57 +0530
Subject: [PATCH 13/24] [IMP] improve layout of hr

bzr revid: fka@tinyerp.com-20120719122957-viu96v1y0idd77yl
---
 addons/hr/res_config_view.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 2ea32a94411..76f052f873a 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -36,14 +36,6 @@
                                     <field name="module_hr_holidays" class="oe_inline"/>
                                     <label for="module_hr_holidays"/>
                                 </div>
-                                <div>
-                                    <field name="module_hr_expense" class="oe_inline"/>
-                                    <label for="module_hr_expense"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_expense" class="oe_inline"/>
-                                    <label for="module_hr_expense"/>
-                                </div>
                                 <div>
                                     <field name="module_hr_recruitment" class="oe_inline"/>
                                     <label for="module_hr_recruitment"/>

From ad9f16238d8122d1d07470cc445ebb946359b41d Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Jul 2012 04:45:32 +0000
Subject: [PATCH 14/24] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120720043734-rqxoubj45utde2nb
bzr revid: launchpad_translations_on_behalf_of_openerp-20120720044532-0x70lsjeu7dcpj56
---
 addons/web/i18n/ja.po           |   4 +-
 addons/web_calendar/i18n/ja.po  |   4 +-
 addons/web_dashboard/i18n/ja.po |   4 +-
 addons/web_diagram/i18n/ja.po   |   4 +-
 addons/web_gantt/i18n/hu.po     |  28 ++++++++
 addons/web_gantt/i18n/ja.po     |   4 +-
 addons/web_graph/i18n/hu.po     |  98 ++++++++++++++++++++++++++
 addons/web_graph/i18n/ja.po     |   4 +-
 addons/web_kanban/i18n/hu.po    |  66 ++++++++++++++++++
 addons/web_kanban/i18n/ja.po    |   4 +-
 addons/web_mobile/i18n/ja.po    |   4 +-
 addons/web_process/i18n/hu.po   | 118 ++++++++++++++++++++++++++++++++
 addons/web_process/i18n/ja.po   |   4 +-
 openerp/addons/base/i18n/ja.po  |  38 +++++-----
 14 files changed, 347 insertions(+), 37 deletions(-)
 create mode 100644 addons/web_gantt/i18n/hu.po
 create mode 100644 addons/web_graph/i18n/hu.po
 create mode 100644 addons/web_kanban/i18n/hu.po
 create mode 100644 addons/web_process/i18n/hu.po

diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index c1339863a4d..41154a91a72 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:176
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 00ea538f586..e950529be81 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
diff --git a/addons/web_dashboard/i18n/ja.po b/addons/web_dashboard/i18n/ja.po
index 6b59633054b..c3e73cebb9d 100644
--- a/addons/web_dashboard/i18n/ja.po
+++ b/addons/web_dashboard/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_dashboard/static/src/js/dashboard.js:60
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index bd1625fe9df..9897259683c 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_diagram/static/src/js/diagram.js:11
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
new file mode 100644
index 00000000000..7fe1cce2631
--- /dev/null
+++ b/addons/web_gantt/i18n/hu.po
@@ -0,0 +1,28 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr ""
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Létrehozás"
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index d16a0e5452f..29dee705455 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_gantt/static/src/js/gantt.js:11
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
new file mode 100644
index 00000000000..b3b7b0a864d
--- /dev/null
+++ b/addons/web_graph/i18n/hu.po
@@ -0,0 +1,98 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Grafikon"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 7fa475e3bcb..6952acbbc5d 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
new file mode 100644
index 00000000000..54814691329
--- /dev/null
+++ b/addons/web_kanban/i18n/hu.po
@@ -0,0 +1,66 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Kanban"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:293
+msgid "Undefined"
+msgstr "Nem definiált"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:468
+msgid "Are you sure you want to delete this record ?"
+msgstr "Biztosan törölni szeretné ezt a bejegyzést?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:839
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:72
+msgid "Cancel"
+msgstr ""
+
+#~ msgid "Create"
+#~ msgstr "Létrehozás"
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 440a2e15fbd..51a1a1559bf 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_kanban/static/src/js/kanban.js:10
diff --git a/addons/web_mobile/i18n/ja.po b/addons/web_mobile/i18n/ja.po
index 9be55cb112a..82f05b3282d 100644
--- a/addons/web_mobile/i18n/ja.po
+++ b/addons/web_mobile/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
diff --git a/addons/web_process/i18n/hu.po b/addons/web_process/i18n/hu.po
new file mode 100644
index 00000000000..d37cd5543e7
--- /dev/null
+++ b/addons/web_process/i18n/hu.po
@@ -0,0 +1,118 @@
+# Hungarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-19 06:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Mentés"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Olvassa a dokumentációt online"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Fórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Közösségi vitafórum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Könyvek"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Megjegyzések:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Utoljára módosította:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Alfolyamatok:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Kapcsolódó:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Folyamat kiválasztása"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Kiválaszt"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr ""
diff --git a/addons/web_process/i18n/ja.po b/addons/web_process/i18n/ja.po
index 4cc24782acb..22db0acff5e 100644
--- a/addons/web_process/i18n/ja.po
+++ b/addons/web_process/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:45+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. openerp-web
 #: addons/web_process/static/src/js/process.js:261
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 0e756def3ee..f4d05595b25 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-07-08 22:23+0000\n"
+"PO-Revision-Date: 2012-07-19 05:44+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-19 04:40+0000\n"
-"X-Generator: Launchpad (build 15637)\n"
+"X-Launchpad-Export-Date: 2012-07-20 04:37+0000\n"
+"X-Generator: Launchpad (build 15644)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -459,7 +459,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr "ウィジット"
+msgstr "ウィジェット"
 
 #. module: base
 #: view:ir.model.access:0
@@ -2514,7 +2514,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr "ホームページウィジット管理"
+msgstr "ホームページウィジェット管理"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -2782,7 +2782,7 @@ msgstr "インポート / エクスポート"
 #. module: base
 #: model:ir.actions.todo.category,name:base.category_tools_customization_config
 msgid "Tools / Customization"
-msgstr "ツール / カスタマイゼーション"
+msgstr "ツール / カスタム化"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -2895,7 +2895,7 @@ msgstr "マネジャ"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr "カスタマイゼーション"
+msgstr "カスタム化"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -7797,7 +7797,7 @@ msgstr ""
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr "ウィジットウィザード"
+msgstr "ウィジェットウィザード"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -12068,7 +12068,7 @@ msgstr ""
 "このモジュールはパートナのアドレスの中にGoogleマップ項目を追加します。\n"
 "====================================================\n"
 "\n"
-"これを使うと、URLウィジットからGoogleマップを直接開くことができます。"
+"これを使うと、URLウィジェットからGoogleマップを直接開くことができます。"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -14297,7 +14297,7 @@ msgstr "連絡先を隠すためにはアクティブな項目のチェックを
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr "ユーザのウィジットを追加"
+msgstr "ユーザのウィジェットを追加"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -15305,7 +15305,7 @@ msgstr "イラン"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr "ユーザ当りのウィジット"
+msgstr "ユーザ当りのウィジェット"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
@@ -15579,7 +15579,7 @@ msgstr "情報"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr "ユーザウィジット"
+msgstr "ユーザウィジェット"
 
 #. module: base
 #: view:base.module.update:0
@@ -17621,7 +17621,7 @@ msgstr "機能"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr "ウィジットの検索"
+msgstr "ウィジェットの検索"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
@@ -17742,7 +17742,7 @@ msgstr "受発注のドキュメントの内容に応じて、自動的に正し
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr "ホームページウィジット"
+msgstr "ホームページウィジェット"
 
 #. module: base
 #: help:res.company,rml_footer2:0
@@ -17815,23 +17815,23 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
+"このモジュールは何の開発もなしに新しいモジュールの作成ができます。\n"
 "======================================================================\n"
 "\n"
 "これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
 ".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
 "独自モジュールを作成することができます。\n"
 "\n"
-"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
-"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
+"このバージョンは作成と既存のレコードの更新のために動作します。それは依存関係と、\n"
+"全てのウィジェットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
 "また、ワークフローとデモ / 更新データもサポートします。\n"
 "\n"
 "カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
 "作成するために役立つはずです。\n"
 "\n"
 "利用方法：\n"
-"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
-"作成/エクスポート カスタマイゼーション を実行します。\n"
+"モジュールウィザードの アドミニストレーション/カスタム化/モジュール \n"
+"作成/エクスポート カスタム化 を実行します。\n"
 "記録の日時の基準、記録されるオブジェクト、記録モジュールを選択します。\n"
 "    "
 

From 286b5bbe1f57072188e6eadff7559b0206b019e3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 11:42:03 +0530
Subject: [PATCH 15/24] [IMP] Make Changes into the Manufacturing Wizard and
 resubmit it

bzr revid: rma@tinyerp.com-20120720061203-ff3efztoxqvhzhjg
---
 addons/mrp/res_config_view.xml | 36 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 65f8ed5c2aa..2524556d1ef 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,36 +11,35 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                    <separator string="Manufacturing Order" colspan="4" />
-                        <group colspan="2">
+                    <separator string="Manufacturing Order" />
+                        <group>
                             <label for="id" string="Manufacturing Order Settings"/>
                             <div>
                                 <div>
                                     <field name="module_mrp_operations" class="oe_inline"/>
-                                    Manage<label for="module_mrp_operations" />
+                                    <label for="module_mrp_operations" />
                                 </div>
                                 <div>
                                     <field name="module_stock_planning" class="oe_inline"/>
-                                    <label for="module_stock_planning"/>Of Products
+                                    <label for="module_stock_planning"/>
                                 </div>    
                                 <div>
                                     <field name="module_mrp_subproduct" class="oe_inline"/>
-                                    <label for="module_mrp_subproduct"/>For Sub-Prodcuts                               
+                                    <label for="module_mrp_subproduct"/>                          
                                 </div>
                                 <div>
                                     <field name="module_mrp_repair" class="oe_inline"/>
-                                    Allow To<label for="module_mrp_repair"/>
+                                    <label for="module_mrp_repair"/>
                                 </div>                            
                             </div>
                         </group>
-                        <separator string="Logistics" />Prodouction
-                        <group colspan="2">
-                            <label for="id" string="Logistics Settings"/>Of Products   
+                        <separator string="Logistics" />
+                        <group >
+                            <label for="id" string="Logistics Settings"/>   
                             <div>
                                 <div>
                                     <field name="module_mrp_jit" class="oe_inline"/>
-                                    Manage<label for="module_mrp_jit" string="Real-Time"/>Logistics
+                                   <label for="module_mrp_jit" string="Real-Time"/>
                                 </div>
                                 <div>
                                      <field name="module_stock_no_autopicking" class="oe_inline"/>
@@ -48,31 +47,30 @@
                                 </div>
                             </div>    
                         </group>
-                        <separator string="Products" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Products"/>
+                        <group >
                             <label for="id" string="Product Settings"/>   
                             <div>
                                 <div>
                                     <field name="module_product_manufacturer" class="oe_inline"/>
-                                    Manage<label for="module_product_manufacturer"/>For Productions
+                                    <label for="module_product_manufacturer"/>
                                 </div>
                             </div>    
                         </group>                           
-                        <separator string="Bill Of Material" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Bill Of Material" />
+                        <group >
                             <label for="id" string="Bill Of Material Settings"/>   
                             <div>
                                 <div>
                                     <field name="group_mrp_routings" class="oe_inline"/>
-                                    <label for="group_mrp_routings"/>For BoMs
+                                    <label for="group_mrp_routings"/>
                                 </div>
                                 <div>
                                     <field name="group_mrp_properties" class="oe_inline"/>
-                                    To Set<label for="group_mrp_properties" string="BoMs Per Product"/>
+                                    <label for="group_mrp_properties" />
                                 </div>
                             </div>
                         </group>
-                   </group>
                 </form>
             </field>
         </record>

From 402a7eb42f82abf0faedfd87f765e5a7a8ca4b8b Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 12:08:42 +0530
Subject: [PATCH 16/24] [IMP] Make Changes into the Purchases Wizard and
 resubmit it

bzr revid: rma@tinyerp.com-20120720063842-w1lk7ea44qpawrvc
---
 addons/purchase/res_config_view.xml           | 30 +++++++++----------
 .../purchase_double_validation_installer.xml  |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index fd0b398ed5a..83b6154602f 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -5,62 +5,60 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases" version="7.0">
+                <form string="Configure Purchases" class="oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                        <separator string="Purchase Order" colspan="2"/>
-                        <group colspan="2">
+                        <separator string="Purchase Order"/>
+                        <group>
                             <label for="id" string="Purchase Order Setting"/>   
                             <div>
                                 <div>
                                     <field name="group_purchase_pricelist" class="oe_inline"/>
-                                    <label for="group_purchase_pricelist"/>As Per Supplier Category
+                                    <label for="group_purchase_pricelist"/>
                                 </div>    
                                 <div>
                                     <field name="group_uom" class="oe_inline"/>
-                                    <label for="group_uom" />In Purchase Order 
+                                    <label for="group_uom"/>
                                 </div>                   
                                 <div>
                                     <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                    <label for="group_purchase_delivery_address"/>To Suppliers
+                                    <label for="group_purchase_delivery_address"/>
                                 </div>    
                                 <div>
                                     <field name="module_purchase_double_validation" class="oe_inline"/>
-                                    Manage<label for="module_purchase_double_validation"/>
+                                    <label for="module_purchase_double_validation"/>
                                 </div>     
                                 <div>
                                     <field name="module_purchase_requisition" class="oe_inline"/>
-                                    <label for="module_purchase_requisition"/>For Purchase Documentation
+                                    <label for="module_purchase_requisition"/>
                                 </div>
                                 <div>    
                                     <field name="module_warning" class="oe_inline"/>
-                                    To Set<label for="module_warning"/>
+                                    <label for="module_warning"/>
                                 </div>
                                 <div>
                                     <field name="module_purchase_analytic_plans" class="oe_inline"/>
-                                    Allow To<label for="module_purchase_analytic_plans"/>
+                                    <label for="module_purchase_analytic_plans"/>
                                 </div>
                             </div>    
 			            </group>
-			            <separator string="Invoicing" colspan="2"/>
-			            <group colspan="2">
+			            <separator string="Invoicing"/>
+			            <group>
                             <label for="id" string="Invoicing Setting"/>   
                             <div>
                                 <div>
-                                    <label for="default_invoice_method" />Selection
+                                    <label for="default_invoice_method"/>
                                     <field name="default_invoice_method" class="oe_inline"/>
                                 </div>
                                 <div>
-                                     To Set<label for="decimal_precision"/>
+                                     <label for="decimal_precision"/>
                                      <field name="decimal_precision" class="oe_inline"/>
                                 </div>
                             </div>            
                         </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index c58ee681a89..d03a90ff6bf 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <field name="module_purchase_double_validation" position="before">
                     <div>
-                        <label for="limit_amount"/>On Purchase Order
+                        <label for="limit_amount"/>
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </div>
                 </field>

From be38a7b813c8850f76c9bfb44bb68f06a99eab46 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 12:14:13 +0530
Subject: [PATCH 17/24] [IMP]:improved project config wizard

bzr revid: apa@tinyerp.com-20120720064413-v3hk68x2o7jhuga7
---
 addons/project/res_config_view.xml       | 115 +++++++++++------------
 addons/project_issue/res_config_view.xml |   8 +-
 2 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 010f02ae83d..5e24ecc4d99 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,72 +12,63 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group>
+                    <separator string="Project and Planing"/>
+                    <group>
+                        <label for="id" string="Project"/>
+                        <div>
                             <div>
-                            <separator string="Project and Planing"/>
-                            <group>
-                                <label for="id" string="Project"/>
-                                <div>
-                                    <div>
-                                        <field name="module_project_mrp" class="oe_inline"/>
-                                        <label for="module_project_mrp"/>
-                                    </div>
-                                    <div>
-                                        <field name="module_project_timesheet" class="oe_inline"/>
-                                        Allow<label for="module_project_timesheet"/>
-                                    </div>
-                                    <div>
-                                        <field name="module_pad" class="oe_inline"/>
-                                        Use<label for="module_pad"/>
-                                    </div>
-                                    <div>
-                                        <field name="group_tasks_work_on_tasks" class="oe_inline"/>
-                                        Allow<label for="group_tasks_work_on_tasks" />
-                                    </div>
-                                    <div>
-                                        <field name="group_time_work_estimation_tasks" class="oe_inline"/>
-                                        Allow<label for="group_time_work_estimation_tasks"/>
-                                    </div>
-                                    <div>
-                                        <field name="group_manage_delegation_task" class="oe_inline"/>
-                                        <label for="group_manage_delegation_task"/>
-                                    </div>
-                                    <div>
-                                        The Default<label for="time_unit"/>is:
-                                        <field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
-                                    </div>
-                                </div>
-                            </group>
+                                <field name="module_project_mrp" class="oe_inline"/>
+                                <label for="module_project_mrp"/>
                             </div>
-                        </group>
-                        <group name="project_left_column">
                             <div>
-                            <group>    
-                                <label for="id" string="Planing"/>
-                                <div>
-                                    <div>
-                                        <field name="module_project_long_term" class="oe_inline"/>
-                                        <label for="module_project_long_term"/>
-                                    </div>
-                                </div>
-                            </group>
-                            
-                            <separator string="Helpdesk and Support"/>
-                            <group>
-                                <label for="id" string="Helpdesk and Support"/>
-                                <div>
-                                    <div>
-                                        <field name="module_project_issue" class="oe_inline"/>
-                                        Provides<label for="module_project_issue"/>
-                                    </div>
-                                    <div name="module_project_issue_sheet">
-                                        <field name="module_project_issue_sheet" class="oe_inline"/>
-                                        Provides<label for="module_project_issue_sheet"/>
-                                    </div>
-                                </div>
-                            </group>
+                                <field name="module_project_timesheet" class="oe_inline"/>
+                                <label for="module_project_timesheet"/>
                             </div>
-                        </group>
+                            <div>
+                                <field name="module_pad" class="oe_inline"/>
+                                <label for="module_pad"/>
+                            </div>
+                            <div>
+                                <field name="group_tasks_work_on_tasks" class="oe_inline"/>
+                                <label for="group_tasks_work_on_tasks" />
+                            </div>
+                            <div>
+                                <field name="group_time_work_estimation_tasks" class="oe_inline"/>
+                                <label for="group_time_work_estimation_tasks"/>
+                            </div>
+                            <div>
+                                <field name="group_manage_delegation_task" class="oe_inline"/>
+                                <label for="group_manage_delegation_task"/>
+                            </div>
+                            <div>
+                                <label for="time_unit"/>
+                                <field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>    
+                        <label for="id" string="Planing"/>
+                        <div>
+                            <div>
+                                <field name="module_project_long_term" class="oe_inline"/>
+                                <label for="module_project_long_term"/>
+                            </div>
+                        </div>
+                    </group>
+                    <separator string="Helpdesk and Support"/>
+                    <group>
+                        <label for="id" string="Helpdesk and Support"/>
+                        <div>
+                            <div>
+                                <field name="module_project_issue" class="oe_inline"/>
+                                <label for="module_project_issue"/>
+                            </div>
+                            <div name="module_project_issue_sheet">
+                                <field name="module_project_issue_sheet" class="oe_inline"/>
+                                <label for="module_project_issue_sheet"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 43ac0e4a8be..bddabf0c7e8 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">Project Application</field>
             <field name="model">project.config.settings</field>
@@ -9,16 +8,17 @@
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_project_issue_sheet" position="after">
-                    
                     <div>
                         <field name="fetchmail_issue" class="oe_inline"/>
                         <label for="fetchmail_issue"/>
-                        <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
+                        <button name="configure_fetchmail_issue"
+                            type="object"
+                            string="Configure"
+                            icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
                     </div>
                 </div>
             </field>
         </record>
-
     </data>
 </openerp>

From a5aea1df135d92292d02c2bca42e768ea823ad71 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 12:42:50 +0530
Subject: [PATCH 18/24] [IMP]:improved code

bzr revid: apa@tinyerp.com-20120720071250-1h5cmcaxdwkqmsju
---
 addons/hr/res_config_view.xml         | 90 +++++++++++++--------------
 addons/hr_payroll/res_config_view.xml |  1 -
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 76f052f873a..520dd4dd94f 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,57 +20,57 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <separator string="Additional Features"/>
-                        <group>
-                            <label for="id" string="Additional Features"/>
+                    <separator string="Additional Features"/>
+                    <group>
+                        <label for="id" string="Additional Features"/>
+                        <div>
                             <div>
-                                <div>
-                                    <field name="module_hr_expense" class="oe_inline"/>
-                                    <label for="module_hr_expense"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_evaluation" class="oe_inline"/>
-                                    <label for="module_hr_evaluation"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_holidays" class="oe_inline"/>
-                                    <label for="module_hr_holidays"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_recruitment" class="oe_inline"/>
-                                    <label for="module_hr_recruitment"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_contract" class="oe_inline"/>
-                                    <label for="module_hr_contract"/>
-                                </div>
-                                <div name="hr_payroll">
-                                    <field name="module_hr_payroll" class="oe_inline"/>
-                                    <label for="module_hr_payroll"/>
-                                    <button name="%(open_payroll_modules)d" type="action"
+                                <field name="module_hr_expense" class="oe_inline"/>
+                                <label for="module_hr_expense"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_holidays" class="oe_inline"/>
+                                <label for="module_hr_holidays"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
                                     string="Install Country-Specific Payroll" icon="gtk-go-forward"
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
-                                </div>
                             </div>
-                        </group>
-                        <separator string="Timesheets"/>
-                        <group name="timesheet_grp">
-                            <label for="id" string="Timesheet Features"/>
+                        </div>
+                    </group>
+                    <separator string="Timesheets"/>
+                    <group name="timesheet_grp">
+                        <label for="id" string="Timesheet Features"/>
+                        <div>
                             <div>
-                                <div>
-                                    <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
-                                    <label for="module_hr_attendance"/>
-                                </div>
-                                <div>
-                                    <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
-                                    <label for="module_hr_timesheet"/>
-                                </div>
-                                <div name="hr_timesheet">
-                                    <field name="module_hr_timesheet_sheet" class="oe_inline"/>
-                                    <label for="module_hr_timesheet_sheet"/>
-                                </div>
+                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
+                                <label for="module_hr_attendance"/>
                             </div>
-                        </group>
+                            <div>
+                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
+                                <label for="module_hr_timesheet"/>
+                            </div>
+                            <div name="hr_timesheet">
+                                <field name="module_hr_timesheet_sheet" class="oe_inline"/>
+                                <label for="module_hr_timesheet_sheet"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index eb486a7a8d5..23b4adde536 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,7 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
                 <xpath expr="//div[@name='hr_payroll']" position="after">
                     <div>
                         <field name="module_hr_payroll_account" class="oe_inline"/>

From 7b394dfefcf7f6cf455ee9df44d7b591091bdde9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 12:55:41 +0530
Subject: [PATCH 19/24] [IMP] Make Changes into the Marketing Wizard

bzr revid: rma@tinyerp.com-20120720072541-02e6uk0xv4j8pqm6
---
 addons/marketing/res_config_view.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c2c7cb543c0..4f7772731a1 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -6,17 +6,30 @@
             <field name="model">marketing.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Marketing" version="7.0">
+                <form string="Configure Marketing" class="oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
                     </header>
-                    <group string="Campaigns">
-                        <field name="module_marketing_campaign"/>
-                        <field name="module_marketing_campaign_crm_demo"/>
-                        <field name="module_crm_profiling"/>
+                    <separator string="Campaigns"/>
+                    <group>
+                        <label for="id" string="Campaigns Settings"/>
+                        <div>
+                            <div>
+                                <field name="module_marketing_campaign" class="oe_inline"/>
+                                <label for="module_marketing_campaign"/>
+                            </div>
+                            <div>
+                                <field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
+                                <label for="module_marketing_campaign_crm_demo"/>
+                            </div>    
+                            <div>
+                                <field name="module_crm_profiling" class="oe_inline"/>
+                                <label for="module_crm_profiling"/>
+                            </div>   
+                        </div>     
                     </group>
                 </form>
             </field>

From 7eb49260d163fb6a79e25208f24339cf0933dc3d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 09:34:59 +0200
Subject: [PATCH 20/24] [REVERT] previous merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
---
 addons/base_calendar/__openerp__.py                |  5 ++---
 addons/crm/__openerp__.py                          |  2 ++
 addons/{base_calendar => crm}/crm_meeting_data.xml |  0
 addons/{base_calendar => crm}/crm_meeting_demo.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename addons/{base_calendar => crm}/crm_meeting_data.xml (100%)
 rename addons/{base_calendar => crm}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index c7df187dd87..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,10 +39,9 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml',
-        'crm_meeting_data.xml',
+        'base_calendar_data.xml'
     ],
-    "demo_xml": ['crm_meeting_demo.xml'],
+    "demo_xml": [],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9fb1a4db28d..0c9b75b4d41 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,6 +68,7 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
+        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -114,6 +115,7 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
similarity index 100%
rename from addons/base_calendar/crm_meeting_data.xml
rename to addons/crm/crm_meeting_data.xml
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
similarity index 89%
rename from addons/base_calendar/crm_meeting_demo.xml
rename to addons/crm/crm_meeting_demo.xml
index ad88c11bb1b..dda6d5a03a8 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
+            <field name="categ_id" ref="crm.categ_meet1"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>

From fec4a524921bfdb53494b360ab0d6e9c44c53ac8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:17:52 +0530
Subject: [PATCH 21/24] [IMP]:improved config wizard for compmny

bzr revid: apa@tinyerp.com-20120720084752-xtjmfqbketk37zzl
---
 addons/base_setup/res_config_view.xml | 39 ++++++++++++---------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 13466e83962..ab004c008dd 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -6,30 +6,28 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" version="7.0">
+                <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Company Settings"/>
                     <group>
-                        <separator string="Company Settings" colspan="2"/>
-                            <group>
-                                <label for="id" string="Company"/>
-                                <div>
-                                    <field name="module_multi_company" class="oe_inline"/>
-                                    Manage<label for="module_multi_company"/>
-                                </div>
-                            </group>
+                        <label for="id" string="Company"/>
+                        <div>
                             <div>
-                                <div>
-                                    You will also find several configuration options on your company data:
-                                    address for the header and footer, overdue payments texts, etc.
-                                </div>
-                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_link"/>
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
                             </div>
+                            <div>
+                                <label string="You will also find several configuration options on your company data:
+                                    address for the header and footer, overdue payments texts, etc."/>
+                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                            </div>
+                        </div>
                     </group>
-                    <separator string="External Accesses" colspan="2"/>
+                    <separator string="External Accesses"/>
                     <group>
                         <label for="id" string="External Accesses"/>
                         <div>
@@ -43,14 +41,11 @@
                             </div>
                         </div>
                     </group>
+                    <separator string="Others"/>
                     <group>
-                        <separator string="Others" colspan="2"/>
-                        <group>
-                            <label for="id" string="Outgoing Mail Servers"/>
-                                <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute" class="oe_link"/>
-                        </group>
-                        
+                        <label for="id" string="Outgoing Mail Servers"/>
+                        <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute" class="oe_link"/>
                     </group>
                 </form>
             </field>

From 66aec50df1f52f3542200192280b7d424953c891 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 20 Jul 2012 14:52:32 +0530
Subject: [PATCH 22/24] [IMP] Make Changes into the Knowladge Wizard

bzr revid: rma@tinyerp.com-20120720092232-l0w6xlh95yv22i5n
---
 addons/knowledge/res_config_view.xml | 43 +++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ec4d91683f1..219fdf514a5 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -1,3 +1,4 @@
+
 <openerp>
     <data>
 
@@ -6,27 +7,47 @@
             <field name="model">knowledge.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge" version="7.0">
+                <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or 
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                        <group string="Wiki">
-                            <field name="module_wiki_faq"/>
-                            <field name="module_wiki_quality_manual"/>
+                    <separator string="Wiki"/>
+                        <group>
+                            <label for="id" string="Wiki Settings"/>
+                            <div>
+                                <div>
+                                    <field name="module_wiki_faq" class="oe_inline"/>
+                                    <label for="module_wiki_faq"/>
+                                </div>
+                                <div>
+                                    <field name="module_wiki_quality_manual" class="oe_inline"/>
+                                    <label for="module_wiki_quality_manual"/>
+                                </div>        
+                            </div>                           
                         </group>
-                        <group string="Documents">
-                            <field name="module_document"/>
-                            <field name="module_document_ftp"/>
-                            <field name="module_document_webdav"/>
+                        <separator string="Documents"/>
+                        <group>
+                            <label for="id" string="Documents Settings"/>
+                            <div>
+                                <div>
+                                    <field name="module_document" class="oe_inline"/>
+                                    <label for="module_document"/>    
+                                </div>    
+                                <div>
+                                    <field name="module_document_ftp" class="oe_inline"/>
+                                    <label for="module_document_ftp"/>
+                                </div>
+                                <div>
+                                    <field name="module_document_webdav" class="oe_inline"/>
+                                    <label for="module_document_webdav"/>    
+                                </div>
+                            </div>        
                         </group>
-                    </group>
                 </form>
             </field>
         </record>
-
         <record id="action_knowledge_configuration" model="ir.actions.act_window">
             <field name="name">Configure Knowledge</field>
             <field name="res_model">knowledge.config.settings</field>

From 8ca1be5f85a2ac110c2f0ab0237fc837e05f10a4 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:13:08 +0530
Subject: [PATCH 23/24] [IMP]:improved manufacturing config wizard.

bzr revid: apa@tinyerp.com-20120720104308-sdn4cbj8ei26a6o1
---
 addons/mrp/res_config_view.xml | 108 ++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2524556d1ef..1e6f9ae63f8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,66 +11,66 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Manufacturing Order" />
-                        <group>
-                            <label for="id" string="Manufacturing Order Settings"/>
+                    <separator string="Manufacturing Order"/>
+                    <group>
+                        <label for="id" string="Order Settings"/>
+                        <div>
                             <div>
-                                <div>
-                                    <field name="module_mrp_operations" class="oe_inline"/>
-                                    <label for="module_mrp_operations" />
-                                </div>
-                                <div>
-                                    <field name="module_stock_planning" class="oe_inline"/>
-                                    <label for="module_stock_planning"/>
-                                </div>    
-                                <div>
-                                    <field name="module_mrp_subproduct" class="oe_inline"/>
-                                    <label for="module_mrp_subproduct"/>                          
-                                </div>
-                                <div>
-                                    <field name="module_mrp_repair" class="oe_inline"/>
-                                    <label for="module_mrp_repair"/>
-                                </div>                            
+                                <field name="module_mrp_operations" class="oe_inline"/>
+                                <label for="module_mrp_operations" />
                             </div>
-                        </group>
-                        <separator string="Logistics" />
-                        <group >
-                            <label for="id" string="Logistics Settings"/>   
                             <div>
-                                <div>
-                                    <field name="module_mrp_jit" class="oe_inline"/>
-                                   <label for="module_mrp_jit" string="Real-Time"/>
-                                </div>
-                                <div>
-                                     <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                     <label for="module_stock_no_autopicking" />
-                                </div>
+                                <field name="module_stock_planning" class="oe_inline"/>
+                                <label for="module_stock_planning"/>
                             </div>    
-                        </group>
-                        <separator string="Products"/>
-                        <group >
-                            <label for="id" string="Product Settings"/>   
                             <div>
-                                <div>
-                                    <field name="module_product_manufacturer" class="oe_inline"/>
-                                    <label for="module_product_manufacturer"/>
-                                </div>
-                            </div>    
-                        </group>                           
-                        <separator string="Bill Of Material" />
-                        <group >
-                            <label for="id" string="Bill Of Material Settings"/>   
-                            <div>
-                                <div>
-                                    <field name="group_mrp_routings" class="oe_inline"/>
-                                    <label for="group_mrp_routings"/>
-                                </div>
-                                <div>
-                                    <field name="group_mrp_properties" class="oe_inline"/>
-                                    <label for="group_mrp_properties" />
-                                </div>
+                                <field name="module_mrp_subproduct" class="oe_inline"/>
+                                <label for="module_mrp_subproduct"/>                          
                             </div>
-                        </group>
+                            <div>
+                                <field name="module_mrp_repair" class="oe_inline"/>
+                                <label for="module_mrp_repair"/>
+                            </div>                            
+                        </div>
+                    </group>
+                    <separator string="Logistics" />
+                    <group >
+                        <label for="id" string="Logistics Settings"/>   
+                        <div>
+                            <div>
+                                <field name="module_mrp_jit" class="oe_inline"/>
+                               <label for="module_mrp_jit" string="Real-Time"/>
+                            </div>
+                            <div>
+                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
+                                 <label for="module_stock_no_autopicking" />
+                            </div>
+                        </div>    
+                    </group>
+                    <separator string="Products"/>
+                    <group >
+                        <label for="id" string="Product Settings"/>   
+                        <div>
+                            <div>
+                                <field name="module_product_manufacturer" class="oe_inline"/>
+                                <label for="module_product_manufacturer"/>
+                            </div>
+                        </div>    
+                    </group>                           
+                    <separator string="Bill Of Material" />
+                    <group >
+                        <label for="id" string="BOM Settings"/>   
+                        <div>
+                            <div>
+                                <field name="group_mrp_routings" class="oe_inline"/>
+                                <label for="group_mrp_routings"/>
+                            </div>
+                            <div>
+                                <field name="group_mrp_properties" class="oe_inline"/>
+                                <label for="group_mrp_properties" />
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>

From 55034ad616f7b98c09ce328cdffc6553de24efd4 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 20 Jul 2012 16:29:04 +0530
Subject: [PATCH 24/24] [IMP]:improved purchase config wizard.

bzr revid: apa@tinyerp.com-20120720105904-hz6l8qza9qd6dsll
---
 addons/purchase/res_config_view.xml           | 96 +++++++++----------
 .../purchase_double_validation_installer.xml  |  5 +-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 83b6154602f..47816e47bf2 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -11,54 +11,54 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <separator string="Purchase Order"/>
-                        <group>
-                            <label for="id" string="Purchase Order Setting"/>   
-                            <div>
-                                <div>
-                                    <field name="group_purchase_pricelist" class="oe_inline"/>
-                                    <label for="group_purchase_pricelist"/>
-                                </div>    
-                                <div>
-                                    <field name="group_uom" class="oe_inline"/>
-                                    <label for="group_uom"/>
-                                </div>                   
-                                <div>
-                                    <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                    <label for="group_purchase_delivery_address"/>
-                                </div>    
-                                <div>
-                                    <field name="module_purchase_double_validation" class="oe_inline"/>
-                                    <label for="module_purchase_double_validation"/>
-                                </div>     
-                                <div>
-                                    <field name="module_purchase_requisition" class="oe_inline"/>
-                                    <label for="module_purchase_requisition"/>
-                                </div>
-                                <div>    
-                                    <field name="module_warning" class="oe_inline"/>
-                                    <label for="module_warning"/>
-                                </div>
-                                <div>
-                                    <field name="module_purchase_analytic_plans" class="oe_inline"/>
-                                    <label for="module_purchase_analytic_plans"/>
-                                </div>
-                            </div>    
-			            </group>
-			            <separator string="Invoicing"/>
-			            <group>
-                            <label for="id" string="Invoicing Setting"/>   
-                            <div>
-                                <div>
-                                    <label for="default_invoice_method"/>
-                                    <field name="default_invoice_method" class="oe_inline"/>
-                                </div>
-                                <div>
-                                     <label for="decimal_precision"/>
-                                     <field name="decimal_precision" class="oe_inline"/>
-                                </div>
-                            </div>            
-                        </group>
+                    <separator string="Purchase Order"/>
+                    <group>
+                        <label for="id" string="Order Setting"/>   
+                        <div>
+							<div>
+								<field name="group_purchase_pricelist" class="oe_inline"/>
+								<label for="group_purchase_pricelist"/>
+							</div>    
+							<div>
+								<field name="group_uom" class="oe_inline"/>
+								<label for="group_uom"/>
+							</div>                   
+							<div>
+								<field name="group_purchase_delivery_address" class="oe_inline"/>
+								<label for="group_purchase_delivery_address"/>
+							</div>    
+							<div name="module_purchase_double_validation">
+								<field name="module_purchase_double_validation" class="oe_inline"/>
+								<label for="module_purchase_double_validation"/>
+							</div>     
+							<div>
+								<field name="module_purchase_requisition" class="oe_inline"/>
+								<label for="module_purchase_requisition"/>
+							</div>
+							<div>    
+								<field name="module_warning" class="oe_inline"/>
+								<label for="module_warning"/>
+							</div>
+							<div>
+								<field name="module_purchase_analytic_plans" class="oe_inline"/>
+								<label for="module_purchase_analytic_plans"/>
+							</div>
+                        </div>    
+			        </group>
+			        <separator string="Invoicing"/>
+					<group>
+						<label for="id" string="Invoicing Setting"/>   
+						<div>
+							<div>
+								<label for="default_invoice_method"/>
+								<field name="default_invoice_method" class="oe_inline"/>
+							</div>
+							<div>
+								 <label for="decimal_precision"/>
+								 <field name="decimal_precision" class="oe_inline"/>
+							</div>
+						</div>            
+					</group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index d03a90ff6bf..c9345694b77 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,14 +7,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_purchase_double_validation" position="before">
+                <div name="module_purchase_double_validation" position="before">
                     <div>
                         <label for="limit_amount"/>
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </div>
-                </field>
+                </div>
             </field>
         </record>
-
     </data>
 </openerp>