diff --git a/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index 614ade7db3c9baf3b504f47d3de53c5baa1ea704..520e1d288b09445491c1026d6c289af42f2403a6 100644 --- a/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -5,9 +5,6 @@ <portal_type id="Accounting Date"> <item>site</item> </portal_type> - <portal_type id="Banking Operation Line"> - <item>aggregate_resource</item> - </portal_type> <portal_type id="Cash Delivery Cell"> <item>variation</item> </portal_type> diff --git a/bt5/erp5_banking_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_banking_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml index c095df5e72cbac2079ea1cd2b2cf6755b7770564..d19c8fa36da5b0a6d72dca7d1318b8cf7e4a89dc 100644 --- a/bt5/erp5_banking_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml +++ b/bt5/erp5_banking_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml @@ -45,7 +45,6 @@ <item>Arrow</item> <item>VariationRange</item> <item>Task</item> - <item>Checkbook</item> </portal_type> <portal_type id="Checkbook Model"> <item>CheckModel</item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml index 40db1d0220788efa47a8278e506a44d2eb7b859e..5c47b86db9ed0473b6e745cdaa203e912de87c0e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml @@ -123,7 +123,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -160,13 +162,13 @@ <item> <key> <string>input_style</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> <key> <string>precision</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> @@ -261,18 +263,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value> + <value> <string>python: here.getTotalPrice(fast=0)</string> </value> </item> </dictionary> </pickle> @@ -280,11 +279,24 @@ <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </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> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/DeliveryCell_view/my_total_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/DeliveryCell_view/my_total_price.xml index 7d986a19c29bf99ac516a71809cc6a188daa2996..704ce64413b04d62a6fb4f2f88ce543e2537e454 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/DeliveryCell_view/my_total_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/DeliveryCell_view/my_total_price.xml @@ -123,7 +123,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -254,4 +256,20 @@ </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: here.getTotalPrice(fast=0)</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_core/bt/comment b/bt5/erp5_banking_core/bt/comment new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 235adf8bd8fe3b9844d65f77956d73f5fed04ede..52f6c1a7a0e6648b65c77f6cfff32f6b5034ee55 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -349 \ No newline at end of file +352 \ No newline at end of file diff --git a/bt5/erp5_banking_core/bt/template_portal_type_base_category_list b/bt5/erp5_banking_core/bt/template_portal_type_base_category_list index 4c154952995f672ca07fa685b6d7f3ed77042777..9786ed7ae54be2d50323d26cb5f745775db0b770 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_base_category_list @@ -1,6 +1,5 @@ Accounting Cancellation | site Accounting Date | site -Banking Operation Line | aggregate_resource Cash Delivery Cell | variation Check Model Type Variation | check_type Check Operation Line | aggregate_resource diff --git a/bt5/erp5_banking_core/bt/template_portal_type_property_sheet_list b/bt5/erp5_banking_core/bt/template_portal_type_property_sheet_list index d34b9e7aa198f885b8d3437fb122d2b6f71cf749..62fdee2d79c6936079abb02120aef09e3e434cb6 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_property_sheet_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_property_sheet_list @@ -23,7 +23,6 @@ Check | Task Checkbook Model Check Amount Variation | Amount Checkbook Model | CheckModel Checkbook | Arrow -Checkbook | Checkbook Checkbook | Task Checkbook | VariationRange Counter Date | Reference