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

[nobody at svn.erp5.org]

Author: seb
Date: Thu Apr 26 17:42:26 2007
New Revision: 14245

URL: http://svn.erp5.org?rev=14245&view=rev
Log:
allow to specify a base price on the currency exchange line itself

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

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml?rev=14245&r1=14244&r2=14245&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml Thu Apr 26 17:42:26 2007
@@ -101,21 +101,29 @@
     from Products.ERP5Type.Document import newTempBase\n
     temp_object = newTempBase(context.getPortalObject(),\'temp_object\')\n
     temp_kw = {\'category_list\':[\'resource/%s\' % from_currency,\n
-                                \'currency_exchange_type/%s\' % currency_exchange_type,\n
                                 \'price_currency/%s\' % to_currency],\n
                \'start_date\':start_date\n
               }\n
+    if currency_exchange_type is not None:\n
+      temp_kw[\'category_list\'].append(\'currency_exchange_type/%s\' % currency_exchange_type)\n
     temp_object.edit(**temp_kw)\n
     object = temp_object\n
     mapped_value = context.portal_domains.generateMappedValue(object, \n
                                                       has_cell_content=0, \n
                                                       sort_method=sort_by_date)\n
-    result = [getattr(mapped_value, \'base_price\', None), \n
-              getattr(mapped_value, \'discount\', None)]\n
+    base_price = getattr(mapped_value, \'base_price\', None)\n
+    discount = getattr(mapped_value, \'discount\', None)\n
+    if base_price is None and discount is None:\n
+      mapped_value = context.portal_domains.generateMappedValue(object, \n
+                                                      has_cell_content=1, \n
+                                                      sort_method=sort_by_date)\n
+      base_price = getattr(mapped_value, \'base_price\', None)\n
+      discount = getattr(mapped_value, \'discount\', None)\n
+    result = [base_price, discount]\n
     return result\n
   # The cache duration must not be too long, 300 is the maximum\n
   calculateExchangeFromParameters = CachingMethod(calculateExchangeFromParameters, \n
-                      id = \'calculateExchangeFromParameterss\', cache_factory = \'erp5_ui_short\')\n
+                      id = \'calculateExchangeFromParameters\', cache_factory = \'erp5_ui_short\')\n
   result = calculateExchangeFromParameters(start_date=start_date,\n
                        currency_exchange_type=currency_exchange_type,\n
                        from_currency=from_currency,to_currency=to_currency)\n
@@ -153,7 +161,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>from_currency=None,to_currency=None,currency_exchange_type=\'sale\',start_date=None,**kw</string> </value>
+            <value> <string>from_currency=None,to_currency=None,currency_exchange_type=None,start_date=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -214,7 +222,7 @@
               <tuple>
                 <none/>
                 <none/>
-                <string>sale</string>
+                <none/>
                 <none/>
               </tuple>
             </value>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=14245&r1=14244&r2=14245&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Thu Apr 26 17:42:26 2007
@@ -1,1 +1,1 @@
-106
+107