[Erp5-report] r14325 - in /erp5/trunk/bt5/erp5_banking_check: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: vincent
Date: Thu May  3 14:19:00 2007
New Revision: 14325

URL: http://svn.erp5.org?rev=14325&view=rev
Log:
Validate check reference length in fast input.
Fix reference generation at check generation time.

Modified:
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.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/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml?rev=14325&r1=14324&r2=14325&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml Thu May  3 14:19:00 2007
@@ -109,6 +109,11 @@
   if len(traveler_check_reference) != 10:\n
     raise ValueError\n
   return int(traveler_check_reference[4:])\n
+\n
+def convertCheckReferenceToInt(check_reference):\n
+  if len(check_reference) != 8:\n
+    raise ValueError, \'Check reference must be 8-char long.\'\n
+  return int(check_reference)\n
 \n
 # listbox is not passed at the first time when this script is called.\n
 # when the user clicks on the Update button, listbox is passed, and\n
@@ -156,8 +161,8 @@
         convert_func = convertTravelerCheckReferenceToInt\n
         value_denomination = \'traveler check reference\'\n
       else:\n
-        convert_func = int\n
-        value_denomination = \'number\'\n
+        convert_func = convertCheckReferenceToInt\n
+        value_denomination = \'check reference\'\n
       try:\n
         reference_range_min = convert_func(reference_range_min)\n
       except ValueError:\n
@@ -269,6 +274,7 @@
                             <string>field_error_dict</string>
                             <string>generate_error</string>
                             <string>convertTravelerCheckReferenceToInt</string>
+                            <string>convertCheckReferenceToInt</string>
                             <string>_getiter_</string>
                             <string>range</string>
                             <string>i</string>

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=14325&r1=14324&r2=14325&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 Thu May  3 14:19:00 2007
@@ -77,11 +77,12 @@
   # First convert to float to avoid failing to convert if reference = \'1.0\'\n
   return int(float(reference))\n
 \n
-def generateReference(reference, ignored):\n
-  """\n
-    Convert an int into a reference\n
-  """\n
-  return str(reference)\n
+def generateReference(reference, original_reference):\n
+  """\n
+    Convert an int into a reference of correct length\n
+  """\n
+  reference = str(reference)\n
+  return \'%s%s\' % (\'0\' * (len(original_reference) - len(reference)), reference)\n
 \n
 def validateTravelerCheckReferenceFormat(traveler_check_reference):\n
   """\n

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=14325&r1=14324&r2=14325&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Thu May  3 14:19:00 2007
@@ -1,1 +1,1 @@
-173
+175