[Erp5-report] r14572 - in /erp5/trunk/bt5/erp5_banking_check: WorkflowTemplateItem/portal_w...

[nobody at svn.erp5.org]

Author: seb
Date: Wed May 23 17:16:38 2007
New Revision: 14572

URL: http://svn.erp5.org?rev=14572&view=rev
Log:
remove some code and call a script wich will be used by several modules

Modified:
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
    erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml?rev=14572&r1=14571&r2=14572&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.xml Wed May 23 17:16:38 2007
@@ -125,14 +125,8 @@
 \n
 # Automated calculation of the aggregate resource\n
 if check_resource is None:\n
-  entity_portal_type = bank_account.getParentValue().getPortalType()\n
-  check_model_reference = None\n
-  if entity_portal_type == \'Person\':\n
-    check_model_reference = \'CCOP\'\n
-  elif entity_portal_type == \'Organisation\':\n
-    check_model_reference = \'CCOP\'\n
-  check_resource = transaction.Base_getCheckModelByReference(\n
-                    reference=check_model_reference).getRelativeUrl()\n
+  check_resource = transaction.Base_getCheckModelByBankAccount(\n
+                    bank_account=bank_account).getRelativeUrl()\n
   transaction.edit(aggregate_resource=check_resource)\n
 \n
 if not check_number:\n
@@ -227,8 +221,6 @@
                             <string>bank_account</string>
                             <string>check_number</string>
                             <string>check_resource</string>
-                            <string>entity_portal_type</string>
-                            <string>check_model_reference</string>
                             <string>check</string>
                             <string>context</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml?rev=14572&r1=14571&r2=14572&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml Wed May 23 17:16:38 2007
@@ -142,7 +142,10 @@
     Check each given reference not to already exist.\n
   """\n
   context.log(\'query\', portal.portal_catalog(portal_type=\'Check\', reference=reference_list, destination_payment_uid=destination_payment_uid, resource_relative_url=model, src__=1))\n
-  match_list = portal.portal_catalog(portal_type=\'Check\', reference=reference_list, destination_payment_uid=destination_payment_uid, resource_relative_url=model)\n
+  if destination_payment_uid is None:\n
+    match_list = portal.portal_catalog(portal_type=\'Check\', reference=reference_list, resource_relative_url=model)\n
+  else:\n
+    match_list = portal.portal_catalog(portal_type=\'Check\', reference=reference_list, destination_payment_uid=destination_payment_uid, resource_relative_url=model)\n
   context.log(\'len\', len(match_list))\n
   assertReferenceMatchListEmpty(match_list)\n
   for reference in reference_list:\n
@@ -197,7 +200,7 @@
     destination_trade = line.getDestinationTrade()\n
   else:\n
     destination_payment_value = None\n
-    destination_payment_uid = "dummy"\n
+    destination_payment_uid = None\n
 \n
   aggregate_list = []\n
   for i in xrange(quantity):\n
@@ -217,13 +220,13 @@
       item.setTitle(\'%s - %s\' % (reference_range_min, reference_range_max))\n
       item.setCheckAmount(check_amount)\n
       destination_section = item.getDestinationSection()\n
-      for reference in reference_list:\n
-        tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, reference)\n
+      for j in reference_list:\n
+        tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, j)\n
         encountered_check_identifiers_dict[tag] = None\n
-        check = item.newContent(portal_type=\'Check\', title=str(reference), activate_kw={\'tag\': tag})\n
+        check = item.newContent(portal_type=\'Check\', title=j, activate_kw={\'tag\': tag})\n
         check.setDestination(destination_section)\n
         check.setStartDate(start_date)\n
-        check.setReference(reference)\n
+        check.setReference(j)\n
         check.setResource(model)\n
     else:\n
       checkReferenceUniqueness(reference_range_min, model, destination_payment_uid)\n
@@ -350,10 +353,9 @@
                             <string>reference_list</string>
                             <string>reference_range_max</string>
                             <string>destination_section</string>
-                            <string>reference</string>
+                            <string>j</string>
                             <string>tag</string>
                             <string>_write_</string>
-                            <string>str</string>
                             <string>check</string>
                             <string>len</string>
                             <string>item_type</string>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14572&r1=14571&r2=14572&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Wed May 23 17:16:38 2007
@@ -1,1 +1,1 @@
-240
+242