[Erp5-report] r22959 - in /erp5/trunk/bt5/erp5_registry_ohada: WorkflowTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: thibaut
Date: Mon Aug 11 11:10:05 2008
New Revision: 22959

URL: http://svn.erp5.org?rev=22959&view=rev
Log:
thibaut
variables person_list  and query are useless. So I remove them.
fix typo for better comprehension

Modified:
    erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml
    erp5/trunk/bt5/erp5_registry_ohada/bt/revision

Modified: erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml?rev=22959&r1=22958&r2=22959&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml Mon Aug 11 11:10:05 2008
@@ -78,21 +78,17 @@
 rccm = request_eform.getCorporateRegistrationCode()\n
 application_date = request_eform.getDate()\n
 request_eform.setTitle(request_eform.getOwnerFirstName()+\' \'+request_eform.getOwnerLastName())\n
-#Build a query to search for merchant and then search for the organisation concerned\n
-query=ComplexQuery(Query(title=request_eform.getTitle()),\n
-             Query(birth_date=request_eform.getOwnerBirthday()),\n
-             Query(birthplace_city=request_eform.getOwnerBirthplace()),\n
-             operator="AND")\n
-person_list = [person.getObject() for person in portal.person_module.searchFolder(query=query)]\n
-org_list = [org.getObject() for org in portal.organisation_module.searchFolder(corporate_registration_code=rccm)]\n
-for org in org_list:\n
+\n
+organisation_list = [organisation.getObject() for organisation in \\\n
+     portal.organisation_module.searchFolder(corporate_registration_code=rccm)]\n
+for organisation in organisation_list:\n
   if request_eform.getDefinitiveCheck():\n
-    org.mettreEntrepriseEnCessation()\n
-    org.liquiderEntreprise()\n
-    org.radierEntreprise()\n
+    organisation.mettreEntrepriseEnCessation()\n
+    organisation.liquiderEntreprise()\n
+    organisation.radierEntreprise()\n
   elif request_eform.getTemporaryCheck():\n
-    org.edit(stop_date = request_eform.getFifthDate())\n
-    org.stopActivities()\n
+    organisation.edit(stop_date = request_eform.getFifthDate())\n
+    organisation.stopActivities()\n
 \n
 def attachLocationYearInfo(last_id):\n
   location_info = request_eform.getSite().split(\'/\')[0]\n
@@ -188,14 +184,11 @@
                             <string>portal</string>
                             <string>rccm</string>
                             <string>application_date</string>
-                            <string>query</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
-                            <string>person</string>
-                            <string>person_list</string>
-                            <string>org</string>
-                            <string>org_list</string>
+                            <string>organisation</string>
+                            <string>organisation_list</string>
                             <string>attachLocationYearInfo</string>
                             <string>new_registry_number</string>
                             <string>context</string>

Modified: erp5/trunk/bt5/erp5_registry_ohada/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/bt/revision?rev=22959&r1=22958&r2=22959&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/bt/revision (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/bt/revision Mon Aug 11 11:10:05 2008
@@ -1,1 +1,1 @@
-871
+872