From d3b43b91f516745684ce9583bc19bafc4a302c1d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 12:47:31 +0200
Subject: [PATCH] [FIX] sale: cleanup sale settings form

bzr revid: rco@openerp.com-20120622104731-8d55doo9x9z9xaur
---
 addons/sale/res_config_view.xml | 64 +++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 5b2e9269491..0c2a4756ca4 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,37 +9,47 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
-                    <separator string="Invoicing Policy" colspan="4"/>
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <newline/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    <group string="Invoicing Policy">
+                        <group>
+                            <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                            <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                            <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                        </group>
+                        <group>
+                            <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                            <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                                attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                        </group>
+                    </group>
 
-	                <separator string="Sale Order" colspan="4"/>
-	                <field name="group_uom"/>
-	                <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-	                <field name="group_sale_delivery_address"/>
-                    <field name="group_discount_per_so_line"/>
-	                <field name="group_sale_pricelist"/>
-	                <field name="module_sale_margin"/>
-	                <field name="group_multiple_shops"/>
-	                <field name="module_sale_layout"/>
-	                <field name="decimal_precision"/>
-	                <field name="module_sale_journal"/>
-	                <field name="module_warning"/>
+                    <group string="Sale Order">
+                        <group>
+	                        <field name="group_uom"/>
+                            <field name="group_sale_delivery_address"/>
+        	                <field name="group_sale_pricelist"/>
+        	                <field name="group_multiple_shops"/>
+                            <field name="module_warning"/>
+        	                <field name="decimal_precision"/>
+                        </group>
+                        <group>
+                            <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                            <field name="group_discount_per_so_line"/>
+                            <field name="module_sale_margin"/>
+                            <field name="module_sale_layout"/>
+                            <field name="module_sale_journal"/>
+                        </group>
+                    </group>
 
-	                <separator string="Contracts" colspan="4"/>
-	                <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-	                <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-	                <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
-               </group>
+	                <group string="Contracts">
+    	                <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+    	                <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+    	                <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    </group>
+                </group>
             </field>
         </record>