Skip to content

erp5-Boxiang
erp5-Boxiang
Commit eadfcdd2 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

PDM: use the same proxy field for all resource module listboxes 

Some compatibility is kept
parent 345de486
Show whitespace changes
Inline Side-by-side
Showing with 317 additions and 283 deletions
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_viewPDMFieldLibrary.xml
View file @ eadfcdd2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="ERP5Form" module="Products.ERP5Form.Form"/> <global name="ERP5 Form" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -195,6 +195,9 @@ ...@@ -195,6 +195,9 @@
<string>my_view_mode_version</string> <string>my_view_mode_version</string>
<string>my_view_mode_listbox_read_only_start_date_range_min</string> <string>my_view_mode_listbox_read_only_start_date_range_min</string>
<string>my_view_mode_listbox_read_only_start_date_range_max</string> <string>my_view_mode_listbox_read_only_start_date_range_max</string>
<string>my_view_mode_resource_module_listbox</string>
<string>listbox_purchase_supply_line_destination_account</string>
<string>listbox_sale_supply_line_source_account</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_viewPDMFieldLibrary/my_view_mode_resource_module_listbox.xml 0 → 100644
View file @ eadfcdd2
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>all_columns</string>
<string>columns</string>
<string>domain_root_list</string>
<string>domain_tree</string>
<string>portal_types</string>
<string>report_root_list</string>
<string>report_tree</string>
<string>selection_name</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_resource_module_listbox</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </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>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit_translated_title</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line_translated_title</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>base_contribution_translated_title</string>
<string>Base Contribution</string>
</tuple>
<tuple>
<string>comment</string>
<string>Comment</string>
</tuple>
<tuple>
<string>purchase_supply_line_base_price</string>
<string>Default Purchase Price</string>
</tuple>
<tuple>
<string>sale_supply_line_base_price</string>
<string>Default Sale Price</string>
</tuple>
<tuple>
<string>purchase_supply_line_destination_account</string>
<string>Client Account</string>
</tuple>
<tuple>
<string>sale_supply_line_source_account</string>
<string>Supplier Account</string>
</tuple>
<tuple>
<string>use_translated_title</string>
<string>Use</string>
</tuple>
<tuple>
<string>owner_title</string>
<string>Owner</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>use</string>
<string>Use</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_module_listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPDMFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>use</string>
<string>Use</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</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: [(x, x) for x in context.getPortalResourceTypeList()]</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>string:${context/getId}_selection</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ComponentModule_viewComponentList/listbox.xml
View file @ eadfcdd2
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<value> <value>
<list> <list>
<string>portal_types</string> <string>portal_types</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -73,11 +74,11 @@ ...@@ -73,11 +74,11 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_component_module_listbox</string> </value> <value> <string>my_view_mode_resource_module_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Resource_viewFieldLibrary</string> </value> <value> <string>Base_viewPDMFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
...@@ -94,6 +95,10 @@ ...@@ -94,6 +95,10 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Components</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ProductModule_viewProductList/listbox.xml
View file @ eadfcdd2
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_view_mode_product_module_listbox</string> </value> <value> <string>my_view_mode_resource_module_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary.xml
View file @ eadfcdd2
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
<string>my_product_line</string> <string>my_product_line</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_product_module_listbox</string> <string>my_product_module_listbox</string>
<string>my_service_module_listbox</string>
<string>my_ean13_code</string> <string>my_ean13_code</string>
<string>my_aggregated_portal_type_list</string> <string>my_aggregated_portal_type_list</string>
<string>my_required_aggregated_portal_type_list</string> <string>my_required_aggregated_portal_type_list</string>
...@@ -120,8 +119,7 @@ ...@@ -120,8 +119,7 @@
<string>my_product_individual_variation_listbox</string> <string>my_product_individual_variation_listbox</string>
<string>my_service_individual_variation_listbox</string> <string>my_service_individual_variation_listbox</string>
<string>my_individual_variation_base_category_list</string> <string>my_individual_variation_base_category_list</string>
<string>listbox_purchase_supply_line_destination_account</string> <string>my_service_module_listbox</string>
<string>listbox_sale_supply_line_source_account</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_product_module_listbox.xml
View file @ eadfcdd2
...@@ -10,15 +10,6 @@ ...@@ -10,15 +10,6 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>all_columns</string>
<string>columns</string>
<string>domain_root_list</string>
<string>domain_tree</string>
<string>report_root_list</string>
<string>report_tree</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort_columns</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -80,251 +71,13 @@ ...@@ -80,251 +71,13 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit_translated_title</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line_translated_title</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>base_contribution_translated_title</string>
<string>Base Contribution</string>
</tuple>
<tuple>
<string>comment</string>
<string>Comment</string>
</tuple>
<tuple>
<string>purchase_supply_line_base_price</string>
<string>Default Purchase Price</string>
</tuple>
<tuple>
<string>sale_supply_line_base_price</string>
<string>Default Sale Price</string>
</tuple>
<tuple>
<string>purchase_supply_line_source_account</string>
<string>Client Account</string>
</tuple>
<tuple>
<string>sale_supply_line_source_account</string>
<string>Supplier Account</string>
</tuple>
<tuple>
<string>use_translated_title</string>
<string>Use</string>
</tuple>
<tuple>
<string>owner_title</string>
<string>Owner</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>use</string>
<string>Use</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>domain_tree</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_list_mode_listbox</string> </value> <value> <string>my_view_mode_resource_module_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewPDMFieldLibrary</string> </value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value>
<list>
<tuple>
<string>quantity_unit</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>use</string>
<string>Use</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
<tuple>
<string>quantity_unit_title</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line_title</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>base_contribution_title</string>
<string>Base Contribution</string>
</tuple>
<tuple>
<string>comment</string>
<string>Comment</string>
</tuple>
<tuple>
<string>purchase_supply_line_base_price</string>
<string>Default Purchase Price</string>
</tuple>
<tuple>
<string>sale_supply_line_base_price</string>
<string>Default Sale Price</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>product_module_selection</string> </value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
<tuple>
<string>quantity_unit_title</string>
<string>Quantity Unit</string>
</tuple>
<tuple>
<string>product_line_title</string>
<string>Product Line</string>
</tuple>
<tuple>
<string>base_contribution_title</string>
<string>Base Contribution</string>
</tuple>
<tuple>
<string>comment</string>
<string>Comment</string>
</tuple>
<tuple>
<string>purchase_supply_line_base_price</string>
<string>Default Purchase Price</string>
</tuple>
<tuple>
<string>sale_supply_line_base_price</string>
<string>Default Sale Price</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
</list>
</value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewFieldLibrary/my_service_module_listbox.xml
View file @ eadfcdd2
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<value> <value>
<list> <list>
<string>title</string> <string>title</string>
<string>selection_name</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -61,18 +60,10 @@ ...@@ -61,18 +60,10 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</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>
...@@ -88,10 +79,6 @@ ...@@ -88,10 +79,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Resource_viewFieldLibrary</string> </value> <value> <string>Resource_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>service_module_selection</string> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/ServiceModule_viewServiceList/listbox.xml
View file @ eadfcdd2
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>portal_types</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -73,27 +73,20 @@ ...@@ -73,27 +73,20 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_service_module_listbox</string> </value> <value> <string>my_view_mode_resource_module_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Resource_viewFieldLibrary</string> </value> <value> <string>Base_viewPDMFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
<list>
<tuple>
<string>Service</string>
<string>Service</string>
</tuple>
</list>
</value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Services</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
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