svn commit: r1305027 - in /ofbiz/branches/release10.04: ./ applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

Author: jleroux
Date: Sun Mar 25 13:15:18 2012
New Revision: 1305027

URL: http://svn.apache.org/viewvc?rev=1305027&view=rev
Log:
"Applied fix from trunk for revision: 1305025  "
------------------------------------------------------------------------
r1305025 | jleroux | 2012-03-25 15:14:12 +0200 (dim., 25 mars 2012) | 1 line

A patch from Atul Vani "When changing picklists status to something invalid, user friendly error message should be displayed." https://issues.apache.org/jira/browse/OFBIZ-4579
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1305025

Modified: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1305027&r1=1305026&r2=1305027&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/branches/release10.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Sun Mar 25 13:15:18 2012
@@ -779,6 +779,7 @@ under the License.
                 <if-empty field="checkStatusValidChange">
                     <set value="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/>
                 </if-empty>
+                <check-errors/>
 
                 <make-value entity-name="PicklistStatusHistory" value-field="newStatusValue"/>
                 <set from-field="parameters.picklistId" field="newStatusValue.picklistId"/>