[OFBiz] SVN: r7473 - in trunk/applications/order: config script/org/ofbiz/order/order

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-05-01 17:40:49 -0500 (Mon, 01 May 2006)
New Revision: 7473

Modified:
   trunk/applications/order/config/OrderErrorUiLabels.properties
   trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Log:
Improved error message when a return item has already been fully returned or when a bad return item type is being created

Modified: trunk/applications/order/config/OrderErrorUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderErrorUiLabels.properties	2006-05-01 22:03:06 UTC (rev 7472)
+++ trunk/applications/order/config/OrderErrorUiLabels.properties	2006-05-01 22:40:49 UTC (rev 7473)
@@ -120,7 +120,7 @@
 OrderFixedAssetNotFoundFixedAssetId=fixed_Asset_not_found. Fixed AssetId : ${fixedAssetId}
 OrderFrequencyOrIntervalWasNotSpecified=Frequency or interval was not specified
 OrderIllegalCharacterInSelectedItemField=Illegal character in selectedItem field
-OrderIllegalReturnItemTypePassed=Illegal returnItemType passed. 
+OrderIllegalReturnItemTypePassed=Illegal returnItemType: either order ${orderId} item ${orderItemSeqId} has been returned in full, or a return item other than Manual Adjustment or Shipping was being added to the return 
 OrderInvalidAmountSetForBillingAccount=Invalid amount set for Billing Account # ${billingAccountId}
 OrderInvalidCancelQuantityCannotCancel=Invalid cancel quantity ; cannot cancel ${thisCancelQty}
 OrderInvalidDateFormatForFromDate=Invalid date format for fromDate

Modified: trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
===================================================================
--- trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml	2006-05-01 22:03:06 UTC (rev 7472)
+++ trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml	2006-05-01 22:40:49 UTC (rev 7473)
@@ -311,7 +311,9 @@
                         </and>
                     </condition>
                     <then>
-                        <log level="error" message="Illegal returnItemType for ${parameters}"/>
+                        <set from-field="parameters.orderId" field="orderId"/>
+                        <set from-field="parameters.orderItemSeqId" field="orderItemSeqId"/>
+                        <log level="error" message="Illegal returnItemType: either order ${orderId} item ${orderItemSeqId} has been returned in full, or a return item other than Manual Adjustment or Shipping was being added to the return"/>
                         <add-error><fail-property resource="OrderErrorUiLabels" property="OrderIllegalReturnItemTypePassed"/></add-error>
                     <check-errors/>