diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml index fccd74920c7e520610c74d88176b70e7a08897f5..25a65c3303c53e29122e4c7f8b50dd95e7cf0041 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml @@ -117,6 +117,8 @@ if kw.has_key("explanation_uid"):\n inventory_kw[\'explanation_uid\'] = kw[\'explanation_uid\']\n if len(kw[\'explanation_uid\'])==0:\n return total_inventory_list\n +if kw.has_key("cash_status"):\n + inventory_kw[\'variation_text\'] = "%%cash_status/%s%%" % kw[\'cash_status\']\n \n if at_date is not None:\n # XXX this make sure we look at the end of the day\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ERP5Banking_getExchangeValue.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ERP5Banking_getExchangeValue.xml index 168769c2258579770628844faa1416aa94d0d39b..6af9c072014f7acdce763b2cb2c72ecb57dfbf09 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ERP5Banking_getExchangeValue.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ERP5Banking_getExchangeValue.xml @@ -70,7 +70,7 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ -rate_list = context.CurrencyExchange_getExchangeRateList()\n +rate_list = context.CurrencyExchange_getExchangeRateList(from_currency=from_currency,to_currency=to_currency)\n rate = None\n if len(rate_list) > 0:\n rate = rate_list[0]\n @@ -107,7 +107,15 @@ return round(rate * price)\n </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>from_currency=None,to_currency=None</string> </value> + </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> </item> <item> <key> <string>errors</string> </key> @@ -127,12 +135,14 @@ return round(rate * price)\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>from_currency</string> + <string>to_currency</string> <string>_getattr_</string> <string>context</string> <string>rate_list</string> @@ -154,7 +164,10 @@ return round(rate * price)\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index d2c5ed2124821b21d11dcc57f6a116ed29593583..8d9f781b525d012ac086a85ada4d36c91a210fd8 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -116 \ No newline at end of file +118 \ No newline at end of file