Skip to content

erp5
erp5
Commit cff04e37 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

Hide deprecated 'order' if unset and fix jump to delivery (in case of order line) 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38080 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 65d48301
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 81 deletions
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
View file @ cff04e37
...@@ -82,94 +82,18 @@ ...@@ -82,94 +82,18 @@
<key> <string>all_columns</string> </key> <key> <string>all_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>relative_url</string>
<string>Path</string>
</tuple>
<tuple>
<string>portal_type</string>
<string>Type</string>
</tuple>
<tuple>
<string>source_title</string>
<string>Source</string>
</tuple>
<tuple>
<string>destination_title</string>
<string>Destination</string>
</tuple>
<tuple>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_title</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
</tuple>
<tuple> <tuple>
<string>quantity_unit</string> <string>quantity_unit</string>
<string>UOM</string> <string>UOM</string>
</tuple> </tuple>
<tuple>
<string>price</string>
<string>Price</string>
</tuple>
<tuple> <tuple>
<string>price_currency_reference</string> <string>price_currency_reference</string>
<string>Currency</string> <string>Currency</string>
</tuple> </tuple>
<tuple>
<string>movement.start_date</string>
<string>Start Date</string>
</tuple>
<tuple>
<string>movement.stop_date</string>
<string>Stop Date</string>
</tuple>
<tuple>
<string>specialise_reference</string>
<string>Specialise Reference</string>
</tuple>
<tuple>
<string>order</string>
<string>Order</string>
</tuple>
<tuple>
<string>order_ratio</string>
<string>O/Rat</string>
</tuple>
<tuple>
<string>delivery</string>
<string>Delivery</string>
</tuple>
<tuple>
<string>delivery_ratio</string>
<string>D/Rat</string>
</tuple>
<tuple>
<string>delivery_error</string>
<string>D/Err</string>
</tuple>
<tuple>
<string>simulation_state</string>
<string>State</string>
</tuple>
<tuple>
<string>causality_state</string>
<string>C/State</string>
</tuple>
<tuple> <tuple>
<string>categories_list</string> <string>categories_list</string>
<string>Categories</string> <string>Categories</string>
</tuple> </tuple>
<tuple>
<string>causality</string>
<string>Causality</string>
</tuple>
<tuple> <tuple>
<string>source_section_title</string> <string>source_section_title</string>
<string>Source Section</string> <string>Source Section</string>
......
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
View file @ cff04e37
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>portal_type</string> <string>portal_type</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -71,6 +71,10 @@ ...@@ -71,6 +71,10 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -119,7 +123,7 @@ ...@@ -119,7 +123,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: [(x, \'\') for x in here.getPortalDeliveryMovementTypeList()]</string> </value> <value> <string>python: [(x, \'\') for x in here.getPortalDeliveryMovementTypeList() + here.getPortalOrderMovementTypeList()]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
View file @ cff04e37
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string> <string>enabled</string>
<string>portal_type</string> <string>portal_type</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -53,6 +54,12 @@ ...@@ -53,6 +54,12 @@
<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> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -64,13 +71,17 @@ ...@@ -64,13 +71,17 @@
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -78,6 +89,10 @@ ...@@ -78,6 +89,10 @@
<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> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value> <value> <string>my_relation_field</string> </value>
...@@ -112,6 +127,19 @@ ...@@ -112,6 +127,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/getOrder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
View file @ cff04e37
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<value> <value>
<list> <list>
<string>description</string> <string>description</string>
<string>enabled</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -53,6 +54,16 @@ ...@@ -53,6 +54,16 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -65,6 +76,10 @@ ...@@ -65,6 +76,10 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -76,6 +91,10 @@ ...@@ -76,6 +91,10 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value> <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_percent</string> </value> <value> <string>my_percent</string> </value>
...@@ -98,4 +117,17 @@ ...@@ -98,4 +117,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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>here/getOrder</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_administration/bt/revision
View file @ cff04e37
113 114
\ 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