From 12bae0d8f901690403cd5d73e161ca6d3bbbe70c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Jul 2012 18:04:13 +0530
Subject: [PATCH] [IMP]improve company form view as per review. improve
 email_template,user form and all action window and also remove sheets from
 configuration

bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
---
 addons/account/company_view.xml               |  8 ++--
 addons/account/res_config_view.xml            |  2 -
 addons/account_check_writing/account_view.xml |  6 +--
 .../account_voucher/account_voucher_view.xml  |  4 +-
 addons/auth_openid/res_users.xml              |  6 ++-
 addons/base_setup/res_config_view.xml         | 38 +++++++--------
 addons/email_template/email_template_view.xml | 45 ++++++++----------
 .../google_base_account_view.xml              |  7 +--
 addons/hr/res_config_view.xml                 | 44 +++++++++---------
 .../hr_timesheet_sheet_view.xml               |  8 ++--
 addons/knowledge/res_config_view.xml          | 23 ++++------
 addons/mrp/company_view.xml                   |  4 +-
 addons/mrp/res_config_view.xml                | 34 +++++++-------
 addons/pad/res_company.xml                    |  4 +-
 addons/portal/portal_view.xml                 | 28 ++++++-----
 addons/procurement/company_view.xml           |  6 +--
 addons/project/project_view.xml               |  6 +--
 addons/project/res_config_view.xml            | 36 +++++++--------
 addons/purchase/company_view.xml              |  2 +-
 addons/purchase/res_config_view.xml           | 32 ++++++-------
 addons/sale/company_view.xml                  |  2 +-
 addons/stock/res_config_view.xml              | 46 +++++++++----------
 addons/users_ldap/users_ldap_view.xml         |  2 +-
 23 files changed, 180 insertions(+), 213 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 6d624ad1729..d5627158d20 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,10 +22,10 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                      <field name="paypal_account"  placeholder="sales@openerp.com"/>
-                      <field name="property_reserve_and_surplus_account" colspan="2"/>
-                </field>
+                <xpath expr="//group[@name='account_grp']" position="inside">
+                    <field name="property_reserve_and_surplus_account"/>
+                    <field name="paypal_account"  placeholder="sales@openerp.com"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index ffb785380aa..6e76d3c60e2 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,7 +21,6 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
                     <field name="has_default_company" invisible="1" />
                     <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
@@ -120,7 +119,6 @@
                     <field name="sale_refund_journal_id" invisible="1"/>
                     <field name="purchase_journal_id" invisible="1"/>
                     <field name="purchase_refund_journal_id" invisible="1"/>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 13b3b820226..5f9dd1dccbb 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -31,10 +31,8 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Default Check Layout">
-                        <field name="check_layout"/>
-                    </group>
+                <xpath expr="//group[@name='account_grp']" position="inside">
+                    <field name="check_layout"/>
                 </xpath>
             </field>
        </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2c294fa628c..925eecf5ab4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -272,8 +272,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
-                      <field name="income_currency_exchange_account_id" colspan="2"/>
-                      <field name="expense_currency_exchange_account_id" colspan="2"/>
+                      <field name="income_currency_exchange_account_id"/>
+                      <field name="expense_currency_exchange_account_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/auth_openid/res_users.xml b/addons/auth_openid/res_users.xml
index e32c2df26c8..df0c31856e2 100644
--- a/addons/auth_openid/res_users.xml
+++ b/addons/auth_openid/res_users.xml
@@ -9,8 +9,10 @@
             <field name="arch" type="xml">
                 <notebook colspan="4" position="inside">
                     <page string="OpenID">
-                        <field name="openid_url"/>
-                        <field name="openid_email"/>
+                        <group>
+                            <field name="openid_url"/>
+                            <field name="openid_email"/>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index a1fd8c18e47..6217bca6645 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -12,26 +12,24 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Company Settings">
-                                <field name="module_multi_company"/>
-                                <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"/>
-                            </group>
-                            <group string="External Accesses">
-                                <field name="module_share"/>
-                                <field name="module_portal"/>
-                                <separator string="Others" colspan="2"/>
-                                <label for="id" string="Outgoing Mail Servers"/>
-                                <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
-                            </group>
+                    <group>
+                        <group string="Company Settings">
+                            <field name="module_multi_company"/>
+                            <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"/>
                         </group>
-                    </sheet>
+                        <group string="External Accesses">
+                            <field name="module_share"/>
+                            <field name="module_portal"/>
+                            <separator string="Others" colspan="2"/>
+                            <label for="id" string="Outgoing Mail Servers"/>
+                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -57,7 +55,6 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
                         <group>
                             <group name="config_sale">
                                 <field name="module_crm" invisible="1"/>
@@ -68,7 +65,6 @@
                             <group name="config_other">
                             </group>
                         </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 7b64254dfd8..c05502cd3a0 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -17,20 +17,13 @@
                     <notebook>
                         <page string="Email Details">
                             <group>
-                            <group string="Addresses">
                                 <field name="email_from" required="1"/>
                                 <field name="email_to" required="1"/>
                                 <field name="email_cc"/>
                                 <field name="email_bcc"/>
                                 <field name="reply_to"/>
-                            </group>
-                            <group string="Options">
-                                <field name="lang"/>
-                                <field name="user_signature"/>
-                            </group>
-                            <group string="Email Content">
                                 <field name="subject" required="1"/>
-                                <notebook  colspan="2">
+                                <notebook  colspan="4">
                                     <page string="Body (Text)">
                                         <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
                                     </page>
@@ -39,22 +32,21 @@
                                         <label string="Note: This is Raw HTML." colspan="4"/>
                                     </page>
                                 </notebook>
-                            </group>
+                                <field name="user_signature"/>
                             <notebook colspan="4">
                                 <page string="Dynamic Values Builder">
-                                    <field name="model_object_field"
-                                        domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field)"
-                                        colspan="4"/>
-                                    <field name="sub_object" readonly="1" colspan="4"/>
-                                    <field name="sub_model_object_field"
-                                        domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                        colspan="4"
-                                        attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                    <field name="null_value" colspan="4"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
-                                    <field name="copyvalue" colspan="4"/>
+                                    <group>
+                                        <field name="model_object_field"
+                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            on_change="onchange_sub_model_object_value_field(model_object_field)"/>
+                                        <field name="sub_object" readonly="1"/>
+                                        <field name="sub_model_object_field"
+                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
+                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                        <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
+                                        <field name="copyvalue"/>
+                                    </group>
                                 </page>
                             </notebook>
                             <button name="%(wizard_email_template_preview)d" string="Preview Template"
@@ -82,15 +74,18 @@
                                     <field name="track_campaign_item"/>
                                     <field name="message_id"/>
                                     <field name="auto_delete"/>
+                                    <field name="lang"/>
                                 </group>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Attachments" colspan="2"/>
                                 <notebook colspan="2">
                                     <page string="Attach Report">
-                                        <field name="report_template" colspan="4"
-                                            domain="[('model','=',model)]"/>
-                                        <field name="report_name" colspan="4" />
+                                        <group>
+                                            <field name="report_template" colspan="4"
+                                                domain="[('model','=',model)]"/>
+                                            <field name="report_name" colspan="4" />
+                                        </group>
                                     </page>
                                     <page string="Attach existing files">
                                         <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index db189d659db..ec4aa9669fb 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -9,9 +9,10 @@
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
                     <page string="Synchronization">
-                        <separator string="Google Account" colspan="4"/>
-                        <field name="gmail_user"/>
-                        <field name="gmail_password" password="True"/>
+                        <group string="Google Account" colspan="4">
+                            <field name="gmail_user"/>
+                            <field name="gmail_password" password="True"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 1916760635d..f9536fc9c24 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,30 +20,28 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <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"/>
-                                <div>
-                                    <field name="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)]}"/>
-                                </div>
-                            </group>
-                            <group name="right_column">
-                                <separator string="Timesheets" colspan="2"/>
-                                <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"/>
-                            </group>
+                    <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"/>
+                            <div>
+                                <field name="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)]}"/>
+                            </div>
                         </group>
-                    </sheet>
+                        <group name="right_column">
+                            <separator string="Timesheets" colspan="2"/>
+                            <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"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index b57cb4ccd81..4582061dd38 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -200,11 +200,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Timesheets">
-                        <field name="timesheet_range"/>
-                        <field name="timesheet_max_difference"/>
-                    </group>
+                <xpath expr="//group[@name='time_grp']" position="inside">
+                    <field name="timesheet_range"/>
+                    <field name="timesheet_max_difference"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ad3488deb98..ec4d91683f1 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -11,21 +11,18 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or 
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Wiki">
-                                <field name="module_wiki_faq"/>
-                                <field name="module_wiki_quality_manual"/>
-                            </group>
-                            <group string="Documents">
-                                <field name="module_document"/>
-                                <field name="module_document_ftp"/>
-                                <field name="module_document_webdav"/>
-                            </group>
+                    <group>
+                        <group string="Wiki">
+                            <field name="module_wiki_faq"/>
+                            <field name="module_wiki_quality_manual"/>
                         </group>
-                    </sheet>
+                        <group string="Documents">
+                            <field name="module_document"/>
+                            <field name="module_document_ftp"/>
+                            <field name="module_document_webdav"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index d7e518699e0..d78036d62bd 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,8 +9,8 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='currency_id']" position="after">
-                        <field name="manufacturing_lead"/>
+                <xpath expr="//group[@name='day_grp']" position="inside">
+                   <field name="manufacturing_lead"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index e81a1d42df4..8d81a3d2d0a 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <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"/>
-                            </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"/>
-                            </group>
+                    <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"/>
                         </group>
-                    </sheet>
+                        <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"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 8f65c507c61..fa0504f156b 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,10 +6,8 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//group[@name='currency']" position="after">
-          <group string="Pad">
+        <xpath expr="//group[@name='time_grp']" position="inside">
             <field name="pad_url_template"/>
-          </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 21641f45bc7..794c8ed788b 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -38,11 +38,19 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="4" col="2">
-                            <separator string="Website" colspan="2"/>
-                            <field name="url" widget="url"/>
-                        </group>
-                        <group colspan="2" col="2">
+                        <group>
+                            <group>
+                                <field name="url" widget="url" string="Portal URL"/>
+                                <field name="home_action_id"/>
+                            </group>
+                            <group>
+                                <field name="override_menu"/>
+                                <field name="parent_menu_id"
+                                    context="{'ir.ui.menu.full_list': True}"/>
+                                <label colspan="1"/>
+                                <button name="do_create_menu" type="object"
+                                    string="Create Parent Menu"/>
+                            </group>
                             <separator string="Widgets Assigned to Users" colspan="2"/>
                             <field name="widget_ids" nolabel="1" colspan="2">
                                 <tree string="Widgets" editable="bottom">
@@ -51,16 +59,6 @@ the portal's users.
                                 </tree>
                             </field>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Portal Menu" colspan="2"/>
-                            <field name="override_menu"/>
-                            <field name="parent_menu_id"
-                                context="{'ir.ui.menu.full_list': True}"/>
-                            <label colspan="1"/>
-                            <button name="do_create_menu" type="object"
-                                string="Create Parent Menu"/>
-                            <field name="home_action_id"/>
-                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 49e50f8c0f2..3b149ef2a4f 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,10 +9,8 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="MRP &amp; Logistics Scheduler">
-                        <field name="schedule_range"/>
-                    </group>
+                <xpath expr="//group[@name='day_grp']" position="inside">
+                    <field name="schedule_range"/>
                 </xpath>
             </field>
        </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c6b1839b304..7a0a9f08512 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -826,10 +826,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Project Management">
-                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    </group>
+                <xpath expr="//group[@name='time_grp']" position="inside">
+                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 871c8ed2311..6248efde5d2 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,27 +12,25 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <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')]"/>
-                            </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"/>
-                            </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')]"/>
                         </group>
-                    </sheet>
+                        <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"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 9e935fe34fe..0b9fbdfcee5 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="//field[@name='currency_id']" position="after">
+                <xpath expr="//group[@name='day_grp']" position="inside">
                         <field name="po_lead"/>
                 </xpath>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 301e69e7b75..04d966bd1e5 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <separator string="Invoicing" colspan="2"/>
-                                <field name="default_invoice_method" class="oe_inline"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </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>
+                            <separator string="Invoicing" colspan="2"/>
+                            <field name="default_invoice_method" class="oe_inline"/>
+                            <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                    </sheet>
+                        <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>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 73f67707ce6..e558ca097e7 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="//field[@name='currency_id']" position="after">
+                <xpath expr="//group[@name='day_grp']" position="inside">
                    <field name="security_lead"/>
                 </xpath>
             </field>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index d5e3d6f60c5..0503ec544b1 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,32 +13,30 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <separator string="Traceability" colspan="2"/>
-                                <field name="group_stock_production_lot"/>
-                                <field name="group_stock_tracking_lot"/>
-                                <field name="module_product_expiry"
-                                    attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                                 <separator string="Logistics" colspan="2"/>
-                                 <field name="group_stock_multiple_locations"/>
-                                 <field name="module_stock_invoice_directly"/>
-                                 <field name="module_stock_location"/>
-                                 <field name="decimal_precision" class="oe_inline"/>
-                            </group>
-                            <group>
-                                <separator string="Partners" colspan="2"/>
-                                <field name="module_claim_from_delivery"/>
-                                <separator string="Products" colspan="2"/>
-                                <field name="group_stock_packaging"/>
-                                <field name="group_uom"/>
-                                <field name="group_uos"/>
-                                <field name="group_stock_inventory_valuation" class="oe_inline"/>
-                                <field name="group_product_variant"/>
-                            </group>
+                            <separator string="Traceability" colspan="2"/>
+                            <field name="group_stock_production_lot"/>
+                            <field name="group_stock_tracking_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                             <separator string="Logistics" colspan="2"/>
+                             <field name="group_stock_multiple_locations"/>
+                             <field name="module_stock_invoice_directly"/>
+                             <field name="module_stock_location"/>
+                             <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                    </sheet>
+                        <group>
+                            <separator string="Partners" colspan="2"/>
+                            <field name="module_claim_from_delivery"/>
+                            <separator string="Products" colspan="2"/>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
+                            <field name="group_stock_inventory_valuation" class="oe_inline"/>
+                            <field name="group_product_variant"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 3664f735836..9a337221935 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
+                <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">