From acd08bd3ccc7f8e200635e3b40f83bb1fc474c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 30 Nov 2015 10:38:38 +0000 Subject: [PATCH] base: do not blindly propagate **kw to catalog while looking up currency price (cherry picked from commit 2b084cbdb51403f6d0b5da583757bf83a30aa2d1) --- .../erp5_base/Currency_getPriceCalculationOperandDict.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml index 702ad0dc15..9e157b9482 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml @@ -78,6 +78,11 @@ else:\n if validation_state is None:\n validation_state = \'validated\'\n kw.setdefault(\'portal_type\', \'Currency Exchange Line\')\n +\n + # discard `categories` that might have been passed by Movement_getPriceCalculationOperandDict\n + # and that searchPredicateList does not accept.\n + kw.pop(\'categories\', None)\n +\n predicate_list = context.portal_domains.searchPredicateList(\n context=movement,\n validation_state=validation_state,\n -- 2.30.9