diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml index dd70f3848a471fa10aad1c06fdaf2080ee6b8db4..8c99d407ecc89934ebc9cbbf8e2cb36eac178ec7 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml @@ -110,6 +110,11 @@ def convertTravelerCheckReferenceToInt(traveler_check_reference):\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 # the contents must be preserved in the form.\n @@ -156,8 +161,8 @@ else:\n 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 @@ else:\n <string>field_error_dict</string> <string>generate_error</string> <string>convertTravelerCheckReferenceToInt</string> + <string>convertCheckReferenceToInt</string> <string>_getiter_</string> <string>range</string> <string>i</string> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml index 6607a01f2f17873671eb51b79ca6d91249316342..c341d0190ec32454a985b6f33115b50b00905009 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml @@ -77,11 +77,12 @@ def getReference(reference):\n # 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 +def generateReference(reference, original_reference):\n """\n - Convert an int into a reference\n + Convert an int into a reference of correct length\n """\n - return str(reference)\n + reference = str(reference)\n + return \'%s%s\' % (\'0\' * (len(original_reference) - len(reference)), reference)\n \n def validateTravelerCheckReferenceFormat(traveler_check_reference):\n """\n diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 7b27b2519708501bbe7893dc04388ba380c65f9e..83981c0e3aabbb291048f2d619c53f3bb686f5c7 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -173 \ No newline at end of file +175 \ No newline at end of file