bugfixes and small improvements
bzr revid: nch@tinyerp.com-20081119093750-o6j0uweg12tya5go
This commit is contained in:
parent
f598229714
commit
bf7fd5ba71
|
@ -1,7 +1,7 @@
|
||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# OpenERP, Open Source Management Solution
|
# OpenERP, Open Source Management Solution
|
||||||
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||||
# $Id$
|
# $Id$
|
||||||
#
|
#
|
||||||
|
@ -27,7 +27,7 @@ import netsvc
|
||||||
class workflow(osv.osv):
|
class workflow(osv.osv):
|
||||||
_name = "workflow"
|
_name = "workflow"
|
||||||
_table = "wkf"
|
_table = "wkf"
|
||||||
_log_access = False
|
# _log_access = False
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Name', size=64, required=True),
|
'name': fields.char('Name', size=64, required=True),
|
||||||
'osv': fields.char('Resource Object', size=64, required=True,select=True),
|
'osv': fields.char('Resource Object', size=64, required=True,select=True),
|
||||||
|
@ -49,7 +49,7 @@ class workflow(osv.osv):
|
||||||
# scale = (vertical-distance, horizontal-distance, min-node-width(optional), min-node-height(optional), margin(default=20))
|
# scale = (vertical-distance, horizontal-distance, min-node-width(optional), min-node-height(optional), margin(default=20))
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
def graph_get(self, cr, uid, id, scale, context={}):
|
def graph_get(self, cr, uid, id, scale, context={}):
|
||||||
|
|
||||||
nodes= []
|
nodes= []
|
||||||
|
@ -67,24 +67,24 @@ class workflow(osv.osv):
|
||||||
else:
|
else:
|
||||||
if not a.in_transitions:
|
if not a.in_transitions:
|
||||||
no_ancester.append(a.id)
|
no_ancester.append(a.id)
|
||||||
|
|
||||||
for t in a.out_transitions:
|
for t in a.out_transitions:
|
||||||
transitions.append((a.id, t.act_to.id))
|
transitions.append((a.id, t.act_to.id))
|
||||||
tres[t.id] = (a.id, t.act_to.id)
|
tres[t.id] = (a.id, t.act_to.id)
|
||||||
|
|
||||||
|
|
||||||
g = graph(nodes, transitions, no_ancester)
|
g = graph(nodes, transitions, no_ancester)
|
||||||
g.process(start)
|
g.process(start)
|
||||||
g.scale(*scale)
|
g.scale(*scale)
|
||||||
result = g.result_get()
|
result = g.result_get()
|
||||||
results = {}
|
results = {}
|
||||||
|
|
||||||
for node in nodes_name:
|
for node in nodes_name:
|
||||||
results[str(node[0])] = result[node[0]]
|
results[str(node[0])] = result[node[0]]
|
||||||
results[str(node[0])]['name'] = node[1]
|
results[str(node[0])]['name'] = node[1]
|
||||||
|
|
||||||
return {'nodes': results, 'transitions': tres}
|
return {'nodes': results, 'transitions': tres}
|
||||||
|
|
||||||
|
|
||||||
def create(self, cr, user, vals, context=None):
|
def create(self, cr, user, vals, context=None):
|
||||||
if not context:
|
if not context:
|
||||||
|
@ -97,7 +97,7 @@ workflow()
|
||||||
class wkf_activity(osv.osv):
|
class wkf_activity(osv.osv):
|
||||||
_name = "workflow.activity"
|
_name = "workflow.activity"
|
||||||
_table = "wkf_activity"
|
_table = "wkf_activity"
|
||||||
_log_access = False
|
# _log_access = False
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Name', size=64, required=True),
|
'name': fields.char('Name', size=64, required=True),
|
||||||
'wkf_id': fields.many2one('workflow', 'Workflow', required=True, select=True, ondelete='cascade'),
|
'wkf_id': fields.many2one('workflow', 'Workflow', required=True, select=True, ondelete='cascade'),
|
||||||
|
@ -123,7 +123,7 @@ wkf_activity()
|
||||||
class wkf_transition(osv.osv):
|
class wkf_transition(osv.osv):
|
||||||
_table = "wkf_transition"
|
_table = "wkf_transition"
|
||||||
_name = "workflow.transition"
|
_name = "workflow.transition"
|
||||||
_log_access = False
|
# _log_access = False
|
||||||
_rec_name = 'signal'
|
_rec_name = 'signal'
|
||||||
_columns = {
|
_columns = {
|
||||||
'trigger_model': fields.char('Trigger Object', size=128),
|
'trigger_model': fields.char('Trigger Object', size=128),
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# OpenERP, Open Source Management Solution
|
# OpenERP, Open Source Management Solution
|
||||||
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||||
# $Id$
|
# $Id$
|
||||||
#
|
#
|
||||||
|
@ -92,7 +92,7 @@ def _tz_get(self,cr,uid, context={}):
|
||||||
|
|
||||||
class users(osv.osv):
|
class users(osv.osv):
|
||||||
_name = "res.users"
|
_name = "res.users"
|
||||||
_log_access = False
|
#_log_access = False
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Name', size=64, required=True, select=True),
|
'name': fields.char('Name', size=64, required=True, select=True),
|
||||||
'login': fields.char('Login', size=64, required=True),
|
'login': fields.char('Login', size=64, required=True),
|
||||||
|
|
|
@ -134,9 +134,9 @@
|
||||||
<rng:optional><rng:attribute name="id" /> </rng:optional>
|
<rng:optional><rng:attribute name="id" /> </rng:optional>
|
||||||
<rng:attribute name="model" />
|
<rng:attribute name="model" />
|
||||||
<rng:optional><rng:attribute name="forcecreate" /></rng:optional>
|
<rng:optional><rng:attribute name="forcecreate" /></rng:optional>
|
||||||
<rng:oneOrMore>
|
<rng:zeroOrMore>
|
||||||
<rng:ref name="field" />
|
<rng:ref name="field" />
|
||||||
</rng:oneOrMore>
|
</rng:zeroOrMore>
|
||||||
</rng:element>
|
</rng:element>
|
||||||
</rng:define>
|
</rng:define>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue