[MERGE]

bzr revid: stephane@tinyerp.com-20090616143035-mpxmwhbawcy0vi6w

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

@@ -450,11 +450,11 @@ class _rml_flowable(object):
             for key in txt_n.attrib.keys():
                 if key in ('rml_except', 'rml_loop', 'rml_tag'):
                     del txt_n.attrib[key]
-            if not self._textual(n).isspace():
+            if True or not self._textual(n).isspace():
                 txt_n.text = self._textual(n)
                 txt_n.tail = ''
                 rc1 += etree.tostring(txt_n)
-        rc1 += utils._process_text(self, node.tail or '')
+        #rc1 += utils._process_text(self, node.tail or '')
         return rc1
 
     def _table(self, node):