From f1d90ac52599cc7d60b14a8b0626168102d6ca56 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 8 Oct 2008 15:42:40 +0200 Subject: [PATCH 1/3] fix typo bzr revid: christophe@tinyerp.com-20081008134240-7ko8nhq2wmynvpvw --- addons/account_report/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_report/account.py b/addons/account_report/account.py index acce98b0227..c00031457ec 100644 --- a/addons/account_report/account.py +++ b/addons/account_report/account.py @@ -125,7 +125,7 @@ class account_report(osv.osv): 'type': fields.selection([ ('fiscal', 'Fiscal statement'), ('indicator','Indicator'), - ('view','View') + ('view','View'), ('other','Others')], 'Type', required=True), 'expression': fields.char('Expression', size=240, required=True), From 75a1320849d4f373d3b92d4b5b8f004475cfe747 Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Wed, 8 Oct 2008 19:28:55 +0530 Subject: [PATCH 2/3] temp bugfix for module recorder _inherits bzr revid: hda@tinyerp.com-20081008135855-g3y39cbnpuvutclq --- addons/base_module_record/base_module_record.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 3f2af50d2d7..e01ec76ddfa 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -79,7 +79,11 @@ class base_module_record(osv.osv): self.depends[res[0]['module']]=True record_list = [record] fields = self.pool.get(model).fields_get(cr, uid) +# print "before>>>>",fields +# fields = self.pool.get(model).fields_view_get(cr, uid, context={})['fields'] +# print "after>>>>",fields for key,val in data.items(): + print key,val if not (val or (fields[key]['type']=='boolean')): continue if fields[key]['type'] in ('integer','float'): @@ -149,6 +153,7 @@ class base_module_record(osv.osv): return record_list, noupdate def _generate_object_xml(self, cr, uid, rec, recv, doc, result=None): + print "_generate_object_xml>>>",rec,recv,doc record_list = [] noupdate = False if rec[4]=='write': @@ -172,7 +177,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("openerp") + terp = doc.createElement("terp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': @@ -199,16 +204,21 @@ class base_module_record(osv.osv): data.appendChild(res) elif rec[0]=='assert': pass - return doc.toprettyxml(indent=" ").encode('utf8') + res = doc.toprettyxml(indent="\t") + return doc.toprettyxml(indent="\t").encode('utf8') base_module_record() def fnct_call(fnct): def execute(*args, **argv): + if type(args[5])==type({}): + _old_args=args[5].copy() res = fnct(*args, **argv) pool = pooler.get_pool(args[0]) mod = pool.get('ir.module.record') if mod and mod.recording: if args[4] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc'): + if type(args[5])==type({}): + args[5].update(_old_args) mod.recording_data.append(('query', args, argv,res)) return res return execute From f70443c129df8767847ddfc805f7ce22f6ccdebb Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Wed, 8 Oct 2008 20:08:58 +0530 Subject: [PATCH 3/3] Fixed graph layout. bzr revid: ame@tinyerp.com-20081008143858-3sihfusz0getwg12 --- addons/process/process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/process/process.py b/addons/process/process.py index 3702c7882c4..e4eff890061 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -232,8 +232,8 @@ class process_process(osv.osv): # fix the height problem miny = -1 for k,v in nodes.items(): - x = graph[k]['y'] - y = graph[k]['x'] + x = graph[k]['x'] + y = graph[k]['y'] if miny == -1: miny = y miny = min(y, miny)