Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-opw-16490_fix_autogenerated_tree_view-xat into lp:openobject-server/6.0

  1. 6.0-opw-16490_fix_autogenerated_tree_view-xat
  2. Merge into 6.0
Proposed by Xavier ALT
Status: Merged
Merged at revision: 3625
Proposed branch: lp:~openerp-dev/openobject-server/6.0-opw-16490_fix_autogenerated_tree_view-xat
Merge into: lp:openobject-server/6.0
Diff against target: 19 lines (+5/-2)
1 file modified
bin/osv/orm.py (+5/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-opw-16490_fix_autogenerated_tree_view-xat
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+107178@code.launchpad.net

Description of the change

Hi,

This MP fix problem with auto-generated tree view which is not working on object having no columns (ex: stock.inventory.line.split). Change is similar to the fix done on trunk.

Regards,
Xavier

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py 2012-03-14 12:49:12 +0000
+++ bin/osv/orm.py 2012-05-24 09:26:20 +0000
@@ -1620,10 +1620,13 @@
1620 elif view_type == 'tree':1620 elif view_type == 'tree':
1621 _rec_name = self._rec_name1621 _rec_name = self._rec_name
1622 if _rec_name not in self._columns:1622 if _rec_name not in self._columns:
1623 _rec_name = self._columns.keys()[0]1623 if len(self._columns.keys()):
1624 _rec_name = self._columns.keys()[0]
1625 else:
1626 _rec_name = 'id'
1624 xml = '<?xml version="1.0" encoding="utf-8"?>' \1627 xml = '<?xml version="1.0" encoding="utf-8"?>' \
1625 '<tree string="%s"><field name="%s"/></tree>' \1628 '<tree string="%s"><field name="%s"/></tree>' \
1626 % (self._description, self._rec_name)1629 % (self._description, _rec_name)
16271630
1628 elif view_type == 'calendar':1631 elif view_type == 'calendar':
1629 xml = self.__get_default_calendar_view()1632 xml = self.__get_default_calendar_view()