Skip to content

erp5
erp5
Commit 5d565a56 authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

Display additional resource column on listbox if there is no resource defined on 

Delivery Line
Display Quantity Unit read from item inside cells

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40890 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 09d2512b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 373 additions and 7 deletions
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog.xml
View file @ 5d565a56
......@@ -95,6 +95,7 @@
<string>listbox_quantity_unit</string>
<string>matrixbox_quantity</string>
<string>listbox_variation_category_list</string>
<string>listbox_resource</string>
</list>
</value>
</item>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox.xml
View file @ 5d565a56
......@@ -10,13 +10,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable_columns</string>
<string>sort</string>
<string>title</string>
<string>columns</string>
<string>selection_name</string>
<string>editable_columns</string>
<string>list_method</string>
<string>select</string>
<string>selection_name</string>
<string>sort</string>
<string>title</string>
</list>
</value>
</item>
......@@ -58,6 +58,18 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -66,10 +78,30 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</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>
......@@ -97,6 +129,10 @@
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>resource</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_list</string>
<string>Variation</string>
......@@ -112,6 +148,10 @@
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>resource</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_list</string>
<string>Variation</string>
......@@ -138,7 +178,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>
......@@ -175,6 +215,32 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getResource() and [item for item in field.get_orig_value(\'columns\') if item[0] != \'resource\'] or field.get_orig_value(\'columns\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: True and [item for item in field.get_orig_value(\'editable_columns\') if item[0] != \'resource\'] or field.get_orig_value(\'editable_columns\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/listbox_quantity_unit.xml
View file @ 5d565a56
......@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>items</string>
</list>
</value>
......@@ -52,6 +53,12 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -63,7 +70,7 @@
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
......@@ -77,6 +84,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_listbox_quantity_unit</string> </value>
......@@ -102,6 +113,19 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:cell.Item_getResourceValue() is not None and cell.Item_getResourceValue().getQuantityUnit()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
......
bt5/erp5_item/bt/revision
View file @ 5d565a56
231
\ No newline at end of file
232
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7