[Erp5-report] r23004 - in /erp5/trunk/bt5/erp5_registry_ohada: SkinTemplateItem/portal_skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 14 20:04:10 CEST 2008
Author: thibaut
Date: Thu Aug 14 20:04:09 2008
New Revision: 23004
URL: http://svn.erp5.org?rev=23004&view=rev
Log:
thibaut
improve listbox in Organisation_viewFormList. Add a new column (translated_validation_state_title)
improve listbox in PersonModule_viewPersonList. Remove column registration_corporate_code and role_title
improve verifyOrganisationExists.
Modified:
erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml
erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml
erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml
erp5/trunk/bt5/erp5_registry_ohada/bt/revision
Modified: erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml?rev=23004&r1=23003&r2=23004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml Thu Aug 14 20:04:09 2008
@@ -311,6 +311,12 @@
</value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>values</string> </key>
<value>
<dictionary>
@@ -330,6 +336,10 @@
<string>corporate_registration_code</string>
<string>Corporate Registration Code</string>
</tuple>
+ <tuple>
+ <string>translated_validation_state_title</string>
+ <string>State</string>
+ </tuple>
</list>
</value>
</item>
@@ -356,6 +366,10 @@
<tuple>
<string>corporate_registration_code</string>
<string>Corporate Registration Code</string>
+ </tuple>
+ <tuple>
+ <string>translated_validation_state_title</string>
+ <string>State</string>
</tuple>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml?rev=23004&r1=23003&r2=23004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml Thu Aug 14 20:04:09 2008
@@ -303,6 +303,12 @@
</value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>values</string> </key>
<value>
<dictionary>
@@ -319,10 +325,6 @@
<string>Name</string>
</tuple>
<tuple>
- <string>corporate_registration_code</string>
- <string>RCCM</string>
- </tuple>
- <tuple>
<string>birth_date</string>
<string>Birthday</string>
</tuple>
@@ -331,10 +333,6 @@
<string>Birthplace</string>
</tuple>
<tuple>
- <string>role_title</string>
- <string>Role</string>
- </tuple>
- <tuple>
<string>description</string>
<string>Description</string>
</tuple>
@@ -372,20 +370,12 @@
<string>Usual Name</string>
</tuple>
<tuple>
- <string>corporate_registration_code</string>
- <string>RCCM</string>
- </tuple>
- <tuple>
<string>birth_date</string>
<string>Birthday</string>
</tuple>
<tuple>
<string>default_birthplace_address_city</string>
<string>Birthplace</string>
- </tuple>
- <tuple>
- <string>role_title</string>
- <string>Role</string>
</tuple>
<tuple>
<string>description</string>
@@ -579,20 +569,12 @@
<string>Name</string>
</tuple>
<tuple>
- <string>corporate_registration_code</string>
- <string>RCCM</string>
- </tuple>
- <tuple>
<string>birth_date</string>
<string>Birthday</string>
</tuple>
<tuple>
<string>default_birthplace_address_city</string>
<string>Birthplace</string>
- </tuple>
- <tuple>
- <string>role_title</string>
- <string>Role</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
Modified: erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml?rev=23004&r1=23003&r2=23004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml Thu Aug 14 20:04:09 2008
@@ -74,7 +74,10 @@
date = request_eform.getDate()\n
if request_eform.getPortalType() == \'P2\':\n
organisation_list = portal.portal_catalog(parent_uid = portal.organisation_module.getUid(),\n
- corporate_registration_code = request_eform.getCorporateRegistrationCode(),\n
+ corporate_registration_code = \\\n
+ request_eform.getEstablishmentModification() \\\n
+ and request_eform.getEstablishmentCorporateRegistrationCode()\\\n
+ or request_eform.getCompanyCorporateRegistrationCode(),\n
ignore_empty_string = 0)\n
if not len(organisation_list):\n
raise ValidationFailed, \'Organisation was not found for this person\'\n
Modified: erp5/trunk/bt5/erp5_registry_ohada/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/bt/revision?rev=23004&r1=23003&r2=23004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/bt/revision (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/bt/revision Thu Aug 14 20:04:09 2008
@@ -1,1 +1,1 @@
-905
+907
More information about the Erp5-report
mailing list