diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml index 64ac6163f5f9b07eb63eee277831cb11a2d1baea..718b717f28fc2292d41382c89ba5ed4a3d54267a 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml @@ -545,11 +545,8 @@ <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.MethodField</string> - <string>Method</string> - </tuple> - <none/> + <global name="Method" module="Products.Formulator.MethodField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination_payment_reference.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination_payment_reference.xml index 8143121ae341273e0558da893dc7a6d06a49a92e..409c89bd5ef0a97c44458b14232fb8030d2aa3f4 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination_payment_reference.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/my_destination_payment_reference.xml @@ -511,7 +511,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.getDestinationPaymentInternalBankAccountNumber()</string> </value> + <value> <string>python: here.getDestinationPaymentValue().getInternalBankAccountNumber()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml index dda6436d414818c0cc46afec6fa60a71a2c927e3..6d147f12e15583dc2d8d020ffdfb7ad6f1af0982 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml @@ -263,7 +263,8 @@ elif import_type == \'create_subvaults\' :\n if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n if counter_name in two_way_counter_list:\n #context.log(\'add encaisse des billets et monnaies E/S\',counter_subvault)\n - subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "entrante"), None])\n + # Do not create "entrante" vault for currency subvaults, we only use sortante\n + #subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "entrante"), None])\n subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "sortante"), None])\n else:\n #context.log(\'add encaisse des billets et monnaies\',counter_subvault)\n diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index d3b981955773e59576c06a329282e9e01940b1ef..030d25b2869afffec1b755ad29fb9a35ad53a952 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -246 \ No newline at end of file +248 \ No newline at end of file