Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-576027-han into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-576027-han/+merge/111353
Hello,
I have update context in onchange_pricelist_id method of sale.py as it raised
warning was not able to translate.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-576027-han/+merge/111353
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-576027-han.
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-02-16 16:52:53 +0000
+++ sale/sale.py 2012-06-21 07:30:29 +0000
@@ -327,6 +327,7 @@
return True
def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
+ context.update({'lang': self.pool.get('res.users').context_get(cr, uid, context)['lang']})
if (not pricelist_id) or (not order_lines):
return {}
warning = {
@@ -646,7 +647,12 @@
return True
def action_wait(self, cr, uid, ids, context=None):
- for o in self.browse(cr, uid, ids):
+ if context is None:
+ context = {}
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ if user.context_lang:
+ context.update({'lang':user.context_lang})
+ for o in self.browse(cr, uid, ids, context=context):
if not o.order_line:
raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line.'))
if (o.order_policy == 'manual'):
=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py 2012-01-31 13:36:57 +0000
+++ stock/__openerp__.py 2012-06-21 07:30:29 +0000
@@ -30,7 +30,6 @@
Thanks to the double entry management, the inventory controlling is powerful and flexible:
* Moves history and planning,
- * Different inventory methods (FIFO, LIFO, ...)
* Stock valuation (standard or average price, ...)
* Robustness faced with Inventory differences
* Automatic reordering rules (stock level, JIT, ...)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
