diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4661f77b6c0..82d86b70049 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -241,7 +241,7 @@ class sale_order(osv.osv):
         'name': lambda obj, cr, uid, context: '/',
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
-        'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note,
+        'note': lambda self, cr, uid, context: self.get_salenote(cr, uid, [], context.get('partner_id'), context=context),
         'team_id': lambda s, cr, uid, c: s.pool['crm.team']._get_default_team_id(cr, uid, context=c),
     }
     _sql_constraints = [
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index be7e0e56275..5535678e556 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -102,7 +102,6 @@ class crm_make_sale(osv.osv_memory):
                     'date_order': fields.datetime.now(),
                     'fiscal_position': fpos,
                     'payment_term':payment_term,
-                    'note': sale_obj.get_salenote(cr, uid, [case.id], partner.id, context=context),
                     'opportunity_id': case.id,
                     'campaign_id': case.campaign_id and case.campaign_id.id or False,
                     'medium_id': case.medium_id and case.medium_id.id or False,
@@ -110,6 +109,7 @@ class crm_make_sale(osv.osv_memory):
                 }
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
+                context['partner_id'] = partner.id
                 new_id = sale_obj.create(cr, uid, vals, context=context)
                 sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})