diff options
| author | ced <> | 2006-12-08 15:56:12 +0000 |
|---|---|---|
| committer | ced <> | 2006-12-08 15:56:12 +0000 |
| commit | e5de2aa0d517b9f20a46b76b5a6cc3c6cec9edd1 (patch) | |
| tree | ba03ffb6b687d98f386a4e00af70b162ba774b42 | |
| parent | dd65cc47de05e295d6ec8e8a5b8a8401c7b8ee18 (diff) | |
Merge with trunk_old
bzr revid: ced-cc5076e909312caad8a03e83c0ebf2579af4e3b3
| -rw-r--r-- | bin/osv/orm.py | 1 | ||||
| -rw-r--r-- | bin/report/report_sxw.py | 11 | ||||
| -rw-r--r-- | bin/reportlab/platypus/doctemplate.py | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 337e27f0384..3568315b6f0 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -639,6 +639,7 @@ class orm(object): try: self.create(cr, uid, res, context) except Exception, e: + print e cr.rollback() return (-1, res, e[0], warning) done += 1 diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 2b4c648b365..0293c24fa29 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -254,12 +254,17 @@ class rml_parse(object): def _add_header(self, node): rml_head = tools.file_open('custom/corporate_rml_header.rml').read() head_dom = xml.dom.minidom.parseString(rml_head) + for frame in head_dom.getElementsByTagName('frame'): + frame.parentNode.removeChild(frame) node2 = head_dom.documentElement for tag in node2.childNodes: if tag.nodeType==tag.ELEMENT_NODE: found = self._find_node(node, tag.localName) + rml_frames = found.getElementsByTagName('frame') if found: found.parentNode.replaceChild(tag, found) + for frame in rml_frames: + tag.appendChild(frame) return True def preprocess(self, objects, data, ids): @@ -298,9 +303,9 @@ class report_sxw(report_rml): rml_dom = xml.dom.minidom.parseString(rml) rml2 = rml_parser._parse(rml_dom, objs, data) - #f = file("/tmp/debug.rml", "w") - #f.write(rml2) - #f.close() + f = file("/tmp/debug.rml", "w") + f.write(rml2) + f.close() report_type= data.get('report_type','pdf') create_doc = self.generators[report_type] pdf = create_doc(rml2) diff --git a/bin/reportlab/platypus/doctemplate.py b/bin/reportlab/platypus/doctemplate.py index 9adcba939d2..9e3e48524ab 100644 --- a/bin/reportlab/platypus/doctemplate.py +++ b/bin/reportlab/platypus/doctemplate.py @@ -478,7 +478,7 @@ class BaseDocTemplate: else: raise TypeError, "argument fx should be string or integer" - def handle_currentFrame(self,fx): + def handle_currentFrame(self, fx, resume=0): '''chenge to the frame with name or index fx''' if type(fx) is StringType: for f in self.pageTemplate.frames: |