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

[Somesh Khare]

Hello Sir,

[Fix]: Product margin header is not translated due to the context did not passed lang correctly.

This branch fixes the issue.

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

Thanks
Somesh Khare

[Naresh(OpenERP) (nch-openerp)]

somesh use context.update(key=value) in the code also make necessary changes at other places too in the same file.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.1-opw-573426-skh]

6731. By Somesh Khare on 2012-04-06

[IMP] product,margin.py : used context.update(key=value) for the rest of the code to update the context as suggested

[Somesh Khare (somesh.khare)]

Hello Sir,

I have made the changes as suggested by you.

Thanks
Somesh Khare

review: Needs Resubmitting

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

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-573426-port-psi/+merge/132090 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,
Naresh

Unmerged revisions

6731. By Somesh Khare on 2012-04-06

[IMP] product,margin.py : used context.update(key=value) for the rest of the code to update the context as suggested

=== modified file 'product_margin/wizard/product_margin.py'
--- product_margin/wizard/product_margin.py	2011-01-14 00:11:01 +0000
+++ product_margin/wizard/product_margin.py	2012-04-06 09:36:19 +0000
@@ -64,11 +64,11 @@
         #get the current product.margin object to obtain the values from it
         product_margin_obj = self.browse(cr, uid, ids, context=context)[0]
 
-        context = {'invoice_state' : product_margin_obj.invoice_state}
+        context.update(invoice_state = product_margin_obj.invoice_state)
         if product_margin_obj.from_date:
-            context.update({'date_from': product_margin_obj.from_date})
+            context.update(date_from = product_margin_obj.from_date)
         if product_margin_obj.to_date:
-            context.update({'date_to': product_margin_obj.to_date})
+            context.update(date_to = product_margin_obj.to_date)
         return {
             'name': _('Product Margins'),
             'context': context,