From 1f5918a90af6b2d7f3258def840bf4257add2fa1 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Wed, 1 Sep 2010 13:04:29 +0000 Subject: [PATCH] Don't check uid accessors after checking value is not None. This breaks because of monkey-patched baobab uid getters (see ERP5Banking/Document/BankingOperation.py) in case where we are not interested in uids (ex: Cash Container Cell). The only cases it should detect should in fact be detected in unit tests (ie, stock impact invalid for a certain kind of document). Reverts partially r18818. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38107 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Base_checkBaobabSourceAndDestination.xml | 8 -------- bt5/erp5_banking_core/bt/revision | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml index 6994f1b9c7..2bbc5f7535 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml @@ -72,14 +72,6 @@ for object in object_to_check_list:\n context.log(\'Error on \', (context.getRelativeUrl(),node_url))\n msg = Message(domain=\'ui\',message=\'Sorry, wrong source or destination\')\n raise ValidationFailed, (msg,)\n - if baobab_source is not None and object.getBaobabSourceUid() is None:\n - context.log(\'Error on \', (context.getRelativeUrl(),baobab_source))\n - msg = Message(domain=\'ui\',message=\'Sorry, wrong source or destination\')\n - raise ValidationFailed, (msg,)\n - if baobab_destination is not None and object.getBaobabDestinationUid() is None:\n - context.log(\'Error on \', (context.getRelativeUrl(),baobab_destination))\n - msg = Message(domain=\'ui\',message=\'Sorry, wrong source or destination\')\n - raise ValidationFailed, (msg,)\n </string> </value> </item> <item> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 849baeed65..4970e693e1 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -543 +544 -- 2.30.9