From 79cf29697c65332fa90f79d1c075261ac488db58 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 20 Sep 2012 16:16:02 +0200
Subject: [PATCH] [FIX] sale, sale_stock: res_config review

bzr revid: qdp-launchpad@openerp.com-20120920141602-ckewes9a4m3qwoho
---
 addons/sale/res_config_view.xml | 1 +
 addons/sale/sale_data.xml       | 1 -
 addons/sale_stock/res_config.py | 6 ++++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 5b27ee554ee..6150d4ce1a3 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>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 06a2457c44a..6f4ed76614e 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -33,7 +33,6 @@
 
         <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
-
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
             <field name="model">mail.group</field>
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 36e1dc7ed21..23d55a471ec 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -25,10 +25,11 @@ from tools.translate import _
 
 class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
+
     _columns = {
-        'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order',
+        'group_invoice_so_lines': fields.boolean('Generate invoices from the sale order',
             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'."),
+            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'."),
@@ -59,6 +60,7 @@ 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):