From a3c677b33710d8bb213f8bec86ba59fe2c1b3698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Jun 2013 14:30:26 +0200
Subject: [PATCH] [CLEAN] sale, sale_crm: reverted some changes, cleaning
 before merging.

bzr revid: tde@openerp.com-20130604123026-f0xks6ky1rkw3ser
---
 addons/sale/sale.py            | 4 +++-
 addons/sale_crm/__openerp__.py | 2 +-
 addons/sale_crm/sale_crm.py    | 5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 577199ddaee..210e4dd3be6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -400,6 +400,8 @@ class sale_order(osv.osv):
     def _make_invoice(self, cr, uid, order, lines, context=None):
         inv_obj = self.pool.get('account.invoice')
         obj_invoice_line = self.pool.get('account.invoice.line')
+        if context is None:
+            context = {}
         invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
         from_line_invoice_ids = []
         for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
@@ -437,7 +439,7 @@ class sale_order(osv.osv):
             view of one of the newly created invoices
         """
         mod_obj = self.pool.get('ir.model.data')
-
+        
         # create invoices through the sales orders' workflow
         inv_ids0 = set(inv.id for sale in self.browse(cr, uid, ids, context) for inv in sale.invoice_ids)
         self.signal_manual_invoice(cr, uid, ids)
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 8cadff5b5ad..7db1aa1eff0 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -48,8 +48,8 @@ modules.
         'report/sale_crm_account_invoice_report_view.xml',
     ],
     'js': [
-        'static/src/js/sale_crm.js',
         'static/lib/justgage.js',
+        'static/src/js/sale_crm.js',
     ],
     'demo': ['sale_crm_demo.xml'],
     'test': ['test/sale_crm.yml'],
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 6a3e13f7016..97c5f4579e0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -34,11 +34,6 @@ class sale_order(osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
-    def _make_invoice(self, cr, uid, order, lines, context=None):
-        if order.section_id:
-            context = dict(context or {}, default_section_id= order.section_id.id)
-        return super(sale_order, self)._make_invoice(cr, uid, order, lines, context=context)
-
     def _prepare_invoice(self, cr, uid, order, lines, context=None):
         invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
         if order.section_id and order.section_id.id: