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

[nobody at svn.erp5.org]

Author: seb
Date: Tue Apr 28 17:29:20 2009
New Revision: 26683

URL: http://svn.erp5.org?rev=26683&view=rev
Log:
2009-04-28 Seb
* make this script working if validation_state is already given as a parameter to this script

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=26683&r1=26682&r2=26683&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] Tue Apr 28 17:29:20 2009
@@ -78,10 +78,12 @@
 else:\n
   # sort_method can already exist in kw.\n
   kw[\'sort_method\'] = sort_by_date\n
+  if validation_state is None:\n
+    validation_state=\'validated\'\n
   predicate_list = context.portal_domains.searchPredicateList(\n
       context=movement,\n
       portal_type=\'Currency Exchange Line\',\n
-      validation_state=\'validated\',\n
+      validation_state=validation_state,\n
       test=1,\n
       **kw)\n
 \n
@@ -103,7 +105,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, validation_state=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -123,7 +125,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>3</int> </value>
+                        <value> <int>4</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -132,6 +134,7 @@
                             <string>default</string>
                             <string>movement</string>
                             <string>REQUEST</string>
+                            <string>validation_state</string>
                             <string>kw</string>
                             <string>sort_by_date</string>
                             <string>None</string>
@@ -158,6 +161,7 @@
                 <none/>
                 <none/>
                 <none/>
+                <none/>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=26683&r1=26682&r2=26683&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Apr 28 17:29:20 2009
@@ -1,1 +1,1 @@
-590
+591