Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-opw-575650-port-cha into lp:openobject-server

  1. trunk-opw-575650-port-cha
  2. Merge into trunk
Proposed by Ajay Chauhan(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-opw-575650-port-cha
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-opw-575650-port-cha
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+138091@code.launchpad.net

Description of the change

Hello Sir,

[FIX] orm.py: Export data: key of selection field is not exported

Whenever we export the selection field its value exported, where it should be its key not the value.

This branch fixes this issue. Kindly review the branch and please share your views on it.

Code is forward port from 6.1

Thanks,
Ajay Chauhan

To post a comment you must log in.
lp:~openerp-dev/openobject-server/trunk-opw-575650-port-cha updated
4637. By Ajay Chauhan(OpenERP)

merge with lp:openobject-server

4638. By Ajay Chauhan(OpenERP)

[MERGE] merge with lp:openobject-server

Unmerged revisions

4638. By Ajay Chauhan(OpenERP)

[MERGE] merge with lp:openobject-server

4637. By Ajay Chauhan(OpenERP)

merge with lp:openobject-server

4636. By Somesh Khare(OpenERP)

[FIX] at export time selection field gets 'value' instead of 'key' in stored file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/orm.py'
2--- openerp/osv/orm.py 2012-12-12 21:02:47 +0000
3+++ openerp/osv/orm.py 2012-12-13 06:15:25 +0000
4@@ -1152,7 +1152,7 @@
5 if cols and cols._type == 'selection':
6 sel_list = cols.selection
7 if r and type(sel_list) == type([]):
8- r = [x[1] for x in sel_list if r==x[0]]
9+ r = [x[0] for x in sel_list if r==x[0]]
10 r = r and r[0] or False
11 if not r:
12 if f[i] in self._columns: