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

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Dec  3 16:43:22 2009
New Revision: 31045

URL: http://svn.erp5.org?rev=31045&view=rev
Log:
cleanup

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=31045&r1=31044&r2=31045&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] Thu Dec  3 16:43:22 2009
@@ -915,7 +915,7 @@
     iteration_index -- the index which is used when iterating the group of items using ReportSection.
     """
     field_list = form.get_fields(include_disabled=1) 
-    REQUEST = get_request()
+    REQUEST = here.REQUEST
     for (count, field) in enumerate(field_list):
       if isinstance(field, ListBox):
         element_tree = self._appendTableByListbox(element_tree=element_tree,
@@ -951,8 +951,8 @@
 
   def _replaceNodeViaReference(self, element_tree=None, field=None, iteration_index=0):
     """replace nodes (e.g. paragraphs) via ODF reference"""
-    element_tree = self._replaceNodeViaRangeReference(element_tree=element_tree, field=field)
-    element_tree = self._replaceNodeViaPointReference(element_tree=element_tree, field=field)
+    self._replaceNodeViaRangeReference(element_tree=element_tree, field=field)
+    self._replaceNodeViaPointReference(element_tree=element_tree, field=field)
     self._replaceNodeViaFormName(element_tree, field)
     return element_tree
 
@@ -983,7 +983,6 @@
                                iteration_index=iteration_index,
                                xpath=reference_xpath,
                                element_tree=element_tree)
-    return element_tree
 
   def _replaceNodeViaRangeReference(self, element_tree=None, field=None, iteration_index=0):
     """Replace text node via an ODF ranged reference.
@@ -1018,14 +1017,6 @@
                                iteration_index=iteration_index,
                                xpath=range_reference_xpath,
                                element_tree=element_tree)
-    return element_tree
-
-    # set when using report section
-    self._setUniqueElementName(base_name=field.id,
-                               iteration_index=iteration_index,
-                               xpath=range_reference_xpath,
-                               element_tree=element_tree)
-    return element_tree
 
   def _replaceNodeViaFormName(self, element_tree, field, iteration_index=0):
     """