From 94115788e2484f6120a0d280c8fbccfec24264ba Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 12 Nov 2012 15:26:20 +0100 Subject: [PATCH 1/2] [FIX] document_webdav: language field on res.user is just `lang` in 7.0, fix untested fp merge bzr revid: odo@openerp.com-20121112142620-zy2d1y8o4oj3zbud --- addons/document_webdav/document_webdav.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py index ad44a58ac26..cb1315140a3 100644 --- a/addons/document_webdav/document_webdav.py +++ b/addons/document_webdav/document_webdav.py @@ -51,10 +51,10 @@ class document_davdir(osv.osv): # that might be not worth preparing. nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav') usr_obj = self.pool.get('res.users') - res = usr_obj.read(cr, uid, uid, ['login','context_lang']) + res = usr_obj.read(cr, uid, uid, ['login','lang']) if res: nctx.extra_ctx['username'] = res['login'] - nctx.extra_ctx['lang'] = res['context_lang'] + nctx.extra_ctx['lang'] = res['lang'] # TODO group return From 66c21701736bb62ba074d77fb0855ea96adaa28f Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 12 Nov 2012 15:38:34 +0100 Subject: [PATCH 2/2] [FIX] sale: fix typo introduced in untested fix for translating sale order lines notes Would not have happened if old code was not reusing the same variable for holding different types, and breaking other best practices. bzr revid: odo@openerp.com-20121112143834-cjjzsrz2ah3l7mwd --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 83bebc67034..3c21492827f 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -938,7 +938,7 @@ class sale_order_line(osv.osv): result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id) if not flag: - result['name'] = product_obj.name_get(cr, uid, [product_obj.id], context=context_partner)[0][1] + result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context_partner)[0][1] if product_obj.description_sale: result['name'] += '\n'+product_obj.description_sale domain = {}