[Erp5-report] r18064 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: aurel
Date: Thu Dec  6 17:33:36 2007
New Revision: 18064

URL: http://svn.erp5.org?rev=18064&view=rev
Log:
remove properties earlier in import of bt, thus object import from
zope2.7 xml with be set in 2.8 format


Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=18064&r1=18063&r2=18064&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py Thu Dec  6 17:33:36 2007
@@ -606,6 +606,7 @@
         obj = connection.importFile(file_obj, customImporters=customImporters)
     else:
       obj = connection.importFile(file_obj, customImporters=customImporters)
+    self.removeProperties(obj)
     self._objects[file_name[:-4]] = obj
 
   def preinstall(self, context, installed_bt, **kw):
@@ -619,7 +620,6 @@
           # compare object to see it there is changes
           new_object = self._objects[path]
           old_object = installed_bt._objects[path]
-          new_object = self.removeProperties(new_object)
           old_object = self.removeProperties(old_object)
           new_io = StringIO()
           old_io = StringIO()
@@ -2097,6 +2097,7 @@
         obj=obj.aq_parent
         connection=obj._p_jar
       obj = connection.importFile(file, customImporters=customImporters)
+      self.removeProperties(obj)
       self._objects[file_name[:-4]] = obj
     else:
       # recreate data mapping specific to catalog method