use a dedicated method to handle getProperty() on objects

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2629 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5SyncML/Conduit/ERP5Conduit.py

@@ -316,7 +316,8 @@ class ERP5Conduit(XMLSyncUtilsMixin):
           isConflict = 0
           if (previous_xml is not None) and (not force): # if no previous_xml, no conflict
             old_data = self.getObjectProperty(keyword,previous_xml,data_type=data_type)
-            current_data = object.getProperty(keyword)
+            #current_data = object.getProperty(keyword)
+            current_data = self.getProperty(object, keyword)
             LOG('updateNode',0,'Conflict data: %s' % str(data))
             LOG('updateNode',0,'Conflict old_data: %s' % str(old_data))
             LOG('updateNode',0,'Conflict current_data: %s' % str(current_data))
@@ -1063,6 +1064,14 @@ class ERP5Conduit(XMLSyncUtilsMixin):
     """
     object._edit(**kw)
 
+  security.declareProtected(Permissions.ModifyPortalContent, 'getProperty')
+  def getProperty(self, object, kw):
+    """
+    This is the default getProperty method. This method
+    can easily be overwritten.
+    """
+    return object.getProperty(kw)
+
 
     # This doesn't works fine because all workflows variables
     # are not set the same way