X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fsale%2Fres_config_view.xml;h=b150fb276b772f1e5ea7c00651347b42111f5782;hb=598cf8d9b350de1b883010b5a7e2b3c40eecee89;hp=e510e51995b7fcd5520331ccc1bd0672cfaac7ee;hpb=f35c0b3d44af683353504d6913653a5fec34d356;p=odoo%2Fodoo.git

diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index e510e51..b150fb2 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="view_sales_config" model="ir.ui.view">
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
@@ -11,23 +12,19 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div name="invoice_so_lines">
-                                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines)" class="oe_inline"/>
+                            <div name="group_invoice_so_lines">
+                                <field name="group_invoice_so_lines" class="oe_inline"/>
                                 <label for="group_invoice_so_lines"/>
                             </div>
-                            <div>
+                            <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
                             </div>
                         </div>
                     </group>
                     <group name='default_options'>
-                        <label for="id" string="Default Options" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('module_account_analytic_analysis','=',False)]}"/>
+                        <label for="id" string="Default Options" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
                         <div>
-                            <div name='default_order_policy' attrs="{'invisible':[('group_invoice_so_lines','=',False)],'required': [('group_invoice_so_lines','=',True)]}">
-                                <label for="default_order_policy"/>
-                                <field name="default_order_policy" class="oe_inline"/>
-                            </div>
                             <div name='time_unit' attrs="{'invisible': [('module_account_analytic_analysis','=',False)],'required':[('module_account_analytic_analysis','=',True)]}">
                                 <label for="time_unit"/>
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
@@ -37,10 +34,6 @@
                 </div>
                 <div name="Customer Features" position="inside">
                     <div>
-                        <field name="group_sale_delivery_address" class="oe_inline"/>
-                        <label for="group_sale_delivery_address"/>
-                    </div>
-                    <div>
                         <field name="group_sale_pricelist" class="oe_inline"/>
                         <label for="group_sale_pricelist"/>
                     </div>
@@ -53,6 +46,10 @@
                     <group>
                         <label for="id" string="Warehouse Features"/>
                         <div name="warehouse_features">
+                            <div name='module_sale_stock'>
+                                <field name="module_sale_stock" class="oe_inline"/>
+                                <label for="module_sale_stock"/>
+                            </div>
                             <div name='module_sale_journal'>
                                 <field name="module_sale_journal" class="oe_inline"/>
                                 <label for="module_sale_journal"/>
@@ -72,10 +69,6 @@
                                 <field name="group_discount_per_so_line" class="oe_inline"/>
                                 <label for="group_discount_per_so_line"/>
                             </div>
-                            <div>
-                                <label for="decimal_precision"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </div>
                         </div>
                     </group>
                 </group>
@@ -93,13 +86,13 @@
                         your customer.
                     </p>
                     <group>
-                        <label for="id" string="Contract Feature"/>
+                        <label for="id" string="Contract Features"/>
                         <div>
                             <div>
                                 <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
                                 <label for="module_account_analytic_analysis"/>
                             </div>
-                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
+                            <div name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
                                 <field name="module_analytic_user_function" class="oe_inline"/>
                                 <label for="module_analytic_user_function"/>
                             </div>