diff --git a/product/ERP5SyncML/Conduit/ERP5Conduit.py b/product/ERP5SyncML/Conduit/ERP5Conduit.py index 31afbec9bd11bcda793f967257646a9dd2a592ec..ab8ffe8f2c1dcba1f360af4eb60434e4ec3a8799 100755 --- a/product/ERP5SyncML/Conduit/ERP5Conduit.py +++ b/product/ERP5SyncML/Conduit/ERP5Conduit.py @@ -243,7 +243,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): object.manage_delLocalGroupRoles([user]) if xml.nodeName in self.local_permission_list and not simulate: permission = self.getAttribute(xml,'id') - setPermissionMapping(permission,object) + object.manage_setLocalPermissions(permission) return conflict_list security.declareProtected(Permissions.ModifyPortalContent, 'updateNode') @@ -1047,7 +1047,7 @@ class ERP5Conduit(XMLSyncUtilsMixin): #user = roles[0] #roles = roles[1:] if xml.nodeName.find(self.local_permission_tag)>=0: - setPermissionMapping(permission,object,roles) + object.manage_setLocalPermissions(permission,roles) return conflict_list security.declareProtected(Permissions.ModifyPortalContent, 'editDocument') diff --git a/product/ERP5SyncML/XMLSyncUtils.py b/product/ERP5SyncML/XMLSyncUtils.py index ef460ff0aaf1270d81d8d32a4f1acd9e649a21a9..367e76d1e3f2d3c875b09fbb1f6cae5618d9070c 100755 --- a/product/ERP5SyncML/XMLSyncUtils.py +++ b/product/ERP5SyncML/XMLSyncUtils.py @@ -577,13 +577,14 @@ class XMLSyncUtilsMixin(SyncCode): if signature is not None: LOG('getSyncMLData',0,'signature.status: %s' % str(signature.getStatus())) LOG('getSyncMLData',0,'signature.action: %s' % str(signature.getAction())) - last_modification = object.ModificationDate() + last_modification = DateTime(object.ModificationDate()) last_synchronization = signature.getLastSynchronizationDate() parent = object.aq_parent # XXX CPS Specific if parent.id == 'portal_repository': if last_synchronization is not None and last_modification is not None: if last_synchronization > last_modification: + LOG('getSyncMLData, no modification on: ',0,object.id) signature.setStatus(self.SYNCHRONIZED) status = self.SENT more_data=0