svn commit: r779215 - in /ofbiz/trunk/applications/product: config/ProductErrorUiLabels.xml script/org/ofbiz/shipment/picklist/PicklistServices.xml

[mor-2]

Author: mor
Date: Wed May 27 15:55:19 2009
New Revision: 779215

URL: http://svn.apache.org/viewvc?rev=779215&view=rev
Log:
Used fail-property instead and better error message this time.

Modified:
    ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml

Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=779215&r1=779214&r2=779215&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Wed May 27 15:55:19 2009
@@ -94,6 +94,12 @@
     <property key="ProductNotInAnyLocation">
         <value xml:lang="en">This Product is not in any Location</value>
     </property>
+    <property key="ProductNumberOfOrdersMustNotBeEmptyToPrintPickSheet">
+        <value xml:lang="en">The number of orders must not be empty. Please re-enter to print pick sheet.</value>
+    </property>
+    <property key="ProductNumberOfOrdersMustBeGreaterThenZeroToPrintPickSheet">
+        <value xml:lang="en">The number of orders must be greater then zero. Please re-enter to print pick sheet.</value>
+    </property>
     <property key="ProductRemoveCommunicationEventProductPermissionError">
         <value xml:lang="en">Remove Communication Event Product Permission Error</value>
         <value xml:lang="it">Errore permesso durante la rimozione dell'evento comunicazione prodotto</value>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=779215&r1=779214&r2=779215&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Wed May 27 15:55:19 2009
@@ -673,10 +673,14 @@
     <!-- print pick sheet -->
     <simple-method method-name="printPickSheets" short-description="Print pick sheets for orders">
         <if-empty field="parameters.maxNumberOfOrdersToPrint">
-            <add-error error-list-name="error_list"><fail-message message="Please specify the number of orders to print pick sheet"/></add-error>
+            <add-error error-list-name="error_list">
+                <fail-property property="ProductNumberOfOrdersMustNotBeEmptyToPrintPickSheet" resource="ProductErrorUiLabels"/>
+            </add-error>
         <else>
             <if-compare field="parameters.maxNumberOfOrdersToPrint" operator="less-equals" value="0" type="Long">
-                <add-error error-list-name="error_list"><fail-message message="Cannot specify negative value."/></add-error>
+                <add-error error-list-name="error_list">
+                    <fail-property property="ProductNumberOfOrdersMustBeGreaterThenZeroToPrintPickSheet" resource="ProductErrorUiLabels"/>
+                </add-error>
             </if-compare>
         </else>
         </if-empty>