diff --git a/bt5/erp5_egov/TestTemplateItem/testEGovMixin.py b/bt5/erp5_egov/TestTemplateItem/testEGovMixin.py index f14c0b49d54c6c448e81f1f39f0fc7ca48c7ccaa..131a2bc7b85f09315b508fb10c4bae4ffee558ea 100644 --- a/bt5/erp5_egov/TestTemplateItem/testEGovMixin.py +++ b/bt5/erp5_egov/TestTemplateItem/testEGovMixin.py @@ -198,15 +198,13 @@ class TestEGovMixin(SecurityTestCase): for object in object_list: for permission, has in security_mapping.items(): if user.has_permission(permission, object) and not has: - self.fail('%s Permission should be Unauthorized on %s\n%s' % \ + self.fail('%s Permission should be Unauthorized on %s' % \ ( permission, - object.getRelativeUrl(), - object.Base_viewSecurity())) + object.getRelativeUrl())) if not(user.has_permission(permission, object)) and has: - self.fail('%s Permission should be Authorized on %s\n%s' % \ + self.fail('%s Permission should be Authorized on %s' % \ ( permission, - object.getRelativeUrl(), - object.Base_viewSecurity())) + object.getRelativeUrl())) def checkTransition(self, object_list, possible_transition_list, not_possible_transition_list, username): diff --git a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/checkAccountInexistance.xml b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/checkAccountInexistance.xml index fca33fecb240ef604a09d9117c12910f5e0b9852..a674502d15e625c3bd244f809f782846dbe88edc 100644 --- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/checkAccountInexistance.xml +++ b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/checkAccountInexistance.xml @@ -79,7 +79,7 @@ if len(result) > 1:\n raise ValidationFailed, "Error : There is more than one company with the "\\\n " registration code \'%s\'" % changed_object.getRccm()\n \n -if len(result) and result[0].getObject().getReference():\n +if len(result) == 1 and result[0].getObject().getReference():\n raise ValidationFailed, "Error : A company with the registration code \'%s\'"\\\n " already exists and have already an account" % changed_object.getRccm()\n \n @@ -107,6 +107,14 @@ if len((changed_object.portal_catalog(portal_type=\'Organisation\',\n <key> <string>_params</string> </key> <value> <string>state_change</string> </value> </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> <item> <key> <string>errors</string> </key> <value> diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index 61f9147fdcaa2af189830f4ea1ac5f9c552cd4f3..6610e117a35d94836d6a459d7e963a2333541531 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -275 \ No newline at end of file +277 \ No newline at end of file