From bbedacfaff097d07f93dbf212693d3a1f915fa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Tue, 17 Oct 2006 09:50:05 +0000 Subject: [PATCH] many order form changes + some fix for fast input git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10774 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../BankAccount_checkBalance.xml | 3 +- ...Delivery_generateCashDetailInputDialog.xml | 15 +- .../CashDetail_saveFastInputLine.xml | 28 +- .../CheckModule_viewCheckList.xml | 9 +- ...bookModelModule_viewCheckbookModelList.xml | 9 +- .../CheckbookModule_viewCheckbookList.xml | 9 +- .../CounterDateModule_viewCounterDateList.xml | 2 +- .../CounterDate_view/my_site.xml | 2 +- .../CounterModule_viewCounterList.xml | 2 +- .../CounterModule_viewReportDialog.xml | 9 +- .../CounterModule_viewVaultReport.xml | 2 +- ...urrencyCashModule_viewCurrencyCashList.xml | 9 +- .../Folder_viewCashCurrencyList.xml | 9 + .../Folder_viewCashCurrencyList/listbox.xml | 15 +- .../listbox_total_price.xml | 323 ++++++++++++++++++ .../erp5_banking_core/ImportCsvFileForm.xml | 16 +- 16 files changed, 429 insertions(+), 33 deletions(-) create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox_total_price.xml diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml index ba5d0a4e0d..4abc313452 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_checkBalance.xml @@ -89,7 +89,8 @@ if resource is None :\n raise AttributeError, \'No currency defined on %s\' % payment\n \n # Next, check the balance of the account\n -account_balance = resource.getFutureInventory(payment=payment, src__=src__)\n +# We must specify the resource !\n +account_balance = resource.getFutureInventory(payment=payment, resource=resource.getRelativeUrl(),src__=src__)\n if src__ :\n return account_balance \n \n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml index b729226103..25de1b0fd7 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml @@ -261,6 +261,12 @@ if listbox is None:\n currency_dict[\'price\'] = price\n total_price += price\n line_number += 1\n + # set default value for column\n + for counter, column in enumerate(axis_list_dict[\'column\']):\n + col_key = \'column%d\' % (counter + 1)\n + if not currency_dict.has_key(col_key):\n + currency_dict[col_key] = 0\n + currency_dict[\'number_line_to_add\'] = 0\n listbox.append(currency_dict)\n \n if line_number == 0:\n @@ -272,10 +278,14 @@ if listbox is None:\n \'cash_status\': cash_status_list[0],\n \'variation\': variation_list[0],\n \'additional_line_number\': 0,\n - \'price\': 0\n + \'price\': 0,\n + \'number_line_to_add\': 0\n }\n + # set default value for column\n + for counter, column in enumerate(axis_list_dict[\'column\']):\n + currency_dict[\'column%d\' % (counter + 1)] = 0\n listbox.append(currency_dict)\n -\n + \n other_parameter_list = (operation_currency, line_portal_type, read_only, column_base_category, use_inventory)\n context.Base_updateDialogForm(listbox=listbox\n , calculated_price=total_price\n @@ -489,6 +499,7 @@ else :\n <string>column</string> <string>quantity</string> <string>price</string> + <string>col_key</string> <string>other_parameter_list</string> <string>_apply_</string> <string>other_parameter</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml index 3bf2c70e69..f50aa48206 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml @@ -95,11 +95,17 @@ base_category_list = (\'emission_letter\', \'cash_status\', \'variation\')\n per_resource_dict = {}\n \n # remove previous line\n -old_line = context.objectValues(portal_type=[line_portal_type,])\n -#context.log("will erease old line", old_line)\n -if len(old_line)>0:\n - for object_list in old_line:\n - context.deleteContent(object_list.getId())\n +# specific case for monetary issue\n +if context.getPortalType() == "Monetary Issue":\n + old_line = [id for id in context.objectIds()]\n + if len(old_line)>0:\n + for line_id in old_line:\n + context.deleteContent(line_id)\n +else:\n + old_line = [x.getObject().getId() for x in context.objectValues(portal_type=[line_portal_type,])]\n + if len(old_line)>0:\n + for line_id in old_line:\n + context.deleteContent(line_id)\n \n # get the list of movement we need to create\n for line in listbox:\n @@ -359,10 +365,14 @@ else:\n <string>per_resource_dict</string> <string>_getattr_</string> <string>context</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>id</string> <string>old_line</string> <string>len</string> - <string>_getiter_</string> - <string>object_list</string> + <string>line_id</string> + <string>x</string> <string>line</string> <string>xrange</string> <string>counter</string> @@ -393,9 +403,7 @@ else:\n <string>mapped_value_list</string> <string>variation_item</string> <string>cell</string> - <string>append</string> - <string>$append0</string> - <string>x</string> + <string>object_list</string> <string>request</string> <string>redirect_url</string> <string>request_form</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckModule_viewCheckList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckModule_viewCheckList.xml index 53599d16fd..e243c8543f 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckModule_viewCheckList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckModule_viewCheckList.xml @@ -68,6 +68,7 @@ <value> <list> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -76,13 +77,19 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModelModule_viewCheckbookModelList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModelModule_viewCheckbookModelList.xml index 2a9e0fb53d..bcb92f25d6 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModelModule_viewCheckbookModelList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModelModule_viewCheckbookModelList.xml @@ -68,6 +68,7 @@ <value> <list> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -76,13 +77,19 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList.xml index 1b01d2de95..5fff80b6e8 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList.xml @@ -68,6 +68,7 @@ <value> <list> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -76,13 +77,19 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList.xml index 6d3e0ca0af..a1d5d9e7ab 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_view/my_site.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_view/my_site.xml index c8756e6711..b6ce5fa395 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_view/my_site.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_view/my_site.xml @@ -287,7 +287,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site\',), strict_membership = 1, leaf_node=0, user_site=0, current_url=here.getSite(), with_base=0)</string> </value> + <value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site\',), strict_membership = 1, leaf_node=0, user_site=1, current_url=here.getSite(), with_base=0)</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewCounterList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewCounterList.xml index 24bf2c6a1c..845175ed13 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewCounterList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewCounterList.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml index 560dfbeb83..23650ad9e4 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml @@ -68,6 +68,7 @@ <value> <list> <string>left</string> + <string>hidden</string> </list> </value> </item> @@ -75,12 +76,18 @@ <key> <string>groups</string> </key> <value> <dictionary> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> <item> <key> <string>left</string> </key> <value> <list> - <string>my_vault_report_type</string> <string>my_vault</string> + <string>my_vault_report_type</string> </list> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml index 4f04994401..52e5dba74e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml @@ -77,7 +77,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyCashModule_viewCurrencyCashList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyCashModule_viewCurrencyCashList.xml index 77d41cd7a5..a1dc9b027c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyCashModule_viewCurrencyCashList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyCashModule_viewCurrencyCashList.xml @@ -68,6 +68,7 @@ <value> <list> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -76,13 +77,19 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList.xml index c1293a570d..2e9a632ca9 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList.xml @@ -68,6 +68,7 @@ <value> <list> <string>bottom</string> + <string>hidden</string> </list> </value> </item> @@ -83,6 +84,14 @@ </list> </value> </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list> + <string>listbox_total_price</string> + </list> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox.xml index e37667847f..e37bcc660e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox.xml @@ -340,7 +340,7 @@ <value> <list> <tuple> - <string>getResourceTitle</string> + <string>getResourceTranslatedTitle</string> <string>Denomination</string> </tuple> <tuple> @@ -393,7 +393,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>total_price</string> + <string>Amount</string> + </tuple> + </list> </value> </item> <item> @@ -446,6 +451,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -531,7 +540,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>folder_selection</string> </value> + <value> <string>folder_cash_currency_list_selection</string> </value> </item> <item> <key> <string>sort</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox_total_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox_total_price.xml new file mode 100644 index 0000000000..11d517f9bc --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Folder_viewCashCurrencyList/listbox_total_price.xml @@ -0,0 +1,323 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>FloatField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_total_price</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>figure</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string>align="right"</string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>-1234.5</string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Total Price</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: cell.getTotalPrice()</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getResourceValue().getQuantityPrecision()</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvFileForm.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvFileForm.xml index 42a1562d4c..bdadf2253f 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvFileForm.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvFileForm.xml @@ -67,7 +67,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>Default</string> + <string>left</string> <string>hidden</string> </list> </value> @@ -77,18 +77,18 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>hidden</string> </key> <value> - <list> - <string>my_import_file</string> - <string>my_import_type</string> - </list> + <list/> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>left</string> </key> <value> - <list/> + <list> + <string>my_import_file</string> + <string>my_import_type</string> + </list> </value> </item> </dictionary> -- 2.30.9