From bf7fd5ba71a16a99419ff7bdf8adaad5920e39a3 Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Wed, 19 Nov 2008 15:07:50 +0530 Subject: [PATCH] bugfixes and small improvements bzr revid: nch@tinyerp.com-20081119093750-o6j0uweg12tya5go --- bin/addons/base/ir/workflow/workflow.py | 22 +++++++++++----------- bin/addons/base/res/res_user.py | 4 ++-- bin/import_xml.rng | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index 52e51ceddef..08d4fbba3e5 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -27,7 +27,7 @@ import netsvc class workflow(osv.osv): _name = "workflow" _table = "wkf" - _log_access = False + # _log_access = False _columns = { 'name': fields.char('Name', size=64, required=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)) # - + def graph_get(self, cr, uid, id, scale, context={}): nodes= [] @@ -67,24 +67,24 @@ class workflow(osv.osv): else: if not a.in_transitions: no_ancester.append(a.id) - + for t in a.out_transitions: transitions.append((a.id, t.act_to.id)) tres[t.id] = (a.id, t.act_to.id) - - + + g = graph(nodes, transitions, no_ancester) g.process(start) g.scale(*scale) result = g.result_get() results = {} - + for node in nodes_name: results[str(node[0])] = result[node[0]] results[str(node[0])]['name'] = node[1] - + return {'nodes': results, 'transitions': tres} - + def create(self, cr, user, vals, context=None): if not context: @@ -97,7 +97,7 @@ workflow() class wkf_activity(osv.osv): _name = "workflow.activity" _table = "wkf_activity" - _log_access = False + # _log_access = False _columns = { 'name': fields.char('Name', size=64, required=True), 'wkf_id': fields.many2one('workflow', 'Workflow', required=True, select=True, ondelete='cascade'), @@ -123,7 +123,7 @@ wkf_activity() class wkf_transition(osv.osv): _table = "wkf_transition" _name = "workflow.transition" - _log_access = False + # _log_access = False _rec_name = 'signal' _columns = { 'trigger_model': fields.char('Trigger Object', size=128), diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py index d9f84a0d29d..d6a1c3ac491 100644 --- a/bin/addons/base/res/res_user.py +++ b/bin/addons/base/res/res_user.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -92,7 +92,7 @@ def _tz_get(self,cr,uid, context={}): class users(osv.osv): _name = "res.users" - _log_access = False + #_log_access = False _columns = { 'name': fields.char('Name', size=64, required=True, select=True), 'login': fields.char('Login', size=64, required=True), diff --git a/bin/import_xml.rng b/bin/import_xml.rng index 91b3a9554e5..0b88766f472 100644 --- a/bin/import_xml.rng +++ b/bin/import_xml.rng @@ -134,9 +134,9 @@ - + - +