Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1096206-hip into lp:openobject-addons

  1. trunk-bug-1096206-hip
  2. Merge into trunk
Proposed by Hiral Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1096206-hip
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
survey/survey.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1096206-hip
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+142084@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

8495. By Hiral Patel (OpenERP)

[Trunk/7.0] Survey pages must be ordered by survey, sequence not by sequence

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'survey/survey.py'
2--- survey/survey.py 2012-12-06 14:56:32 +0000
3+++ survey/survey.py 2013-01-07 10:33:25 +0000
4@@ -216,7 +216,7 @@
5 _name = 'survey.page'
6 _description = 'Survey Pages'
7 _rec_name = 'title'
8- _order = 'sequence'
9+ _order = 'survey_id DESC, sequence'
10 _columns = {
11 'title': fields.char('Page Title', size=128, required=1),
12 'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),

Subscribers

People subscribed via source and target branches

to all changes: