From 69733f8d9647a037aae5e012acf509638c9c1084 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 26 Jan 2009 08:59:29 +0000 Subject: [PATCH] * calculate the value only once. * some cosmetic changes. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25301 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...urrency_getPriceCalculationOperandDict.xml | 27 ++++++++++--------- bt5/erp5_base/bt/revision | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) 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 8d1366ff7d..826439a775 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 @@ -76,22 +76,21 @@ def sort_by_date(a, b):\n if movement is None:\n return context.Resource_getPriceCalculationOperandDict(**kw)\n else:\n - # sort_method can already exist in kw. + # sort_method can already exist in kw.\n kw[\'sort_method\'] = sort_by_date\n predicate_list = context.portal_domains.searchPredicateList(\n - context=movement,\n - portal_type=\'Currency Exchange Line\',\n - validation_state=\'validated\',\n - test =1,\n - **kw )\n - \n - \n + context=movement,\n + portal_type=\'Currency Exchange Line\',\n + validation_state=\'validated\',\n + test=1,\n + **kw)\n \n -# For each predicate(i.e: Currency Exchange Line) found, get the exchange rate\n -# with the reference currency\n + # For each predicate(i.e: Currency Exchange Line) found, get the exchange rate\n + # with the reference currency\n for predicate in predicate_list:\n - if predicate.Resource_getPriceCalculationOperandDict(movement=predicate,**kw) is not None:\n - return predicate.Resource_getPriceCalculationOperandDict(movement=predicate,**kw)\n + operand_dict = predicate.Resource_getPriceCalculationOperandDict(movement=predicate, **kw)\n + if operand_dict is not None:\n + return operand_dict\n ]]></string> </value> @@ -104,7 +103,7 @@ else:\n </item> <item> <key> <string>_params</string> </key> - <value> <string>default=None,movement=None, REQUEST=None, **kw</string> </value> + <value> <string>default=None, movement=None, REQUEST=None, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -139,9 +138,11 @@ else:\n <string>_apply_</string> <string>_getattr_</string> <string>context</string> + <string>_write_</string> <string>predicate_list</string> <string>_getiter_</string> <string>predicate</string> + <string>operand_dict</string> </tuple> </value> </item> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 39886ae89b..88bc40f5cc 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -512 \ No newline at end of file +513 \ No newline at end of file -- 2.30.9