svn commit: r676247 - in /ofbiz/branches/release4.0: ./ applications/product/config/ applications/product/script/org/ofbiz/product/feature/

Author: jleroux
Date: Sat Jul 12 15:46:12 2008
New Revision: 676247

URL: http://svn.apache.org/viewvc?rev=676247&view=rev
Log:
Applied fix from trunk for revision: 676246

Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels.properties
    ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels_fr.properties
    ofbiz/branches/release4.0/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 12 15:46:12 2008
@@ -1 +1 @@
-/ofbiz/trunk:674173,676162,676227
+/ofbiz/trunk:674173,676162,676227,676246

Modified: ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels.properties?rev=676247&r1=676246&r2=676247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels.properties (original)
+++ ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels.properties Sat Jul 12 15:46:12 2008
@@ -18,4 +18,4 @@
 ###############################################################################
 ProductReturnNotYetAcceptedOrAlreadyReceived=This return is not yet accepted or already received.
 ProductReturnRequestedOK=The return is requested.
-ProductFeatureTypeIdMustContainsLettersAndDigits=The Product Feature TypeId must contains only letters and digits and must begin by a letter. Please re-enter
+ProductFeatureTypeIdMustContainsLettersAndDigits=The Product Feature TypeId must contains only letters, ampersand and digits. Please re-enter

Modified: ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels_fr.properties?rev=676247&r1=676246&r2=676247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels_fr.properties (original)
+++ ofbiz/branches/release4.0/applications/product/config/ProductErrorUiLabels_fr.properties Sat Jul 12 15:46:12 2008
@@ -18,4 +18,4 @@
 ###############################################################################
 ProductReturnNotYetAcceptedOrAlreadyReceived=Ce retour n'est pas encore accept\u00E9 ou d\u00E9j\u00E0 re\u00E7u.
 ProductReturnRequestedOK=Le retour est demand\u00E9.
-ProductFeatureTypeIdMustContainsLettersAndDigits=La r\u00E9f. de type de caract\u00E9ristique d'article ne doit contenir que des lettres et des chiffres et doit commencer par une lettre. Recommencez SVP
\ No newline at end of file
+ProductFeatureTypeIdMustContainsLettersAndDigits=La r\u00E9f. de type de caract\u00E9ristique d'article ne doit contenir que des lettres, le tiret bas "_" et des chiffres. Recommencez SVP
\ No newline at end of file

Modified: ofbiz/branches/release4.0/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=676247&r1=676246&r2=676247&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/branches/release4.0/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Sat Jul 12 15:46:12 2008
@@ -261,7 +261,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>