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 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 = {}