diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index 7a0f70c1e9c..8a6a6197ab3 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -149,7 +149,6 @@ class res_partner(osv.osv): 'customer': lambda *a: 1, 'category_id': _default_category, 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c), - 'lang': lambda self, cr, uid, context: context.get('lang',False) or tools.config.get('lang', False) } def copy(self, cr, uid, id, default={}, context={}): name = self.read(cr, uid, [id], ['name'])[0]['name'] diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py index 79f9ebc7467..d2dd53eab6b 100644 --- a/bin/addons/base/res/res_lang.py +++ b/bin/addons/base/res/res_lang.py @@ -32,9 +32,9 @@ class lang(osv.osv): _description = "Languages" def install_lang(self, cr, uid, **args): - avil_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))]) - if not avil_ids: - self.load_lang(cr, uid, tools.config.get('lang')) + lang_ids = self.search(cr, uid, [('code','=', tools.config.get('lang'))]) + if not lang_ids: + lang_id = self.load_lang(cr, uid, tools.config.get('lang')) return True def load_lang(self, cr, uid, lang, lang_name=None): @@ -73,12 +73,13 @@ class lang(osv.osv): 'decimal_point' : fix_xa0(str(locale.localeconv()['decimal_point'])), 'thousands_sep' : fix_xa0(str(locale.localeconv()['thousands_sep'])), } - + lang_id = False try: - self.create(cr, uid, lang_info) + lang_id = self.create(cr, uid, lang_info) + self.pool.get('ir.values').set(cr, uid, 'default', False, 'lang', ['res.partner'], lang) finally: tools.resetlocale() - return True + return lang_id def _get_default_date_format(self,cursor,user,context={}): return '%m/%d/%Y'