[Erp5-report] r26318 - in /erp5/trunk/products/ERP5OOo: FormPrintout.py __init__.py

[nobody at svn.erp5.org]

Author: tatuya
Date: Tue Apr  7 13:19:31 2009
New Revision: 26318

URL: http://svn.erp5.org?rev=26318&view=rev
Log:
* Revert 
  remove the DefaultValue feature because it did not consider localization

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

Modified: erp5/trunk/products/ERP5OOo/FormPrintout.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/FormPrintout.py?rev=26318&r1=26317&r2=26318&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/FormPrintout.py [utf8] Tue Apr  7 13:19:31 2009
@@ -330,7 +330,7 @@
                                                REQUEST=REQUEST)
       #elif isinstance(field, ImageField):
       #  element_tree = self._replace_xml_by_image_field(element_tree=element_tree,
-      #                                                 image_field=field)
+      #                                                  image_field=field)
       else:
         element_tree = self._replace_node_via_reference(element_tree=element_tree,
                                                         field=field)
@@ -529,9 +529,6 @@
     return row
 
   def _set_column_value(self, column, value):
-    # if the value is a DefaultValue, uses the ODF template value
-    if isinstance(value, DefaultValue) or value == DefaultValue:
-      return
     self._clear_column_value(column)
     if value is None:
       value = ''
@@ -611,18 +608,3 @@
   """ODTStrategy create a ODT Document from a form and a ODT template"""
   pass
 
-class DefaultValue:
-  """The DefaultValue is the marker object which indicate that using template value
-
-  Python Script Example: 'number' column uses ODF table cell value
-
-  from Products.PythonScripts.standard import Object
-  from Products.ERP5OOo.FormPrintout import DefaultValue
-
-  return [ Object(number=DefaultValue(),
-                  total_price=context.getTotalPrice())]
-  """
-  pass
-
-InitializeClass(DefaultValue)
-allow_class(DefaultValue)

Modified: erp5/trunk/products/ERP5OOo/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/__init__.py?rev=26318&r1=26317&r2=26318&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/__init__.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/__init__.py [utf8] Tue Apr  7 13:19:31 2009
@@ -42,8 +42,6 @@
 from AccessControl import ModuleSecurityInfo
 ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('OOoParser',)
 ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('newOOoParser',)
-# Allow access to DefaultValue from scripts
-ModuleSecurityInfo('Products.ERP5OOo.FormPrintout').declarePublic('DefalutValue',)
 
 # Define object classes and tools
 from OOoTemplate import OOoTemplate