Commit 1497d46e authored by Thibaut Deheunynck's avatar Thibaut Deheunynck

thibaut

variables person_list  and query are useless. So I remove them.
fix typo for better comprehension

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22959 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d54ff2b6
...@@ -78,21 +78,17 @@ portal = request_eform.getPortalObject()\n ...@@ -78,21 +78,17 @@ portal = request_eform.getPortalObject()\n
rccm = request_eform.getCorporateRegistrationCode()\n rccm = request_eform.getCorporateRegistrationCode()\n
application_date = request_eform.getDate()\n application_date = request_eform.getDate()\n
request_eform.setTitle(request_eform.getOwnerFirstName()+\' \'+request_eform.getOwnerLastName())\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 \n
query=ComplexQuery(Query(title=request_eform.getTitle()),\n organisation_list = [organisation.getObject() for organisation in \\\n
Query(birth_date=request_eform.getOwnerBirthday()),\n portal.organisation_module.searchFolder(corporate_registration_code=rccm)]\n
Query(birthplace_city=request_eform.getOwnerBirthplace()),\n for organisation in organisation_list:\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
if request_eform.getDefinitiveCheck():\n if request_eform.getDefinitiveCheck():\n
org.mettreEntrepriseEnCessation()\n organisation.mettreEntrepriseEnCessation()\n
org.liquiderEntreprise()\n organisation.liquiderEntreprise()\n
org.radierEntreprise()\n organisation.radierEntreprise()\n
elif request_eform.getTemporaryCheck():\n elif request_eform.getTemporaryCheck():\n
org.edit(stop_date = request_eform.getFifthDate())\n organisation.edit(stop_date = request_eform.getFifthDate())\n
org.stopActivities()\n organisation.stopActivities()\n
\n \n
def attachLocationYearInfo(last_id):\n def attachLocationYearInfo(last_id):\n
location_info = request_eform.getSite().split(\'/\')[0]\n location_info = request_eform.getSite().split(\'/\')[0]\n
...@@ -188,14 +184,11 @@ for history in history_list:\n ...@@ -188,14 +184,11 @@ for history in history_list:\n
<string>portal</string> <string>portal</string>
<string>rccm</string> <string>rccm</string>
<string>application_date</string> <string>application_date</string>
<string>query</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>person</string> <string>organisation</string>
<string>person_list</string> <string>organisation_list</string>
<string>org</string>
<string>org_list</string>
<string>attachLocationYearInfo</string> <string>attachLocationYearInfo</string>
<string>new_registry_number</string> <string>new_registry_number</string>
<string>context</string> <string>context</string>
......
871 872
\ 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