Merge lp:~openerp-dev/openobject-addons/trunk-opw-576026-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

I have update context in price_get_multi method of pricelist.py as it raised warning was not able to translate.

Code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

not a good fix. If it's not translated, it's because the context is not passed to in the method that called this function, not because you have to add it.

review: Disapprove

Unmerged revisions

7905. By Mayur Maheshwari(OpenERP) on 2012-11-01

[FIX]pricelist: Update context as it was none in method and was not able to translate raised exception

7904. By Launchpad Translations on behalf of openerp on 2012-11-01

Launchpad automatic translations update.

7903. By Stephane Wirtel (OpenERP) on 2012-10-31

[MERGE] point_of_sale: Fix some bugs

7902. By Vo Minh Thu on 2012-10-31

[FIX] base_gengo: fixed RST warnings in module description.

7901. By Quentin (OpenERP) <email address hidden> on 2012-10-31

[MERGE] merged the branch that adds yaml test on account voucher

7900. By Cedric Snauwaert (OpenERP) on 2012-10-31

[FIX]module mrp_repair: remove duplicate cancel button uppon creation of a repair order

7899. By Vo Minh Thu on 2012-10-31

[FIX] sale, hr: fixed RST warnings in module descriptions.

7898. By Launchpad Translations on behalf of openerp on 2012-10-31

Launchpad automatic translations update.

7897. By Olivier Dony (Odoo) on 2012-10-30

[FIX] account: currency_id must be passed to the chart installation wizard

Otherwise the installation of a chart of account
via the settings page fails miserably.

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2012-10-23 13:02:42 +0000
+++ product/pricelist.py	2012-11-06 09:53:30 +0000
@@ -148,6 +148,7 @@
 
         if context is None:
             context = {}
+        context.update({'lang': self.pool.get('res.users').context_get(cr, uid, context)['lang']})
 
         date = time.strftime('%Y-%m-%d')
         if 'date' in context: