diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml index f83d1a3cee954bdff417131e8fea41560911f3e5..0feff85d7bfc94ba3c5509fdf2623abc65c35a14 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.xml @@ -94,7 +94,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t \n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Cash Movement Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.xml index 1eb8de4741cc674f0e26e45bee46ddaaf39bde64..77819b1d5fdb66533c620d1996b961839e7c3441 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.xml @@ -85,19 +85,10 @@ if lettering is None:\n msg = Message(domain=\'ui\', message=\'No lettering defined.\')\n raise ValidationFailed, (msg,)\n \n -# Get price and total_price.\n -amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Internal Money Deposit\',\'Cash Delivery Cell\'],fast=0)\n -\n -if amount != total_price:\n - msg = Message(domain="ui", message="Amount differ from total price.")\n - raise ValidationFailed, (msg,)\n -\n if destination is None:\n msg = Message(domain=\'ui\', message=\'No counter defined.\')\n raise ValidationFailed, (msg,)\n \n -\n # check we are in an opened accounting day\n if not transaction.Baobab_checkCounterDateOpen(site=destination, date=transaction.getStartDate()):\n msg = Message(domain = "ui", message="Counter Date is not opened")\n @@ -112,15 +103,13 @@ if len(counter_list) == 0:\n msg = Message(domain = "ui", message="Counter is not opened")\n raise ValidationFailed, (msg,)\n \n -\n source = transaction.getSource()\n resource = transaction.CashDelivery_checkCounterInventory(source = source, portal_type=\'Cash Delivery Line\')\n -#transaction.log("call to CashDelivery_getCounterInventory return", resource)\n \n # Get price and total_price.\n price = transaction.getSourceTotalAssetPrice()\n -cash_detail = transaction.getTotalPrice(portal_type = \'Cash Delivery Cell\')\n -#transaction.log("price vs cash detail", str((price, cash_detail)))\n +cash_detail = transaction.getTotalPrice(portal_type = [\'Cash Delivery Line\', \'Cash Delivery Cell\'], fast=0)\n +\n if resource == 3:\n msg = Message(domain="ui", message="No banknote or coin defined.")\n raise ValidationFailed, (msg,)\n @@ -199,8 +188,6 @@ elif price != cash_detail:\n <string>destination</string> <string>lettering</string> <string>msg</string> - <string>amount</string> - <string>total_price</string> <string>site</string> <string>append</string> <string>$append0</string> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml index ff8a3a52addc8d028a2e7654f31937a974f09394..747939dfe8e8a9d2d1656d6d39781eb0528f1877 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml @@ -82,16 +82,9 @@ if (\'encaisse_des_externes\' not in vault and \'encaisse_des_billets_retires_de msg = Message(domain="ui", message="Invalid source.")\n raise ValidationFailed, (msg,)\n \n -"""\n -if \'encaisse_des_billets_neufs_non_emis\' in vault :\n - msg = Message(domain="ui", message="Invalid source.")\n -\n - raise ValidationFailed, (msg,)\n -"""\n -\n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Monetary Destruction Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.xml index e5f4f80b3d2d2a5ee6b10a85e5d6b97b1df74fda..dd914cccf1f3fbb9480bf85e4ad1d853a1022d86 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.xml @@ -80,7 +80,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t \n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Monetary Survey Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml index 4471eaa46563c451c658e51f3dbd30bd51726ee2..b1abaf369ed2e44ee3522dc11347244fa13593cd 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml @@ -92,7 +92,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t \n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Money Deposit Rendering Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml index 3f338b83ecc4104a97ad26786bada742775b6b35..b06acbeb68ae4b88e715b4ee07eb395c578c38cf 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml @@ -91,7 +91,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t \n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Money Deposit Transfer Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml index 45d018e5b13ddee7bd90ba37d4b5b43be1d9dbf2..9cda581d24a83028645d33f9e4b4f60225ba429e 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml @@ -93,7 +93,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t \n # Get price and total_price.\n amount = transaction.getSourceTotalAssetPrice()\n -total_price = transaction.getTotalPrice(portal_type=[\'Usual Cash Transer Line\',\'Cash Delivery Cell\'],fast=0)\n +total_price = transaction.getTotalPrice(portal_type=[\'Cash Delivery Line\',\'Cash Delivery Cell\'],fast=0)\n \n if resource == 2:\n msg = Message(domain="ui", message="No Resource.")\n diff --git a/bt5/erp5_banking_cash/bt/change_log b/bt5/erp5_banking_cash/bt/change_log index 65142729bb8e83bef10e1ee50fbd9f715d5a92db..13744f3dcd410836e74cd809b931b7f3f33246ed 100644 --- a/bt5/erp5_banking_cash/bt/change_log +++ b/bt5/erp5_banking_cash/bt/change_log @@ -1,3 +1,6 @@ +2006-10-19 aurel +* fix portal type list for getTotalPrice in wf script + 2006-10-13 aurel * added mutilated banknote diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index dec2bf5d6199c7cd0d84f3dc1e76a73ccc336302..43c451e0c6da52ad30bb605a60c7cb34497f3d30 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -19 \ No newline at end of file +54 \ No newline at end of file