diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml index dc25224c60dd9b59fc1d6c5060402f73febb15c8..d2117ddae2fa75226b309a924580b9876c3f09d3 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view.xml @@ -100,7 +100,7 @@ <list> <string>my_resource</string> <string>my_destination_payment_reference</string> - <string>my_inventory</string> + <string>my_quantity</string> </list> </value> </item> diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_quantity.xml similarity index 99% rename from bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml rename to bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_quantity.xml index 8ccaeb0aaec024c347f3e7cb545a7ffd1d7bb473..a6c1dbec7d214f6a7783bf873df84b1fb6967d2f 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_inventory.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventoryLine_view/my_quantity.xml @@ -17,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_inventory</string> </value> + <value> <string>my_quantity</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml index ea4e9371f9442f038276e12e8366e7f9168b11fa..630f7ebbe2c761f5e92ec926c46d7f21bebcf550 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/BankAccountInventory_view/listbox.xml @@ -332,16 +332,12 @@ <key> <string>columns</string> </key> <value> <list> - <tuple> - <string>id</string> - <string>ID</string> - </tuple> <tuple> <string>destination_payment_reference</string> <string>Bank Account Number</string> </tuple> <tuple> - <string>inventory</string> + <string>quantity</string> <string>Amount</string> </tuple> <tuple> @@ -353,7 +349,9 @@ </item> <item> <key> <string>count_method</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>css_class</string> </key> @@ -422,7 +420,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -431,6 +429,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -468,7 +470,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>bank_account_inventory_selection</string> </value> </item> <item> <key> <string>sort</string> </key> @@ -511,11 +513,24 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.MethodField</string> - <string>Method</string> - </tuple> - <none/> + <global name="Method" module="Products.Formulator.MethodField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>method_name</string> </key> + <value> <string>countFolder</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="Method" module="Products.Formulator.MethodField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml index 55e48806c538345a4a0eb890d353275de9c3d0cc..f428abcec195bfd798925cb2002a2fa374fe94e0 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventoryGroup_view/listbox.xml @@ -353,9 +353,7 @@ </item> <item> <key> <string>count_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>css_class</string> </key> @@ -433,7 +431,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -483,7 +481,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>cash_inventory_group_list_selection</string> </value> </item> <item> <key> <string>sort</string> </key> @@ -531,30 +529,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.MethodField</string> - <string>Method</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>countFolder</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <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_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml index 04fa32e7d862966f0942c1b02508ca0166b8d362..ac16b7107936eee562a539a6834476ec3bae7f20 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml @@ -273,18 +273,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>python: here.Delivery_getVaultItemList(all=1,user_site=0,base_site=here.Baobab_getUserAssignedRootSiteList()[0],vault_type=\'site\')</string> </value> + <value> <string>python: here.Delivery_getVaultItemList(all=1,user_site=0,base_site=here.Baobab_getUserAssignedRootSiteList()[0],vault_type=\'site\',leaf_node=0)</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml index 3e78a5cfb9bddad7126a26fc21d8a10ce4fda2d5..acd9a1cd2be742e97cac2957d5610a55348df6dc 100644 --- a/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_total_price.xml +++ b/bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_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=1)</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_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml index 39bca970fab666795e48201f0054dc5ea7ced904..1b1cbda489723ce25fe22bc51ba1e3f8e551e471 100644 --- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml +++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/states/delivered.xml @@ -54,17 +54,14 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> @@ -75,6 +72,7 @@ <string>Auditor</string> <string>Manager</string> <string>Owner</string> + <string>Reviewer</string> </tuple> </value> </item> @@ -102,6 +100,7 @@ <string>Auditor</string> <string>Manager</string> <string>Owner</string> + <string>Reviewer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_inventory/bt/revision b/bt5/erp5_banking_inventory/bt/revision index e440e5c842586965a7fb77deda2eca68612b1f53..7813681f5b41c028345ca62a2be376bae70b7f61 100644 --- a/bt5/erp5_banking_inventory/bt/revision +++ b/bt5/erp5_banking_inventory/bt/revision @@ -1 +1 @@ -3 \ No newline at end of file +5 \ No newline at end of file