From bca9c5bc5691679d363be04c22b1635f2f437392 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 21 Apr 2010 13:48:03 +0000 Subject: [PATCH] make Delivery_viewInventory/listbox more similar to Resource_viewInventory/listbox. * use count method * group by node and variation correctly. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34707 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Delivery_viewInventory/listbox.xml | 108 ++++++++++++++---- bt5/erp5_trade/bt/revision | 2 +- 2 files changed, 87 insertions(+), 23 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml index cf9a3faf4f..ea2af5740d 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml @@ -13,15 +13,16 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>editable_columns</string> - <string>domain_tree</string> + <string>columns</string> + <string>count_method</string> + <string>default_params</string> <string>domain_root_list</string> - <string>title</string> + <string>domain_tree</string> + <string>editable_columns</string> <string>list_action</string> - <string>selection_name</string> - <string>default_params</string> <string>list_method</string> - <string>columns</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -63,6 +64,28 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_params</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>domain_root_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_tree</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable_columns</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -71,10 +94,26 @@ <key> <string>form_id</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>list_action</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>selection_name</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -125,23 +164,16 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> <item> <key> <string>default_params</string> </key> <value> - <list> - <tuple> - <string>group_by_node</string> - <string>1</string> - </tuple> - <tuple> - <string>group_by_variation</string> - <string>1</string> - </tuple> - <tuple> - <string>group_by_section</string> - <string>0</string> - </tuple> - </list> + <list/> </value> </item> <item> @@ -189,7 +221,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> @@ -202,7 +234,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Stock by Variation</string> </value> + <value> <string>Stock per Variation</string> </value> </item> </dictionary> </value> @@ -211,6 +243,38 @@ </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:[(\'group_by_section\', 0), (\'group_by_node\', 1), (\'group_by_variation\', 1)]</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="Method" module="Products.Formulator.MethodField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>method_name</string> </key> + <value> <string>getFutureInventoryCount</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <global name="Method" module="Products.Formulator.MethodField"/> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 11758cc314..2379a17515 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -909 \ No newline at end of file +910 \ No newline at end of file -- 2.30.9