diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.catalog_keys.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.catalog_keys.xml index e681f972dbda94f237c1669dd916abf0443f0096..3a4903c34c9058ae603a9878277588a7e9475fb3 100644 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.catalog_keys.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.catalog_keys.xml @@ -6,7 +6,7 @@ <value>1</value> </item> <item key="_filter_expression_archive" type="str"> - <value>python: isDelivery</value> + <value>python: isDelivery or here.getPortalType()=='Checkbook'</value> </item> <item key="_filter_type_archive" type="tuple"> </item> diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml index 20d430d12b553c426a459a33ec4c91fe26d97e9f..971a39838d4e1b112b47189f34043713e44968be 100644 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_delivery_list.xml @@ -203,9 +203,7 @@ getSourceTotalAssetPrice</string> </value> <dtml-let delivery_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isDelivery[loop_item]">\n <dtml-call expr="delivery_list.append(loop_item)">\n - </dtml-if>\n </dtml-in>\n <dtml-if expr="_.len(delivery_list) > 0">\n REPLACE INTO\n @@ -272,9 +270,7 @@ VALUES\n <dtml-let delivery_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isDelivery[loop_item]">\n <dtml-call expr="delivery_list.append(loop_item)">\n - </dtml-if>\n </dtml-in>\n <dtml-if expr="_.len(delivery_list) > 0">\n REPLACE INTO\n 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 c743d8a974a543f79d1154232dcacbdca2f50f90..ea4bd0940e8749d4e0286167af429dc6939e763c 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 @@ -78,7 +78,6 @@ <value> <list> <string>listbox</string> - <string>listbox_destination_payment_internal_bank_account_number</string> </list> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml index fe2ef1cf74898fc5b08580149f49c2bdb4312a32..6427c98719eeed8eb551356eb230326ff39a2560 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml @@ -488,7 +488,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>checkbook_selection</string> </value> + <value> <string>checkbook_module_selection</string> </value> </item> <item> <key> <string>sort</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox_destination_payment_internal_bank_account_number.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox_destination_payment_internal_bank_account_number.xml deleted file mode 100644 index 64711c3ca749c5616fd9bbc711c0edb1aaede228..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox_destination_payment_internal_bank_account_number.xml +++ /dev/null @@ -1,287 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="StringField" module="Products.Formulator.StandardFields"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox_destination_payment_internal_bank_account_number</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>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>too_long</string> </key> - <value> <string>Too much input was 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>max_length</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>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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>max_length</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>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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></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>12</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></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>max_length</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>Account Number</string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </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> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: cell.getDestinationPaymentValue().getInternalBankAccountNumber()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 1c3e15e55e92fba0f98a8c87b771de24437edeb2..3456e74000401a820209fdc26849d62897a55461 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -371 \ No newline at end of file +372 \ No newline at end of file