[Erp5-report] r31050 nicolas - /erp5/trunk/products/ERP5OOo/FormPrintout.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Dec  3 16:55:22 2009
New Revision: 31050

URL: http://svn.erp5.org?rev=31050&view=rev
Log:
cleanup and small fixes

Modified:
    erp5/trunk/products/ERP5OOo/FormPrintout.py

Modified: erp5/trunk/products/ERP5OOo/FormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/FormPrintout.py?rev=31050&r1=31049&r2=31050&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] Thu Dec  3 16:55:22 2009
@@ -1040,17 +1040,13 @@
     field_list = form.get_fields(include_disabled=1)
     REQUEST = here.REQUEST
     for (count, field) in enumerate(field_list):
-      field_value = self._renderField(field)
-      value = self._toUnicodeString(field_value)
       text_xpath = '//draw:frame[@draw:name="%s"]/*' % field.id
       node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
-      if len(node_list) is 0:
-        return element_tree
-
-      new_node = field.widget.render_odg(field, as_string=False)
+      if not node_list:
+        continue
+
+      new_node = field.widget.render_odg(field, as_string=False)#XXXrender_odg should be called on field, not on widget
       for node in node_list:
-        if new_node is not None:
-          parent_node = node.getparent()
-          parent_node.replace(node, new_node)
-
-      return element_tree
+        parent_node = node.getparent().replace(node, new_node)
+
+    return element_tree