[Erp5-report] r29229 - in /erp5/trunk/bt5/erp5_apparel: ActionTemplateItem/portal_types/App...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 28 16:29:03 CEST 2009
Author: fabien
Date: Mon Sep 28 16:28:58 2009
New Revision: 29229
URL: http://svn.erp5.org?rev=29229&view=rev
Log:
- 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
Added:
erp5/trunk/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_composition.xml
erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml
Modified:
erp5/trunk/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
erp5/trunk/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml
erp5/trunk/bt5/erp5_apparel/bt/revision
erp5/trunk/bt5/erp5_apparel/bt/template_action_path_list
erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list
Added: erp5/trunk/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_composition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%2520Model/view_composition.xml?rev=29229&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_composition.xml (added)
+++ erp5/trunk/bt5/erp5_apparel/ActionTemplateItem/portal_types/Apparel%20Model/view_composition.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -1,0 +1,77 @@
+<?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>
Modified: erp5/trunk/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -55,6 +55,7 @@
<item>Apparel Measurement</item>
</portal_type>
<portal_type id="Apparel Model">
+ <item>Mapped Value</item>
<item>Supply Line</item>
<item>Apparel Model Colour Variation</item>
<item>Apparel Model Morphology Variation</item>
Modified: erp5/trunk/bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -12,6 +12,7 @@
</portal_type>
<portal_type id="Apparel Model">
<item>Supply Line</item>
+ <item>Mapped Value</item>
</portal_type>
<portal_type id="Apparel Transformation Transformed Resource">
<item>Mapped Value</item>
Modified: erp5/trunk/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%2520Model.xml?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PortalTypeTemplateItem/portal_types/Apparel%20Model.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -19,6 +19,25 @@
<key> <string>_aliases</string> </key>
<value>
<dictionary/>
+ </value>
+ </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>
@@ -114,4 +133,44 @@
</dictionary>
</pickle>
</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>
Modified: erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelModel.py [utf8] Mon Sep 28 16:28:58 2009
@@ -66,10 +66,6 @@
'acquisition_mask_value' : 0,
'acquisition_accessor_id' : 'getTitle',
'acquisition_depends' : None,
- 'mode' : 'w' },
- { 'id' : 'composition',
- 'description' : 'Apparel Model composition',
- 'type' : 'text',
'mode' : 'w' },
{ 'id' : 'margin_ratio', ### XXX
'description' : 'Margin coefficient',
@@ -143,7 +139,7 @@
'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' )
# XXXXXXX XXXX XXXX apparel_model_creation_type (As in Brussels Tariff Nomenclature)
Modified: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -98,7 +98,7 @@
<string>my_origin</string>
<string>my_apparel_model_template_title</string>
<string>my_apparel_cloth_title_list</string>
- <string>my_composition</string>
+ <string>my_composition_list</string>
<string>my_ean13_code</string>
<string>my_tariff_nomenclature</string>
<string>my_transformation_state_list</string>
Added: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml?rev=29229&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml (added)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_view/my_composition_list.xml [utf8] Mon Sep 28 16:28:58 2009
@@ -1,0 +1,302 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_composition_list</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>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</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>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>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</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>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</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>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</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>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </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>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Composition</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />\n
+
+
+]]></string> </value>
+ </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>
+ <key> <string>_text</string> </key>
+ <value> <string>here/getCompositionList</string> </value>
+ </item>
+ </dictionary>
+ </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>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_apparel/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/revision?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] Mon Sep 28 16:28:58 2009
@@ -1,1 +1,1 @@
-22
+25
Modified: erp5/trunk/bt5/erp5_apparel/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/template_action_path_list?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/template_action_path_list [utf8] Mon Sep 28 16:28:58 2009
@@ -115,6 +115,7 @@
Apparel Model | morphology_variation
Apparel Model | references
Apparel Model | view
+Apparel Model | view_composition
Apparel Model | view_price
Apparel Model | view_variated_reference_list
Apparel Shape Module | csv_export
Modified: erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_allowed_content_type_list [utf8] Mon Sep 28 16:28:58 2009
@@ -22,6 +22,7 @@
Apparel Model Module | Apparel Model
Apparel Model | Apparel Model Colour Variation
Apparel Model | Apparel Model Morphology Variation
+Apparel Model | Mapped Value
Apparel Model | Supply Line
Apparel Shape Module | Apparel Shape
Apparel Shape | Apparel Technical Drawing
Modified: erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list?rev=29229&r1=29228&r2=29229&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/template_portal_type_hidden_content_type_list [utf8] Mon Sep 28 16:28:58 2009
@@ -3,5 +3,6 @@
Apparel Consumption | Mapped Value
Apparel Fabric | Mapped Value
Apparel Fabric | Supply Line
+Apparel Model | Mapped Value
Apparel Model | Supply Line
Apparel Transformation Transformed Resource | Mapped Value
More information about the Erp5-report
mailing list