[Erp5-report] r24554 - in /erp5/trunk/bt5/erp5_egov: WorkflowTemplateItem/portal_workflow/e...

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Nov 11 19:29:43 2008
New Revision: 24554

URL: http://svn.erp5.org?rev=24554&view=rev
Log:
set the organisation created on the career_subordination of the representant of the company

Modified:
    erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/SubscriptionForm_createAccount.xml
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/SubscriptionForm_createAccount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/SubscriptionForm_createAccount.xml?rev=24554&r1=24553&r2=24554&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/SubscriptionForm_createAccount.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/SubscriptionForm_createAccount.xml [utf8] Tue Nov 11 19:29:43 2008
@@ -58,22 +58,6 @@
 portal = changed_object.getPortalObject()\n
 organisation_module = portal.getDefaultModule(portal_type=\'Organisation\')\n
 \n
-# create the person wich represent the company\n
-person_module = portal.getDefaultModule(portal_type=\'Person\')\n
-accountant = person_module.newContent(portal_type=\'Person\',\n
-                         title=changed_object.getAccountantName(),\n
-                         default_telephone_text=changed_object.getAccountantTelNumber(),\n
-                         default_fax_text=changed_object.getAccountantFax(),\n
-                         default_email_text=changed_object.getAccountantEmail(),\n
-                         address_street_address=changed_object.getAccountantAddress(),\n
-                         address_city=changed_object.getAccountantCity(),\n
-                         default_address_region=changed_object.getAccountantCountry())\n
-if changed_object.getOptionAdministrator():\n
-  accountant.setFunction(\'entreprise/directeur/pdg/administrateur\')\n
-elif changed_object.getOptionManager():\n
-  accountant.setFunction(\'entreprise/directeur/pdg/gerant\')\n
-elif changed_object.getOptionDirector():\n
-  accountant.setFunction(\'entreprise/directeur/pdg/pdg\')\n
 \n
 result = changed_object.portal_catalog(portal_type=\'Organisation\',\n
            vat_code=changed_object.getNineaNumber())\n
@@ -93,6 +77,24 @@
       )\n
 else:\n
   organisation = result[0].getObject()\n
+\n
+# create the person wich represent the company\n
+person_module = portal.getDefaultModule(portal_type=\'Person\')\n
+accountant = person_module.newContent(portal_type=\'Person\',\n
+                         title=changed_object.getAccountantName(),\n
+                         default_telephone_text=changed_object.getAccountantTelNumber(),\n
+                         default_fax_text=changed_object.getAccountantFax(),\n
+                         default_email_text=changed_object.getAccountantEmail(),\n
+                         address_street_address=changed_object.getAccountantAddress(),\n
+                         address_city=changed_object.getAccountantCity(),\n
+                         default_address_region=changed_object.getAccountantCountry(),\n
+                         career_subordination_value=organisation)\n
+if changed_object.getOptionAdministrator():\n
+  accountant.setFunction(\'entreprise/directeur/pdg/administrateur\')\n
+elif changed_object.getOptionManager():\n
+  accountant.setFunction(\'entreprise/directeur/pdg/gerant\')\n
+elif changed_object.getOptionDirector():\n
+  accountant.setFunction(\'entreprise/directeur/pdg/pdg\')\n
 \n
 # set the login and password required a manager role, so a script with a \n
 # proxy role is used\n
@@ -150,11 +152,11 @@
                             <string>_getattr_</string>
                             <string>portal</string>
                             <string>organisation_module</string>
-                            <string>person_module</string>
-                            <string>accountant</string>
                             <string>result</string>
                             <string>len</string>
                             <string>organisation</string>
+                            <string>person_module</string>
+                            <string>accountant</string>
                             <string>context</string>
                             <string>login</string>
                             <string>password</string>

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=24554&r1=24553&r2=24554&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Tue Nov 11 19:29:43 2008
@@ -1,1 +1,1 @@
-445
+446