From b29220b9c7154a5ee17b01d932a4c95054aa2b4c Mon Sep 17 00:00:00 2001
From: Dikshit Prajapati <pdi@openerp.com>
Date: Thu, 30 Oct 2014 18:08:54 +0530
Subject: [PATCH] [IMP] sale & sale_stock : removed 'Enable Invoicing Sales
 order lines' group from user setting and 'Generate invoices
 based on the sales order lines' group from sale setting.

---
 addons/sale/res_config.py              |    3 ---
 addons/sale/res_config_view.xml        |    4 ----
 addons/sale/sale_view.xml              |    3 +++
 addons/sale/security/sale_security.xml |    5 -----
 addons/sale_stock/res_config.py        |    4 +---
 addons/sale_stock/res_config_view.xml  |   15 +++------------
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 481892d..c4842c8 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -31,9 +31,6 @@ class sale_configuration(osv.TransientModel):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Generate invoices based on the sales order lines',
-            implied_group='sale.group_invoice_so_lines',
-            help="To allow your salesman to make invoices for sales order lines using the menu 'Lines to Invoice'."),
         'timesheet': fields.boolean('Prepare invoices based on timesheets',
             help='For modifying account analytic view to show important data to project manager of services companies.'
                  'You can also view the report of account analytic summary user-wise as well as month wise.\n'
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 771eacf..5745c68 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -11,10 +11,6 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div name="group_invoice_so_lines">
-                                <field name="group_invoice_so_lines" class="oe_inline"/>
-                                <label for="group_invoice_so_lines"/>
-                            </div>
                             <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 45d13bc..ad979ee 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -484,6 +484,9 @@
             </field>
         </record>
 
+        <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner"/>
+        <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2"/>
+
         <record id="action_order_line_tree3" model="ir.actions.act_window">
             <field name="name">Uninvoiced and Delivered Lines</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index c34f29f..c733a46 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -24,11 +24,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_invoice_so_lines" model="res.groups">
-        <field name="name">Enable Invoicing Sales order lines</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_delivery_invoice_address" model="res.groups">
         <field name="name">Addresses in Sales Orders</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index ca56a89..765078f 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -84,9 +84,7 @@ class sale_configuration(osv.osv_memory):
         res = super(sale_configuration, self).set_sale_defaults(cr, uid, ids, context)
         return res
 
-    def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None):
+    def onchange_invoice_methods(self, cr, uid, ids, group_invoice_deli_orders, context=None):
         if not group_invoice_deli_orders:
             return {'value': {'default_order_policy': 'manual'}}
-        if not group_invoice_so_lines:
-            return {'value': {'default_order_policy': 'picking'}}
         return {}
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index c68943f..4f20472 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -7,16 +7,10 @@
              <field name="inherit_id" ref="sale.view_sales_config"/>
              <field name="arch" type="xml">
                  <data>
-                     <xpath expr="//div[@name='group_invoice_so_lines']" position="replace">
-                         <div>
-                             <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                             <label for="group_invoice_so_lines"/>
-                         </div>
-                     </xpath>
                      <xpath expr="//div[@name='timesheet']" position="before">
                          <div>
-                             <field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                             <label for="group_invoice_deli_orders"/>
+                            <field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_deli_orders)"/>
+                            <label for="group_invoice_deli_orders"/>
                          </div>
                          <div>
                              <field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
@@ -24,7 +18,7 @@
                          </div>
                      </xpath>
                      <xpath expr="//div[@name='div_default_options']" position="inside">
-                         <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
+                         <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)],'required': [('group_invoice_deli_orders','=',True)]}">
                              <field name="default_order_policy" class="oe_inline" widget="radio"/>
                          </div>
                          <div>
@@ -48,9 +42,6 @@
                              <label for="group_mrp_properties"/>
                          </div>
                      </div>
-                     <field name="group_invoice_so_lines" position="replace">
-                         <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                     </field>
                      <xpath expr="//div[@name='Sale Features']" position="inside">
                          <div>
                               <field name="group_route_so_lines" class="oe_inline"/>
-- 
1.7.10.4