Skip to content

erp5
erp5
Commit cac1cb72 authored by Thibaut Deheunynck's avatar Thibaut Deheunynck
Browse files
Options

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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23004 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cdcfbafa
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 26 deletions
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/Organisation_viewFormList/listbox.xml
View file @ cac1cb72
...@@ -310,6 +310,12 @@ ...@@ -310,6 +310,12 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
...@@ -330,6 +336,10 @@ ...@@ -330,6 +336,10 @@
<string>corporate_registration_code</string> <string>corporate_registration_code</string>
<string>Corporate Registration Code</string> <string>Corporate Registration Code</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -357,6 +367,10 @@ ...@@ -357,6 +367,10 @@
<string>corporate_registration_code</string> <string>corporate_registration_code</string>
<string>Corporate Registration Code</string> <string>Corporate Registration Code</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_viewPersonList/listbox.xml
View file @ cac1cb72
...@@ -302,6 +302,12 @@ ...@@ -302,6 +302,12 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
...@@ -318,10 +324,6 @@ ...@@ -318,10 +324,6 @@
<string>title</string> <string>title</string>
<string>Name</string> <string>Name</string>
</tuple> </tuple>
<tuple>
<string>corporate_registration_code</string>
<string>RCCM</string>
</tuple>
<tuple> <tuple>
<string>birth_date</string> <string>birth_date</string>
<string>Birthday</string> <string>Birthday</string>
...@@ -330,10 +332,6 @@ ...@@ -330,10 +332,6 @@
<string>default_birthplace_address_city</string> <string>default_birthplace_address_city</string>
<string>Birthplace</string> <string>Birthplace</string>
</tuple> </tuple>
<tuple>
<string>role_title</string>
<string>Role</string>
</tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
...@@ -371,10 +369,6 @@ ...@@ -371,10 +369,6 @@
<string>title</string> <string>title</string>
<string>Usual Name</string> <string>Usual Name</string>
</tuple> </tuple>
<tuple>
<string>corporate_registration_code</string>
<string>RCCM</string>
</tuple>
<tuple> <tuple>
<string>birth_date</string> <string>birth_date</string>
<string>Birthday</string> <string>Birthday</string>
...@@ -383,10 +377,6 @@ ...@@ -383,10 +377,6 @@
<string>default_birthplace_address_city</string> <string>default_birthplace_address_city</string>
<string>Birthplace</string> <string>Birthplace</string>
</tuple> </tuple>
<tuple>
<string>role_title</string>
<string>Role</string>
</tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
...@@ -578,10 +568,6 @@ Role & Region ...@@ -578,10 +568,6 @@ Role & Region
<string>title</string> <string>title</string>
<string>Name</string> <string>Name</string>
</tuple> </tuple>
<tuple>
<string>corporate_registration_code</string>
<string>RCCM</string>
</tuple>
<tuple> <tuple>
<string>birth_date</string> <string>birth_date</string>
<string>Birthday</string> <string>Birthday</string>
...@@ -590,10 +576,6 @@ Role & Region ...@@ -590,10 +576,6 @@ Role & Region
<string>default_birthplace_address_city</string> <string>default_birthplace_address_city</string>
<string>Birthplace</string> <string>Birthplace</string>
</tuple> </tuple>
<tuple>
<string>role_title</string>
<string>Role</string>
</tuple>
<tuple> <tuple>
<string>translated_validation_state_title</string> <string>translated_validation_state_title</string>
<string>State</string> <string>State</string>
......
bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/scripts/verifyOrganisationExists.xml
View file @ cac1cb72
...@@ -74,7 +74,10 @@ person_module = portal.person_module\n ...@@ -74,7 +74,10 @@ person_module = portal.person_module\n
date = request_eform.getDate()\n date = request_eform.getDate()\n
if request_eform.getPortalType() == \'P2\':\n if request_eform.getPortalType() == \'P2\':\n
organisation_list = portal.portal_catalog(parent_uid = portal.organisation_module.getUid(),\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 ignore_empty_string = 0)\n
if not len(organisation_list):\n if not len(organisation_list):\n
raise ValidationFailed, \'Organisation was not found for this person\'\n raise ValidationFailed, \'Organisation was not found for this person\'\n
......
bt5/erp5_registry_ohada/bt/revision
View file @ cac1cb72
905 907
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7