Posted by
jacopoc on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r536189-in-ofbiz-trunk-applications-order-config-OrderErrorUiLabels-properties-script-orgl-tp211643.html
Author: jacopoc
Date: Tue May 8 06:01:26 2007
New Revision: 536189
URL:
http://svn.apache.org/viewvc?view=rev&rev=536189Log:
The payment method is now mandatory for repair returns.
Modified:
ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties?view=diff&rev=536189&r1=536188&r2=536189==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties Tue May 8 06:01:26 2007
@@ -63,6 +63,7 @@
OrderCouldNotGetAgreement=Could not get agreement ${agreementId}
OrderCouldNotGetAgreementItemsThrough =Could not get agreementItems through ${agreementId}
OrderCouldNotGetAgreementTermsThrough=Could not get agreementTerms through ${agreementId}
+OrderCouldNotInitPurchaseOrder=Could not init an empty purchase order.
OrderCouldNotLocateTheSelectedParty=Could not locate the selected party.
OrderCouldNotSelectAlternateGiftAlternateGwpLineIsNotAValidNumber=Could not select alternate gift, alternateGwpLine is not a valid number.
OrderCouldNotSelectAlternateGiftNoAlternateGwpLinePassed=Could not select alternate gift, no alternateGwpLine passed.
@@ -206,7 +207,7 @@
OrderRentalOrderItems=Rental order items in the order, however no workEfforts with start/end date and number of persons
OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist=Requested return quantity [ ${parameters.returnQuantity} ] not available ; previous returns may exist [ ${returnableQuantity} ].
OrderReservationLengthShouldBeAPositiveNumber=Reservation length should be a positive number
-OrderReturnPaymentMethodNotSetForCrossShip=A payment method must be set for cross-ship returns
+OrderReturnPaymentMethodNeededForThisTypeOfReturn=A payment method must be set for this type of return
OrderReturnPriceCannotExceedThePurchasePrice=Return price [ ${parameters.returnPrice} ] cannot exceed the purchase price [ ${returnablePrice} ].
OrderReturnPriceCannotExceedTheOrderTotal=Return total of all return items [${returnTotal}] cannot exceed the order total of [ ${orderTotal} ].
OrderReturnTotalCannotLessThanZero=Return total [${returnTotalAmount}] can not less than zero.
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?view=diff&rev=536189&r1=536188&r2=536189==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue May 8 06:01:26 2007
@@ -141,11 +141,14 @@
<condition>
<and>
<if-empty field-name="returnHeader.paymentMethodId"/>
- <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/>
+ <or>
+ <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/>
+ <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/>
+ </or>
</and>
</condition>
<then>
- <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPaymentMethodNotSetForCrossShip"/></add-error>
+ <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPaymentMethodNeededForThisTypeOfReturn"/></add-error>
</then>
</if>
<check-errors/>