From a9efeda6403fda96d39aa996c3b0740e650f1014 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 20 Sep 2012 16:36:16 +0200
Subject: [PATCH] [FIX] sale, sale_stock: moved back the group_invoice_so_lines
 into sale module, because it is used to hide/show the menuitem 'Lines to
 Invoice', in sale... which has nothing to do with stock

bzr revid: qdp-launchpad@openerp.com-20120920143616-trffd9jwwys528qr
---
 addons/sale/res_config.py       | 3 +++
 addons/sale/res_config_view.xml | 4 ++++
 addons/sale_stock/res_config.py | 4 ----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 4cfb1e7eb06..843e1fd3343 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,6 +27,9 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
+        'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order lines',
+            implied_group='sale.group_invoice_so_lines',
+            help="To allow your salesman to make invoices for sale 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.
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 6150d4ce1a3..9ebbc36f8de 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -12,6 +12,10 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
+                            <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>
                             <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 23d55a471ec..22b47833190 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -27,9 +27,6 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Generate invoices from the sale order',
-            implied_group='sale.group_invoice_so_lines',
-            help="This option sets your sales as to be invoiced manually, from the Sale Order"),
         'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
             implied_group='sale_stock.group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
@@ -60,7 +57,6 @@ class sale_configuration(osv.osv_memory):
 
     _defaults = {
         'default_order_policy': 'manual',
-        'group_invoice_so_lines': True,
     }
 
     def default_get(self, cr, uid, fields, context=None):