[Erp5-report] r25301 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Jan 26 09:59:29 2009
New Revision: 25301

URL: http://svn.erp5.org?rev=25301&view=rev
Log:
* calculate the value only once.
* some cosmetic changes.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml?rev=25301&r1=25300&r2=25301&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_getPriceCalculationOperandDict.xml [utf8] Mon Jan 26 09:59:29 2009
@@ -76,22 +76,21 @@
 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 @@
         </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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=25301&r1=25300&r2=25301&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Jan 26 09:59:29 2009
@@ -1,1 +1,1 @@
-512
+513