Merge lp:~openerp-dev/openobject-client/6.0-opw-595350-rgo into lp:openobject-client/6.0

Proposed by Ravi Gohil (OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 1967
Merged at revision: 1967
Proposed branch: lp:~openerp-dev/openobject-client/6.0-opw-595350-rgo
Merge into: lp:openobject-client/6.0
Diff against target: 46 lines (+10/-7)
1 file modified
bin/widget/model/group.py (+10/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client/6.0-opw-595350-rgo
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+174972@code.launchpad.net

Description of the change

This branch is backported from lp:~openerp-dev/openobject-client/trunk-bug-756343-nch which fixes the issue mentioned in the bug report lp:756343

Kindly review the fix.

Thanks.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/widget/model/group.py'
--- bin/widget/model/group.py 2010-12-16 07:01:07 +0000
+++ bin/widget/model/group.py 2013-07-16 10:55:28 +0000
@@ -128,8 +128,8 @@
128 def set_sequence(self, get_id, rec_id, field='sequence'):128 def set_sequence(self, get_id, rec_id, field='sequence'):
129 seq_ids = []129 seq_ids = []
130 index = 0130 index = 0
131 for module in self.models:131 for model in self.models:
132 seq_ids += [module[field].get(module)]132 seq_ids += [model[field].get(model)]
133 index = index +1133 index = index +1
134134
135 set_list = list(set(seq_ids))135 set_list = list(set(seq_ids))
@@ -143,9 +143,10 @@
143 final_list = set_list + mod_list143 final_list = set_list + mod_list
144144
145 index = 0145 index = 0
146 for module in self.models:146 for model in self.models:
147 module[field].set(module, final_list[index], modified=True)147 model[field].set(model, final_list[index], modified=True)
148 module.save()148 if model.id:
149 model.save()
149 index = index +1150 index = index +1
150 else:151 else:
151 seq_id = []152 seq_id = []
@@ -156,7 +157,8 @@
156 index = 0157 index = 0
157 for x in range(get_id, rec_id):158 for x in range(get_id, rec_id):
158 self.models[x][field].set(self.models[x], sort_seq[index], modified=True)159 self.models[x][field].set(self.models[x], sort_seq[index], modified=True)
159 self.models[x].save()160 if self.models[x].id:
161 self.models[x].save()
160 index = index +1162 index = index +1
161 else:163 else:
162 for x in range(rec_id,get_id+1):164 for x in range(rec_id,get_id+1):
@@ -165,7 +167,8 @@
165 index = 0167 index = 0
166 for x in range(rec_id,get_id+1):168 for x in range(rec_id,get_id+1):
167 self.models[x][field].set(self.models[x], sort_seq[index], modified=True)169 self.models[x][field].set(self.models[x], sort_seq[index], modified=True)
168 self.models[x].save()170 if self.models[x].id:
171 self.models[x].save()
169 index = index +1172 index = index +1
170173
171174