merge

bzr revid: fp@tinyerp.com-20090616133833-1999c13bi13hxnse

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}

bin/report/render/rml2pdf/trml2pdf.py

@@ -759,8 +759,13 @@ 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)
+            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)