[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-remove-sheet-tag-setting-config-bde

bzr revid: atp@tinyerp.com-20120615073242-q2j74x3x317b2wzg

8 files changed, 96 insertions, 110 deletions

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 5046b122bf5..1dceb87d621 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -42,22 +42,20 @@
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
                 </header>
-                <sheet>
-                    <group>
-                        <group name="config_sale" colspan="4"/>
+                <group>
+                    <group name="config_sale" colspan="4"/>
 
-                        <!-- this part is necessary to allow the plugins to extend the view -->
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <separator string="Emails"/>
-                        </group>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                        <group name="config_crm" colspan="2"/>
+                    <!-- this part is necessary to allow the plugins to extend the view -->
+                    <field name="module_crm" invisible="1"/>
+                    <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <separator string="Emails"/>
                     </group>
-                </sheet>
+                    <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                    <newline/>
+                    <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+
+                    <group name="config_crm" colspan="2"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e3cfd96d26f..d78e3a4e5d1 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -19,27 +19,25 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Additional Features" colspan="4"/>
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_contract"/>
-                            <field name="module_hr_holidays"/>
-                            <newline/>
-                            <field name="module_hr_payroll"/>
-                            <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                                string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
+                    <group col="4">
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <field name="module_hr_recruitment"/>
+                        <field name="module_hr_evaluation"/>
+                        <field name="module_hr_contract"/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <field name="module_hr_payroll"/>
+                        <button colspan="2" name="%(open_payroll_modules)d" type="action"
+                            string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
 
-                            <separator string="Timesheets" colspan="4"/>
-                            <field name="module_hr_attendance"/>
-                            <field name="module_hr_timesheet"/>
-                            <field name="module_hr_timesheet_sheet"/>
+                        <separator string="Timesheets" colspan="4"/>
+                        <field name="module_hr_attendance"/>
+                        <field name="module_hr_timesheet"/>
+                        <field name="module_hr_timesheet_sheet"/>
 
-                            <group name="config_recruitment" colspan="4"/>
-                         </group>
-                    </sheet>
+                        <group name="config_recruitment" colspan="4"/>
+                     </group>
                 </form>
             </field>
         </record>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 2e5e6785438..23d3d9d0f6c 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -11,19 +11,18 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
+                    <newline/>
+                    <separator string="Wiki" colspan="4"/>
+                    <field name="module_wiki_faq"/>
+                    <newline/>
+                    <field name="module_wiki_quality_manual"/>
 
-                        <separator string="Documents" colspan="4"/>
-                        <field name="module_document"/>
-                        <newline/>
-                        <field name="module_document_ftp"/>
-                        <newline/>
-                        <field name="module_document_webdav"/>
-                    </sheet>
+                    <separator string="Documents" colspan="4"/>
+                    <field name="module_document"/>
+                    <newline/>
+                    <field name="module_document_ftp"/>
+                    <newline/>
+                    <field name="module_document_webdav"/>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c51818f13f5..acbfc4ad9ba 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -11,13 +11,11 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4" string="Campaigns">
-                            <field name="module_marketing_campaign"/>
-                            <field name="module_marketing_campaign_crm_demo"/>
-                            <field name="module_crm_profiling"/>
-                        </group>
-                    </sheet>
+                    <group col="4" string="Campaigns">
+                        <field name="module_marketing_campaign"/>
+                        <field name="module_marketing_campaign_crm_demo"/>
+                        <field name="module_crm_profiling"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index be54110d641..a00bf797318 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,22 +11,21 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <group col="4" string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Logistics" col="4">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material" col="4">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                    </sheet>
+                    <newline/>
+                    <group col="4" string="Manufacturing Order">
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                    </group>
+                    <group string="Logistics" col="4">
+                        <field name="module_mrp_jit"/>
+                        <field name="module_stock_no_autopicking"/>
+                    </group>
+                    <group string="Bill Of Material" col="4">
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9d1e19a7c81..18c7875fcdc 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,25 +12,23 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Project" colspan="4"/>
-                            <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"/>
+                    <group col="4">
+                        <separator string="Project" colspan="4"/>
+                        <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"/>
 
-                            <separator string="Planning" colspan="4"/>
-                            <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                            <separator string="Helpdesk and Support" colspan="4"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                            <group name="support" colspan="4"/>
-                        </group>
-                    </sheet>
+                        <separator string="Helpdesk and Support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c45503faa36..c7765e756c6 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -11,7 +11,6 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
                     <group col="4">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
@@ -28,7 +27,6 @@
                         <separator string="Products" colspan="4"/>
                         <field name="module_product_manufacturer"/>
                     </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index de3e91ee183..77bf887c13d 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -12,32 +12,30 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Traceability" colspan="4"/>
-                            <field name="group_stock_production_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                            <newline/>
-                            <field name="group_stock_tracking_lot"/>
+                    <group col="4">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                            <separator string="Logistics" colspan="4"/>
-                            <field name="group_stock_multiple_locations"/>
-                            <field name="module_stock_location"/>
-                            <field name="module_stock_invoice_directly"/>
-                            <field name="decimal_precision"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
+                        <field name="decimal_precision"/>
 
-                            <separator string="Products" colspan="4"/>
-                            <field name="group_stock_packaging"/>
-                            <field name="group_stock_inventory_valuation"/>
-                            <field name="group_uom"/>
-                            <field name="group_uos"/>
-                            <field name="group_product_variant"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
+                        <field name="group_product_variant"/>
 
-                            <separator string="Partners" colspan="4"/>
-                            <field name="module_claim_from_delivery"/>
-                        </group>
-                    </sheet>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>