From 0b84fe5865b81cb193b61774552489228d37fb22 Mon Sep 17 00:00:00 2001 From: NCH <> Date: Mon, 15 Jun 2009 12:05:23 +0530 Subject: [PATCH 1/3] [FIX] Added PageCount tag in report engine bzr revid: hda@hda-20090615063523-1vrjzg27w9iju4zs --- bin/report/render/rml2pdf/trml2pdf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index b281b34636b..497c3ae84e8 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -759,8 +759,12 @@ class _rml_template(object): def render(self, node_stories): fis = [] r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title) + story_cnt = 0 for node_story in node_stories: fis += r.render(node_story) + story_cnt += 1 + if story_cnt == len(self.localcontext['objects']): + fis.append(PageCount()) fis.append(platypus.PageBreak()) self.doc_tmpl.build(fis) From 846db679fcdf6bc13d76d46a66b4dab3a5a62f5c Mon Sep 17 00:00:00 2001 From: NCH <> Date: Mon, 15 Jun 2009 14:09:17 +0530 Subject: [PATCH 2/3] [FIX] Bad commit bzr revid: hda@hda-20090615083917-trbkrswmen8ne0kx --- bin/report/render/rml2pdf/trml2pdf.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 497c3ae84e8..989cd13ebe5 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -762,9 +762,10 @@ class _rml_template(object): story_cnt = 0 for node_story in node_stories: fis += r.render(node_story) - story_cnt += 1 - if story_cnt == len(self.localcontext['objects']): - fis.append(PageCount()) + if self.localcontext: + story_cnt += 1 + if story_cnt == len(self.localcontext['objects']): + fis.append(PageCount()) fis.append(platypus.PageBreak()) self.doc_tmpl.build(fis) From 7fa9e29568fc1943800158a99446d883161d20c4 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 16 Jun 2009 12:15:56 +0530 Subject: [PATCH 3/3] [IMP] Temporarily commented exception for browse record that broke reports from wizard bzr revid: jvo@tinyerp.com-20090616064556-tmbwkroo6d3s612q --- bin/osv/orm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 00ebed90859..6090cfbfc37 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -142,8 +142,8 @@ class browse_record(object): if not (id and isinstance(id, (int, long,))): raise BrowseRecordError(_('Wrong ID for the browse record, got %r, expected an integer.') % (id,)) - if not table.exists(cr, uid, id, context): - raise BrowseRecordError(_('Object %s does not exists') % (self,)) +# if not table.exists(cr, uid, id, context): +# raise BrowseRecordError(_('Object %s does not exists') % (self,)) if id not in self._data: self._data[id] = {'id': id}