Skip to content

E
erp5
Commit d230d761 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

- use compostion in the same way than on Apparel Fabrics : with category 

selection and matrixbox to define values, it's much better than a text field.
- add composition to categories of ApparelModel property sheet to be able to
store composition ont Apparel Model objects
- add Mapped Value to allow and hidden content types to be able to store
composition values

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29230 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 68658a02
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 70 deletions
bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_composition.xml 0 → 100644
View file @ d230d761
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>view_composition</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Composition</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/ApparelFabric_viewComposition</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ d230d761
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<item>Apparel Measurement</item> <item>Apparel Measurement</item>
</portal_type> </portal_type>
<portal_type id="Apparel Model"> <portal_type id="Apparel Model">
<item>Mapped Value</item>
<item>Supply Line</item> <item>Supply Line</item>
<item>Apparel Model Colour Variation</item> <item>Apparel Model Colour Variation</item>
<item>Apparel Model Morphology Variation</item> <item>Apparel Model Morphology Variation</item>
......
bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
View file @ d230d761
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
</portal_type> </portal_type>
<portal_type id="Apparel Model"> <portal_type id="Apparel Model">
<item>Supply Line</item> <item>Supply Line</item>
<item>Mapped Value</item>
</portal_type> </portal_type>
<portal_type id="Apparel Transformation Transformed Resource"> <portal_type id="Apparel Transformation Transformed Resource">
<item>Mapped Value</item> <item>Mapped Value</item>
......
bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
View file @ d230d761
...@@ -21,6 +21,25 @@ ...@@ -21,6 +21,25 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_roles</string> </key> <key> <string>_roles</string> </key>
<value> <value>
...@@ -114,4 +133,44 @@ ...@@ -114,4 +133,44 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_content</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_content</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
View file @ d230d761
...@@ -67,10 +67,6 @@ class ApparelModel: ...@@ -67,10 +67,6 @@ class ApparelModel:
'acquisition_accessor_id' : 'getTitle', 'acquisition_accessor_id' : 'getTitle',
'acquisition_depends' : None, 'acquisition_depends' : None,
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'composition',
'description' : 'Apparel Model composition',
'type' : 'text',
'mode' : 'w' },
{ 'id' : 'margin_ratio', ### XXX { 'id' : 'margin_ratio', ### XXX
'description' : 'Margin coefficient', 'description' : 'Margin coefficient',
'type' : 'float', 'type' : 'float',
...@@ -143,7 +139,7 @@ class ApparelModel: ...@@ -143,7 +139,7 @@ class ApparelModel:
'mode' : 'w' }, 'mode' : 'w' },
) )
_categories = ( 'transformation_state', 'pricing', 'origin', 'brand', 'tariff_nomenclature' ) _categories = ( 'composition', 'transformation_state', 'pricing', 'origin', 'brand', 'tariff_nomenclature' )
#_categories = ( 'transformation_state', 'apparel_pricing', 'apparel_creation_type', 'brand', 'tariff_nomenclature' ) #_categories = ( 'transformation_state', 'apparel_pricing', 'apparel_creation_type', 'brand', 'tariff_nomenclature' )
# XXXXXXX XXXX XXXX apparel_model_creation_type (As in Brussels Tariff Nomenclature) # XXXXXXX XXXX XXXX apparel_model_creation_type (As in Brussels Tariff Nomenclature)
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml
View file @ d230d761
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<string>my_origin</string> <string>my_origin</string>
<string>my_apparel_model_template_title</string> <string>my_apparel_model_template_title</string>
<string>my_apparel_cloth_title_list</string> <string>my_apparel_cloth_title_list</string>
<string>my_composition</string> <string>my_composition_list</string>
<string>my_ean13_code</string> <string>my_ean13_code</string>
<string>my_tariff_nomenclature</string> <string>my_tariff_nomenclature</string>
<string>my_transformation_state_list</string> <string>my_transformation_state_list</string>
......
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition.xml → bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml
View file @ d230d761
...@@ -3,18 +3,15 @@ ...@@ -3,18 +3,15 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="MultiListField" module="Products.Formulator.StandardFields"/>
<string>Products.Formulator.StandardFields</string> <tuple/>
<string>TextAreaField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_composition</string> </value> <value> <string>my_composition_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -24,21 +21,13 @@ ...@@ -24,21 +21,13 @@
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>The input failed the external validator.</string> </value>
</item> </item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value> <value> <string>Input is required but no input given.</string> </value>
</item> </item>
<item> <item>
<key> <string>too_long</string> </key> <key> <string>unknown_selection</string> </key>
<value> <string>You entered too many characters.</string> </value> <value> <string>You selected an item that was not in the list.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -80,7 +69,7 @@ ...@@ -80,7 +69,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>extra_item</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -88,19 +77,15 @@ ...@@ -88,19 +77,15 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>size</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -112,11 +97,7 @@ ...@@ -112,11 +97,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -136,7 +117,9 @@ ...@@ -136,7 +117,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -159,7 +142,7 @@ ...@@ -159,7 +142,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>extra_item</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -167,19 +150,17 @@ ...@@ -167,19 +150,17 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>items</string> </key>
<value> <string></string> </value> <value>
</item> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<item> </value>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>size</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -191,11 +172,7 @@ ...@@ -191,11 +172,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -215,7 +192,9 @@ ...@@ -215,7 +192,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -238,29 +217,27 @@ ...@@ -238,29 +217,27 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>extra_item</string> </key>
<value> <int>1</int> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>items</string> </key>
<value> <string></string> </value> <value>
</item> <list/>
<item> </value>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>size</string> </key>
<value> <int>5</int> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Composition</string> </value> <value> <string>Composition</string> </value>
...@@ -270,15 +247,54 @@ ...@@ -270,15 +247,54 @@
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>view_separator</string> </key>
<value> <int>0</int> </value> <value> <string encoding="cdata"><![CDATA[
<br />\n
]]></string> </value>
</item> </item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item> <item>
<key> <string>width</string> </key> <key> <string>_text</string> </key>
<value> <int>40</int> </value> <value> <string>here/getCompositionList</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/portal_categories/composition/getCategoryChildLogicalPathItemList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_apparel/bt/revision
View file @ d230d761
22 25
\ No newline at end of file \ No newline at end of file
bt5/erp5_apparel/bt/template_action_path_list
View file @ d230d761
...@@ -115,6 +115,7 @@ Apparel Model | jump_to_related_apparel_transformation ...@@ -115,6 +115,7 @@ Apparel Model | jump_to_related_apparel_transformation
Apparel Model | morphology_variation Apparel Model | morphology_variation
Apparel Model | references Apparel Model | references
Apparel Model | view Apparel Model | view
Apparel Model | view_composition
Apparel Model | view_price Apparel Model | view_price
Apparel Model | view_variated_reference_list Apparel Model | view_variated_reference_list
Apparel Shape Module | csv_export Apparel Shape Module | csv_export
......
bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list
View file @ d230d761
...@@ -22,6 +22,7 @@ Apparel Measurement | Mapped Value ...@@ -22,6 +22,7 @@ Apparel Measurement | Mapped Value
Apparel Model Module | Apparel Model Apparel Model Module | Apparel Model
Apparel Model | Apparel Model Colour Variation Apparel Model | Apparel Model Colour Variation
Apparel Model | Apparel Model Morphology Variation Apparel Model | Apparel Model Morphology Variation
Apparel Model | Mapped Value
Apparel Model | Supply Line Apparel Model | Supply Line
Apparel Shape Module | Apparel Shape Apparel Shape Module | Apparel Shape
Apparel Shape | Apparel Technical Drawing Apparel Shape | Apparel Technical Drawing
......
bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list
View file @ d230d761
...@@ -3,5 +3,6 @@ Apparel Component | Supply Line ...@@ -3,5 +3,6 @@ Apparel Component | Supply Line
Apparel Consumption | Mapped Value Apparel Consumption | Mapped Value
Apparel Fabric | Mapped Value Apparel Fabric | Mapped Value
Apparel Fabric | Supply Line Apparel Fabric | Supply Line
Apparel Model | Mapped Value
Apparel Model | Supply Line Apparel Model | Supply Line
Apparel Transformation Transformed Resource | Mapped Value Apparel Transformation Transformed Resource | Mapped Value
\ 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