Merge lp:~openerp-dev/openobject-addons/6.1-opw-582705-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX]sale_crm: wrong salesman info on Quotation when convert to Quote from Opportunity.

Install sale_crm module.
Steps:
1. Create an Opportunity and set the user as "Demo User"
2. Press button "Convert To Quote"

See the "Salesman" information on the newly created Quotation, It should be either Salesman on the Opportunity or Partner User or logged in user. Here in the code it missed the Opportunity user.

Kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

Unmerged revisions

7096. By Somesh Khare on 2012-12-07

[FIX]sale_crm: wrong salesman info on Quotation when convert to Quote from Opportunity (Case: ref 582705)

=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py	2012-02-14 12:25:20 +0000
+++ sale_crm/wizard/crm_make_sale.py	2012-12-07 07:38:21 +0000
@@ -101,7 +101,7 @@
                     'fiscal_position': fpos,
                 }
                 if partner.id:
-                    vals['user_id'] = partner.user_id and partner.user_id.id or uid
+                    vals['user_id'] = case.user_id and case.user_id.id or partner.user_id and partner.user_id.id or uid
                 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})