From 101e933d28150aaf0940810d90e6dcde2d07d3a3 Mon Sep 17 00:00:00 2001 From: "Ysa (Open ERP)" Date: Fri, 2 Apr 2010 14:32:27 +0530 Subject: [PATCH 1/3] [IMP] workflow :- add domain in workflow field. bzr revid: ysa@tinyerp.co.in-20100402090227-6yqr461xps4jz97b --- bin/addons/base/ir/workflow/workflow.py | 1 + bin/addons/base/ir/workflow/workflow_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index 2a551e9549f..f32f0d842f7 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -151,6 +151,7 @@ class wkf_transition(osv.osv): 'condition': fields.char('Condition', required=True, size=128), 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'), 'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'), + 'workflow_id': fields.related('act_from', 'wkf_id', type='many2one', relation='workflow', string='Workflow'), } _defaults = { 'condition': lambda *a: 'True', diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index 04457f21338..c72d2f55ea3 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -35,8 +35,8 @@ - - + + From 4e056d7540fb0f2aec47617304ca77bd20c534e5 Mon Sep 17 00:00:00 2001 From: "Ysa (Open ERP)" Date: Fri, 2 Apr 2010 17:58:57 +0530 Subject: [PATCH 2/3] [IMP] diagram :- improve code. bzr revid: ysa@tinyerp.co.in-20100402122857-dpbc2b8nhgrzvtyq --- bin/addons/base/ir/workflow/workflow.py | 1 - bin/addons/base/ir/workflow/workflow_view.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index f32f0d842f7..2a551e9549f 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -151,7 +151,6 @@ class wkf_transition(osv.osv): 'condition': fields.char('Condition', required=True, size=128), 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'), 'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'), - 'workflow_id': fields.related('act_from', 'wkf_id', type='many2one', relation='workflow', string='Workflow'), } _defaults = { 'condition': lambda *a: 'True', diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index c72d2f55ea3..04457f21338 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -35,8 +35,8 @@ - - + + From e92975499ffbda6e9baed7f7cf08538611e6e239 Mon Sep 17 00:00:00 2001 From: "nel@tinyerp.com" <> Date: Tue, 6 Apr 2010 09:17:43 +0200 Subject: [PATCH 3/3] [FIX] context in read_group bzr revid: nel@tinyerp.com-20100406071743-qe507a4o2iwhgpd7 --- bin/osv/orm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 4f7e5fefdae..37432a9ff90 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1936,7 +1936,8 @@ class orm(orm_template): for d in data: d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain - d['__context'] = {'group_by':groupby_list[1:]} + if not isinstance(groupby_list,(str, unicode)): + d['__context'] = {'group_by':groupby_list[1:]} if fget.has_key(groupby): if d[groupby] and fget[groupby]['type'] in ('date','datetime'): dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')