Skip to content

erp5
erp5
Commit 85cdcc7c authored by Alexandre Boeglin's avatar Alexandre Boeglin
Browse files
Options

* show price in OrderLine_view 

* hide price, quantity, quantity_unit for non-movements on OrderLine_view

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20756 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 45a2f960
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 107 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml
View file @ 85cdcc7c
...@@ -112,7 +112,6 @@ ...@@ -112,7 +112,6 @@
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_start_date</string> <string>listbox_start_date</string>
<string>listbox_stop_date</string> <string>listbox_stop_date</string>
<string>listbox_title</string>
<string>listbox_reference</string> <string>listbox_reference</string>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_quantity_unit</string> <string>listbox_quantity_unit</string>
...@@ -131,6 +130,7 @@ ...@@ -131,6 +130,7 @@
<string>my_amortisation_method</string> <string>my_amortisation_method</string>
<string>my_source_trade_title_list</string> <string>my_source_trade_title_list</string>
<string>my_base_contribution_list</string> <string>my_base_contribution_list</string>
<string>listbox_price</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox.xml
View file @ 85cdcc7c
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_order_cells_listbox</string> </value> <value> <string>my_order_sub_lines_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_title.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_price.xml
View file @ 85cdcc7c
...@@ -9,15 +9,23 @@ ...@@ -9,15 +9,23 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>enabled</string>
</list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_title</string> </value> <value> <string>listbox_price</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -35,15 +43,15 @@ ...@@ -35,15 +43,15 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>extra_context</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -53,6 +61,16 @@ ...@@ -53,6 +61,16 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -72,22 +90,44 @@ ...@@ -72,22 +90,44 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>extra_context</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_title</string> </value> <value> <string>my_quantity</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>DeliveryCell_viewFieldLibrary</string> </value> <value> <string>DeliveryCell_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity.xml
View file @ 85cdcc7c
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<value> <value>
<list> <list>
<string>enabled</string> <string>enabled</string>
<string>editable</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -63,15 +62,11 @@ ...@@ -63,15 +62,11 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>editable</string> </key> <key> <string>enabled</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -95,10 +90,6 @@ ...@@ -95,10 +90,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -134,7 +125,7 @@ ...@@ -134,7 +125,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>cell/isMovement</string> </value> <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity_unit.xml
View file @ 85cdcc7c
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
<list> <list>
<string>items</string> <string>items</string>
<string>enabled</string> <string>enabled</string>
<string>editable</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -64,15 +63,11 @@ ...@@ -64,15 +63,11 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>editable</string> </key> <key> <string>enabled</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>extra_context</string> </key> <key> <string>extra_context</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -86,7 +81,7 @@ ...@@ -86,7 +81,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
...@@ -102,10 +97,6 @@ ...@@ -102,10 +97,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -147,7 +138,7 @@ ...@@ -147,7 +138,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>cell/isMovement</string> </value> <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary.xml
View file @ 85cdcc7c
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
<string>my_stop_date</string> <string>my_stop_date</string>
<string>my_title</string> <string>my_title</string>
<string>my_variation_category_list</string> <string>my_variation_category_list</string>
<string>my_order_cells_listbox</string>
<string>my_total_price</string> <string>my_total_price</string>
<string>my_total_quantity</string> <string>my_total_quantity</string>
<string>my_amortisation_method</string> <string>my_amortisation_method</string>
...@@ -110,6 +109,7 @@ ...@@ -110,6 +109,7 @@
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_int_index</string> <string>my_int_index</string>
<string>my_source_title</string> <string>my_source_title</string>
<string>my_order_sub_lines_listbox</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_order_cells_listbox.xml → bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_order_sub_lines_listbox.xml
View file @ 85cdcc7c
...@@ -17,18 +17,16 @@ ...@@ -17,18 +17,16 @@
<string>columns</string> <string>columns</string>
<string>all_columns</string> <string>all_columns</string>
<string>sort</string> <string>sort</string>
<string>list_method</string>
<string>selection_name</string> <string>selection_name</string>
<string>portal_types</string> <string>portal_types</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>report_root_list</string>
<string>enabled</string> <string>enabled</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_order_cells_listbox</string> </value> <value> <string>my_order_sub_lines_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -102,7 +100,7 @@ ...@@ -102,7 +100,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>all_columns</string> </key> <key> <string>all_columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -118,13 +116,17 @@ ...@@ -118,13 +116,17 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_title</string> <string>resource_title</string>
<string>Resource</string> <string>Resource</string>
</tuple> </tuple>
<tuple> <tuple>
<string>quantity</string> <string>quantity</string>
<string>Quantity</string> <string>Quantity</string>
</tuple> </tuple>
<tuple>
<string>total_quantity</string>
<string>Total Quantity</string>
</tuple>
<tuple> <tuple>
<string>quantity_unit</string> <string>quantity_unit</string>
<string>Unit</string> <string>Unit</string>
...@@ -134,22 +136,22 @@ ...@@ -134,22 +136,22 @@
<string>Price</string> <string>Price</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getTotalPrice</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date</string> <string>start_date</string>
<string>Begin</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>End</string> <string>End Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -165,13 +167,17 @@ ...@@ -165,13 +167,17 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_title</string> <string>resource_title</string>
<string>Resource</string> <string>Resource</string>
</tuple> </tuple>
<tuple> <tuple>
<string>quantity</string> <string>quantity</string>
<string>Quantity</string> <string>Quantity</string>
</tuple> </tuple>
<tuple>
<string>total_quantity</string>
<string>Total Quantity</string>
</tuple>
<tuple> <tuple>
<string>quantity_unit</string> <string>quantity_unit</string>
<string>Unit</string> <string>Unit</string>
...@@ -181,24 +187,28 @@ ...@@ -181,24 +187,28 @@
<string>Price</string> <string>Price</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getTotalPrice</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date</string> <string>start_date</string>
<string>Begin</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>End</string> <string>End Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>int_index</string>
<string>Index</string>
</tuple>
<tuple> <tuple>
<string>reference</string> <string>reference</string>
<string>Reference</string> <string>Reference</string>
...@@ -212,22 +222,22 @@ ...@@ -212,22 +222,22 @@
<string>Unit</string> <string>Unit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>start_date</string> <string>price</string>
<string>Begin</string> <string>Price</string>
</tuple> </tuple>
<tuple> <tuple>
<string>stop_date</string> <string>start_date</string>
<string>End</string> <string>Begin Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>int_index</string> <string>stop_date</string>
<string>Index</string> <string>End Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
...@@ -239,43 +249,22 @@ ...@@ -239,43 +249,22 @@
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>list_method</string> </key> <key> <string>portal_types</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value> <value>
<list/> <list/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>report_root_list</string> </key> <key> <string>selection_name</string> </key>
<value> <value> <string>order_line_selection</string> </value>
<list>
<tuple>
<string>parent</string>
<string>Document Tree</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>project_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>sort</string> </key> <key> <string>sort</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>int_index</string> <string>ascending</string>
</tuple>
<tuple>
<string>id</string>
<string>id</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -285,7 +274,7 @@ ...@@ -285,7 +274,7 @@
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Order Lines</string> </value> <value> <string>Order Lines</string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -342,20 +331,4 @@ ...@@ -342,20 +331,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>searchFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
View file @ 85cdcc7c
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml
View file @ 85cdcc7c
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml
View file @ 85cdcc7c
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_trade/bt/revision
View file @ 85cdcc7c
342 343
\ No newline at end of file \ 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