From ef74150d31877645761f679e895367da117d9490 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 13 Jul 2012 18:11:58 +0200
Subject: [PATCH] [IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161158-w0e5268zip8drzi1
---
 .../hr_timesheet_sheet_view.xml               |  8 ++--
 addons/l10n_ch/company_view.xml               | 28 ++++++------
 addons/mrp/company_view.xml                   |  2 +-
 addons/pad/res_company.xml                    |  6 ++-
 addons/procurement/company_view.xml           |  8 ++--
 addons/project/project_view.xml               |  6 ++-
 addons/purchase/company_view.xml              |  2 +-
 addons/sale/company_view.xml                  |  2 +-
 addons/users_ldap/users_ldap_view.xml         | 44 ++++++++++---------
 9 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4582061dd38..dbc9e1d6dac 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -200,9 +200,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="inside">
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="timesheets_grp" string="Timesheets">
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 1897c894462..be0d1a922af 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,20 +7,22 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='bank_acc']" position="after">
-                    <group string="BVR data" colspan="4">
-                        <field name="bvr_delta_horz"/>
-                        <field name="bvr_delta_vert"/>
-                        <field name="bvr_scan_line_vert"/>
-                        <field name="bvr_scan_line_horz"/>
-                        <field name="bvr_scan_line_font_size"/>
-                        <field name="bvr_scan_line_letter_spacing"/>
-                        <field name="bvr_background"/>
-                        <field name="bvr_only"/>
-                        <field name="invoice_only"/>
-                    </group>
+                <xpath expr="//notebook" position="inside">
+                    <page string="BVR Data"/>
+                        <group colspan="4">
+                            <field name="bvr_delta_horz"/>
+                            <field name="bvr_delta_vert"/>
+                            <field name="bvr_scan_line_vert"/>
+                            <field name="bvr_scan_line_horz"/>
+                            <field name="bvr_scan_line_font_size"/>
+                            <field name="bvr_scan_line_letter_spacing"/>
+                            <field name="bvr_background"/>
+                            <field name="bvr_only"/>
+                            <field name="invoice_only"/>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index d78036d62bd..e7b24ecce29 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                    <field name="manufacturing_lead"/>
                 </xpath>
             </field>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index fa0504f156b..9b1c0656470 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,8 +6,10 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//group[@name='time_grp']" position="inside">
-            <field name="pad_url_template"/>
+        <xpath expr="//group[@name='account_grp']" position="after">
+            <group string="Pads">
+                <field name="pad_url_template"/>
+            </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 3b149ef2a4f..961775b16dd 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,11 +9,13 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
-                    <field name="schedule_range"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="logistics_grp" string="Logistics"/>
+                        <field name="schedule_range"/>
+                    </group>
                 </xpath>
             </field>
        </record>
     
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7d65626dd44..26814892775 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -817,8 +817,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="inside">
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="project_grp" string="Projects">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 0b9fbdfcee5..30c6bfa1abf 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                         <field name="po_lead"/>
                 </xpath>
             </field>
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index e558ca097e7..fd4289a5bf6 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -8,7 +8,7 @@
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                    <field name="security_lead"/>
                 </xpath>
             </field>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 9a337221935..b87800aa8c8 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,30 +7,32 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="after">
-                    <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration" version="7.0">
-                            <group col="4">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="LDAP Parameters">
+                        <field name="ldaps" nolabel="1" colspan="4">
+                            <form string="LDAP Configuration" version="7.0">
+                                <group col="4">
+                                    <field name="ldap_server"/>
+                                    <field name="ldap_server_port"/>
+                                    <field name="ldap_binddn"/>
+                                    <field name="ldap_password"/>
+                                    <field name="ldap_base"/>
+                                    <field name="ldap_filter"/>
+                                    <field name="create_user"/>
+                                    <field name="user"/>
+                                    <newline/>
+                                    <field name="sequence"/>
+                                    <field name="ldap_tls"/>
+                                </group>
+                            </form>
+                            <tree string="LDAP Configuration">
+                                <field name="sequence"/>
                                 <field name="ldap_server"/>
                                 <field name="ldap_server_port"/>
-                                <field name="ldap_binddn"/>
-                                <field name="ldap_password"/>
                                 <field name="ldap_base"/>
-                                <field name="ldap_filter"/>
-                                <field name="create_user"/>
-                                <field name="user"/>
-                                <newline/>
-                                <field name="sequence"/>
-                                <field name="ldap_tls"/>
-                            </group>
-                        </form>
-                        <tree string="LDAP Configuration">
-                            <field name="sequence"/>
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_base"/>
-                        </tree>
-                    </field>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
             </field>
         </record>