Merge lp:~openerp-dev/openobject-addons/6.1-opw-578009-nep into lp:openobject-addons/6.1

Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 7044
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-578009-nep
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
sale/sale.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-578009-nep
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Nehal Panchal (OpenERP) (community) Needs Resubmitting
Review via email: mp+119473@code.launchpad.net

Description of the change

Hello,

Notes field of sale order lines is not being translated in customer's language.

This fixes the issue.

Thanks

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello Nehal,

I see that the original context keys (except:lang) passed in the method will be lost and a new context is build up with lang and partner_id key. i.e original context at line 1192 gets lost at line 1200. you should fix that too by updating the newly dict with the old one.

Thanks,
Naresh

review: Needs Fixing
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

my previous comment is no more valid as of with the latest code it was improved on stable 6.1 due to a merge of another OPW case (576019) on 2012-10-09 12:16:14 at 7022: <email address hidden>

so now the merge looks ok.

Thanks,
Naresh

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

so now you will only need this
  product_obj = product_obj.browse(cr, uid, product, context=context_partner)

don't you ?

review: Needs Information
Revision history for this message
Nehal Panchal (OpenERP) (nep-openerp) wrote :

Hello Sir,

I have applied the changes as per your suggestion.

Thanks

review: Needs Resubmitting
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578009-port-mma/+merge/132543 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,

Unmerged revisions

7044. By Nehal Panchal (OpenERP)

[FIX] sale : Notes field of sale order lines is not being translated in customer's language

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-10-09 12:16:14 +0000
+++ sale/sale.py 2012-10-25 11:36:23 +0000
@@ -1221,7 +1221,7 @@
1221 res = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)1221 res = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
1222 result = res.get('value', {})1222 result = res.get('value', {})
1223 warning_msgs = res.get('warning') and res['warning']['message'] or ''1223 warning_msgs = res.get('warning') and res['warning']['message'] or ''
1224 product_obj = product_obj.browse(cr, uid, product, context=context)1224 product_obj = product_obj.browse(cr, uid, product, context=context_partner)
12251225
1226 uom2 = False1226 uom2 = False
1227 if uom:1227 if uom: