From f5d2473044ee63bce180c5d22922cf9ea361f176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 7 Jul 2020 15:32:42 +0900 Subject: [PATCH] trade: review Valuation Method field on Inventory Report - add an empty item to the list, so that user have to choose something - translate values --- .../my_valuation_method.xml | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryReport_view/my_valuation_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryReport_view/my_valuation_method.xml index 08a107ba72..307bfe9306 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryReport_view/my_valuation_method.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryReport_view/my_valuation_method.xml @@ -11,9 +11,7 @@ <value> <list> <string>default</string> - <string>first_item</string> <string>items</string> - <string>size</string> <string>title</string> </list> </value> @@ -60,10 +58,6 @@ <key> <string>field_id</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>form_id</string> </key> <value> <string></string> </value> @@ -74,10 +68,6 @@ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> @@ -97,10 +87,6 @@ <key> <string>field_id</string> </key> <value> <string>my_list_field</string> </value> </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> @@ -108,13 +94,34 @@ <item> <key> <string>items</string> </key> <value> - <list/> + <list> + <tuple> + <string></string> + <string></string> + </tuple> + <tuple> + <string>Fifo</string> + <string>Fifo</string> + </tuple> + <tuple> + <string>Filo</string> + <string>Filo</string> + </tuple> + <tuple> + <string>WeightedAverage</string> + <string>WeightedAverage</string> + </tuple> + <tuple> + <string>MonthlyWeightedAverage</string> + <string>MonthlyWeightedAverage</string> + </tuple> + <tuple> + <string>MovingAverage</string> + <string>MovingAverage</string> + </tuple> + </list> </value> </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>title</string> </key> <value> <string>Valuation Method</string> </value> @@ -133,7 +140,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: [(\'Fifo\',\'Fifo\'), (\'Filo\',\'Filo\'), (\'WeightedAverage\', \'WeightedAverage\'), (\'MonthlyWeightedAverage\',\'MonthlyWeightedAverage\'), (\'MovingAverage\',\'MovingAverage\')]</string> </value> + <value> <string>python: [(context.Base_translateString(label), value) for (label, value) in field.get_orig_value(\'items\')]</string> </value> </item> </dictionary> </pickle> -- 2.30.9