diff --git a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py index a1193388502c505d10963c14b73498a46f213d53..028ba04eec32b0f418e5d729d82cc462a93c1f6c 100644 --- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py +++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelFabric.py @@ -45,14 +45,6 @@ class ApparelFabric: 'description' : 'Number of colours', 'type' : 'int', 'mode' : 'w' }, - { 'id' : 'quality_reference', - 'description' : 'The quality of the fabric characterize the support of the fabric', - 'type' : 'string', - 'mode' : 'w' }, - { 'id' : 'drawing_reference', - 'description' : 'Drawing reference from the fabric supplier ', - 'type' : 'string', - 'mode' : 'w' }, # Override default value XXX { 'id' : 'p_variation_base_category', 'description' : 'A list of base categories which define possible discrete variations. '\ diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml index 4a21e193878bbe1d231cacaaf4fb1e7ed5729eb8..edcc85d8fe30860b35e0da122c0da186d0a0645f 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelComponentModule_viewApparelComponentList/listbox.xml @@ -612,18 +612,6 @@ <string>description</string> <string>Description</string> </tuple> - <tuple> - <string>purchase_supply_line_source_title</string> - <string>Supplier</string> - </tuple> - <tuple> - <string>purchase_supply_line_source_reference</string> - <string>Supplier Reference</string> - </tuple> - <tuple> - <string>resource_translated_title</string> - <string>Component Type</string> - </tuple> <tuple> <string>translated_validation_state_title</string> <string>State</string> @@ -662,18 +650,6 @@ <string>description</string> <string>Description</string> </tuple> - <tuple> - <string>purchase_supply_line_source_title</string> - <string>Supplier</string> - </tuple> - <tuple> - <string>purchase_supply_line_source_reference</string> - <string>Supplier Reference</string> - </tuple> - <tuple> - <string>resource_translated_title</string> - <string>Component Type</string> - </tuple> <tuple> <string>translated_validation_state_title</string> <string>State</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml index cd8c2995db0bc10d79a2ea4cfd12691e6d5c23ef..f3a9623705b029fc100d50d0742e12d880fdf54d 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricModule_viewApparelFabricList/listbox.xml @@ -347,12 +347,12 @@ <string>Supplier</string> </tuple> <tuple> - <string>quality_reference</string> - <string>Quality Reference</string> + <string>reference</string> + <string>Internal Reference</string> </tuple> <tuple> - <string>drawing_reference</string> - <string>Drawing Reference</string> + <string>purchase_supply_line_source_reference</string> + <string>Supplier Reference</string> </tuple> <tuple> <string>apparel_fabric_template_title</string> @@ -440,12 +440,12 @@ <string>Supplier</string> </tuple> <tuple> - <string>quality_reference</string> - <string>Quality Reference</string> + <string>reference</string> + <string>Internal Reference</string> </tuple> <tuple> - <string>drawing_reference</string> - <string>Drawing Reference</string> + <string>purchase_supply_line_source_reference</string> + <string>Supplier Reference</string> </tuple> <tuple> <string>resource_translated_title</string> @@ -641,20 +641,8 @@ <string>Description</string> </tuple> <tuple> - <string>purchase_supply_line_source_title</string> - <string>Supplier</string> - </tuple> - <tuple> - <string>quality_reference</string> - <string>Quality Reference</string> - </tuple> - <tuple> - <string>drawing_reference</string> - <string>Drawing Reference</string> - </tuple> - <tuple> - <string>resource_translated_title</string> - <string>Fabric Type</string> + <string>reference</string> + <string>Internal Reference</string> </tuple> <tuple> <string>visual_pattern_title</string> @@ -699,20 +687,12 @@ <string>Description</string> </tuple> <tuple> - <string>purchase_supply_line_source_title</string> - <string>Supplier</string> - </tuple> - <tuple> - <string>quality_reference</string> - <string>Quality Reference</string> + <string>reference</string> + <string>Internal Reference</string> </tuple> <tuple> - <string>drawing_reference</string> - <string>Drawing Reference</string> - </tuple> - <tuple> - <string>resource_translated_title</string> - <string>Fabric Type</string> + <string>purchase_supply_line_source_reference</string> + <string>Supplier Reference</string> </tuple> <tuple> <string>visual_pattern_translated_title</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml index 8dfac634be48f0948972bc686bfe362eba10036a..1031bfb18a3fcaba357dc09aac4b12067317db48 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view.xml @@ -93,8 +93,8 @@ <value> <list> <string>my_title</string> - <string>my_quality_reference</string> - <string>my_drawing_reference</string> + <string>my_reference</string> + <string>my_purchase_supply_line_source_reference</string> <string>my_resource</string> <string>my_visual_pattern</string> <string>my_quantity_unit_list</string> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_purchase_supply_line_source_reference.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_purchase_supply_line_source_reference.xml new file mode 100644 index 0000000000000000000000000000000000000000..96f3692ba01de8330e5ed3450cf54afee36a7f41 --- /dev/null +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_purchase_supply_line_source_reference.xml @@ -0,0 +1,93 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_purchase_supply_line_source_reference</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>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>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_source_reference</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewPDMFieldLibrary</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> +</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_quality_reference.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_quality_reference.xml deleted file mode 100644 index e333d082b893a204e68243d1d7ecadfcfe75e817..0000000000000000000000000000000000000000 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_quality_reference.xml +++ /dev/null @@ -1,263 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="StringField" module="Products.Formulator.StandardFields"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>my_quality_reference</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> - <item> - <key> <string>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>too_long</string> </key> - <value> <string>Too much input was given.</string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>overrides</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>alternate_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>css_class</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>default</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_maxwidth</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>display_width</string> </key> - <value> <int>20</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>external_validator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>extra</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Quality Reference</string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_drawing_reference.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_reference.xml similarity index 98% rename from bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_drawing_reference.xml rename to bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_reference.xml index edcba842118eb124b674ffac680b2ce9a8c9cbda..a2e7da8aec4548d77031b35dccf7df6a0b319c55 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_drawing_reference.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_reference.xml @@ -11,7 +11,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_drawing_reference</string> </value> + <value> <string>my_reference</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -208,7 +208,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>20</int> </value> + <value> <int>30</int> </value> </item> <item> <key> <string>editable</string> </key> @@ -240,7 +240,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Drawing Reference</string> </value> + <value> <string>Internal Reference</string> </value> </item> <item> <key> <string>truncate</string> </key> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_title.xml index 6b82ce9ff254a0f838fcd98a53be0e0ebfbd6a96..e780a2f7df58ad5e0749d88f5973a08f5558d549 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_title.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabric_view/my_title.xml @@ -208,7 +208,7 @@ </item> <item> <key> <string>display_width</string> </key> - <value> <int>20</int> </value> + <value> <int>30</int> </value> </item> <item> <key> <string>editable</string> </key> diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision index 50f0bcd37553d013ca12d64ebde925a26d4256d7..eafdfb06c55856bbcc9bb2b69ed9d055f6ae0557 100644 --- a/bt5/erp5_apparel/bt/revision +++ b/bt5/erp5_apparel/bt/revision @@ -1 +1 @@ -135 \ No newline at end of file +138 \ No newline at end of file