[MERGE] from trunk

bzr revid: chm@openerp.com-20130522145042-3ril2zvogqs55ako
bzr revid: chm@openerp.com-20130524100533-fc0c7l47hb8j4xib

diff --cc addons/crm/crm_case_section_view.xml
Simple merge

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/crm_lead_view.xml
Simple merge

diff --cc addons/sale_crm/sale_crm.py
index 28b0387,3172999..bd3cd70
--- 1/addons/sale_crm/sale_crm.py
--- 2/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@@ -39,11 -31,12 +39,17 @@@ 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:
+             invoice_vals['section_id'] = order.section_id.id
+         return invoice_vals
+ 
  
  class crm_case_section(osv.osv):
      _inherit = 'crm.case.section'

diff --cc addons/sale_crm/sale_crm_view.xml
Simple merge