From 23218888dd48cd63f13f3db1b06377b716e0cc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Fri, 9 Nov 2007 16:59:28 +0000 Subject: [PATCH] change condition to record source trade git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17499 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml | 4 ++-- bt5/erp5_banking_cash/bt/revision | 2 +- .../CheckPayment_getBaobabSource.xml | 4 ++-- bt5/erp5_banking_check/bt/revision | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml index 4699e59b2e..0a4e797adf 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml @@ -66,7 +66,7 @@ <item> <key> <string>_body</string> </key> <value> <string>source_trade = context.getSourceTrade()\n -if source_trade is None:\n +if source_trade is None or context.getSimulationState() != \'delivered\':\n destination = context.getDestination()\n if destination is None:\n return None\n @@ -77,7 +77,7 @@ if source_trade is None:\n for site in site_list:\n if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\') and destination in site:\n source_trade = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n - if context.getSimulationState() == \'delivered\':\n + if context.getSourceTrade() != source_trade:\n context.setSourceTrade(source_trade)\n return source_trade\n from Products.ERP5Type.Message import Message\n diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index 2b9f7e8533..c97fea13d8 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -532 \ No newline at end of file +533 \ No newline at end of file diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml index 3c2904529f..687873659c 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml @@ -66,7 +66,7 @@ <item> <key> <string>_body</string> </key> <value> <string>source_trade = context.getSourceTrade()\n -if source_trade is None:\n +if source_trade is None or context.getSimulationState() != \'delivered\':\n user_id = context.Base_getLastUserIdByTransition(workflow_id=\'check_payment_workflow\', transition_id=\'deliver_action\')\n if user_id is not None:\n site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n @@ -77,7 +77,7 @@ if source_trade is None:\n source_trade = site + \'/encaisse_des_billets_et_monnaies/sortante\'\n # Save it only once we are sure that the document will not change any more\n # and that we will not have many users trying to do deliver_action\n - if context.getSimulationState() == \'delivered\':\n + if context.getSourceTrade() != source_trade:\n context.setSourceTrade(source_trade)\n return source_trade\n </string> </value> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 832f62a3cb..91a3d4243d 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -339 \ No newline at end of file +340 \ No newline at end of file -- 2.30.9