Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-bug-795442-xrg into lp:openobject-server/6.0

  1. 6.0-bug-795442-xrg
  2. Merge into 6.0
Proposed by xrg
Status: Merged
Approved by: Jay Vora (Serpent Consulting Services)
Approved revision: 3444
Merged at revision: 3444
Proposed branch: lp:~openerp-dev/openobject-server/6.0-bug-795442-xrg
Merge into: lp:openobject-server/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/base/res/res_lang.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-bug-795442-xrg
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+64131@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/res/res_lang.py'
2--- bin/addons/base/res/res_lang.py 2011-01-12 16:06:08 +0000
3+++ bin/addons/base/res/res_lang.py 2011-06-10 09:28:11 +0000
4@@ -43,7 +43,7 @@
5 values_obj = self.pool.get('ir.values')
6 if not lang_ids:
7 lang_id = self.load_lang(cr, uid, lang)
8- default_value = values_obj.get(cr, uid, 'default', False, 'res.partner')
9+ default_value = values_obj.get(cr, uid, 'default', False, ['res.partner'])
10 if not default_value:
11 values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
12 return True