diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml index 986d02fd551b2ec254d16ee8ce3488ed88dccba5..1547e77bb0ac289ca9244821e14b6fcd980d5c99 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml @@ -97,7 +97,7 @@ if to_currency is not None:\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\':DateTime()\n + \'start_date\':start_date\n }\n temp_object.edit(**temp_kw)\n object = temp_object\n @@ -121,6 +121,9 @@ if to_currency is not None:\n currency_exchange_type=currency_exchange_type,\n from_currency=from_currency,to_currency=to_currency)\n else:\n + if start_date is None:\n + if getattr(context,\'isDelivery\',None):\n + start_date = context.getStartDate()\n mapped_value = context.portal_domains.generateMappedValue(object, \n has_cell_content=0, \n sort_method=sort_by_date)\n @@ -196,9 +199,9 @@ return result\n <string>None</string> <string>calculateExchangeFromParameters</string> <string>result</string> + <string>getattr</string> <string>_getattr_</string> <string>mapped_value</string> - <string>getattr</string> </tuple> </value> </item> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index b2412e34dff05e77952f3f930772631cac5a3be7..3d9aebb2cce8cad52bcdc4d24760f88a683c1eed 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -62 \ No newline at end of file +68 \ No newline at end of file