[Merge]with: lp:~openerp-dev/openobject-addons/trunk-v62_config

bzr revid: dbr@tinyerp.com-20120503091926-8p240csr3bbu09un

diff --cc addons/sale/res_config_view.xml
index 6645e94,73aabbe..88d881a
--- 1/addons/sale/res_config_view.xml
--- 2/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@@ -9,16 -9,17 +9,15 @@@
              <field name="inherit_id" ref="base.view_sale_config_settings"/>
              <field name="arch" type="xml">
                  <group name="config_sale" position="after">
-                     <separator string="Invoicing Policy" colspan="4"/>
 -                    <separator string="Picking and Invoice 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)]}"/>
 +                    <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)]}"/>
                      <newline/>
                      <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)]}"/>
                      <newline/>
                      <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                     <field name="module_project_timesheet" invisible="1"/>
-                     <field name="module_project_mrp" invisible="1"/>
 -                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
                      <newline/>
                      <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
                      <field name="time_unit" domain="[('category_id.name','=','Working Time')]"

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge