svn commit: r676246 - in /ofbiz/trunk/applications/product: config/ProductErrorUiLabels.xml script/org/ofbiz/product/feature/ProductFeatureServices.xml

Author: jleroux
Date: Sat Jul 12 15:43:16 2008
New Revision: 676246

URL: http://svn.apache.org/viewvc?rev=676246&view=rev
Log:
The "list..." functions created in ProductDetail.bsh are always prefixed by "list" so the 1st char being a letter constraint is not needed.

Modified:
    ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml

Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=676246&r1=676245&r2=676246&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Sat Jul 12 15:43:16 2008
@@ -37,7 +37,7 @@
         <value xml:lang="th">USPS ต้องการที่อยู่ ถ้าไม่ รหัสไปรษณีย์ หรือ เมือง และ รัฐ</value>
     </property>
     <property key="ProductFeatureTypeIdMustContainsLettersAndDigits">
-        <value xml:lang="en">The Product Feature TypeId must contains only letters, underscore and digits and must begin by a letter. Please re-enter</value>
-        <value xml:lang="fr">La réf. de type de caractéristique d'article ne doit contenir que des lettres, le tiret bas "_" et des chiffres et doit commencer par une lettre. Recommencez SVP</value>
+        <value xml:lang="en">The Product Feature TypeId must contains only letters, underscore and digits. Please re-enter</value>
+        <value xml:lang="fr">La réf. de type de caractéristique d'article ne doit contenir que des lettres, le tiret bas "_" et des chiffres. Recommencez SVP</value>
     </property>
 </resource>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=676246&r1=676245&r2=676246&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Sat Jul 12 15:43:16 2008
@@ -279,7 +279,7 @@
         <if>
             <condition>
                 <not>
-                    <if-regexp field-name="parameters.productFeatureTypeId" expr="^[a-zA-Z]+[0-9_]*$"></if-regexp>
+                    <if-regexp field-name="parameters.productFeatureTypeId" expr="^[a-zA-Z_0-9]+$"></if-regexp>
                 </not>
             </condition>
             <then>