pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Resubmit the sequence problem of stage in project task

Browse Source 
lp bug: https://launchpad.net/bugs/783374 fixed

bzr revid: dbr@tinyerp.com-20110520124216-i4ktm8u2ijooxd7j
This commit is contained in:
DBR (OpenERP)
2011-05-20 18:12:16 +05:30
parent a7dcb53b31
commit f59bb5fae4
1 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project.py
+26 -42
View File
@@ -715,51 +715,35 @@ class task(osv.osv):
return True
def next_type(self, cr, uid, ids, *args):
for task in self.browse(cr, uid, ids):
typeid = task.type_id.id
types = map(lambda x:x.id, task.project_id.type_ids or [])
l = []
from operator import itemgetter
if types:
for type in task.project_id.type_ids:
l.append([type.sequence, type.id])
l.sort(key=itemgetter(0))
if type:
if not typeid:
self.write(cr, uid, task.id, {'type_id': l[0][1]})
else:
for o,sublist in enumerate(l):
position = o
if typeid in sublist:
if position >= len(l)-1:
return False
else:
self.write(cr, uid, task.id, {'type_id': l[position+1][1]})
return True
for task in self.browse(cr, uid, ids):
if task.project_id.type_ids:
typeid = task.type_id.id
types_seq={}
for type in task.project_id.type_ids :
types_seq[type.id] = type.sequence
types = sorted(types_seq.items(), lambda x, y: cmp(x[1], y[1]))
sorted_types = [x[0] for x in types]
if not typeid:
self.write(cr, uid, task.id, {'type_id': sorted_types[0]})
elif typeid and typeid in sorted_types and sorted_types.index(typeid) != len(sorted_types)-1:
index = sorted_types.index(typeid)
self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]})
return True
def prev_type(self, cr, uid, ids, *args):
for task in self.browse(cr, uid, ids):
typeid = task.type_id.id
types = map(lambda x:x.id, task.project_id and task.project_id.type_ids or [])
l = []
from operator import itemgetter
if types:
for type in task.project_id.type_ids:
l.append([type.sequence, type.id])
l.sort(key=itemgetter(0))
if type:
if not typeid:
self.write(cr, uid, task.id, {'type_id': False})
else:
for o,sublist in enumerate(l):
position = o
if typeid in sublist:
self.write(cr, uid, task.id, {'type_id': l[position-1][1]})
position = position-1
if position < 0:
self.write(cr, uid, task.id, {'type_id': False})
else:
return True
if task.project_id.type_ids:
typeid = task.type_id.id
types_seq={}
for type in task.project_id.type_ids :
types_seq[type.id] = type.sequence
types = sorted(types_seq.items(), lambda x, y: cmp(x[1], y[1]))
sorted_types = [x[0] for x in types]
if not typeid or sorted_types.index(typeid) <= 0 or [] :
self.write(cr, uid, task.id, {'type_id': False})
elif typeid and typeid in sorted_types and sorted_types.index(typeid) <= len(sorted_types)-1:
index = sorted_types.index(typeid)
self.write(cr, uid, task.id, {'type_id': sorted_types[index-1]})
return True
task()