svn commit: r1597466 - in /ofbiz/branches/release13.07: ./ applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

Author: jleroux
Date: Sun May 25 20:05:42 2014
New Revision: 1597466

URL: http://svn.apache.org/r1597466
Log:
"Applied fix from trunk for revision: 1597464  "
------------------------------------------------------------------------
r1597464 | jleroux | 2014-05-25 22:04:08 +0200 (dim. 25 mai 2014) | 9 lignes

2 patches from Deepak Dixit for "If customer pay higher than amount due, POS issues an error 'Problem with order change'." https://issues.apache.org/jira/browse/OFBIZ-5611

If customer pay higher than amount due, POS issues an error 'Problem with order change'.

Deepak:
This is due to changes done at r#1186102 (http://ofbiz.markmail.org/message/orewmkxnalebolke?q=1186102)
Removed incorrect condition form createPaymentApplication service.
Also found type in PaymentEvents.java file (Xuilabels == > XuiLabels).

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1597464

Modified: ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1597466&r1=1597465&r2=1597466&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Sun May 25 20:05:42 2014
@@ -215,15 +215,13 @@ under the License.
                 <field field="invoice" type="GenericValue"/>
             </call-class-method>
 
-            <if-empty field="paymentAppl.amountApplied">
-                <if-compare-field field="notAppliedInvoice" operator="less-equals" to-field="notAppliedPayment">
+                <if-compare-field field="notAppliedInvoice" operator="less-equals" to-field="notAppliedPayment" type="BigDecimal">
                     <set field="paymentAppl.amountApplied" from-field="notAppliedInvoice"/>
                     <else>
                         <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
                     </else>
                 </if-compare-field>
-            </if-empty>
-            
+
             <if-not-empty field="invoice.billingAccountId">
                 <set field="paymentAppl.billingAccountId" from-field="invoice.billingAccountId"/>
             </if-not-empty>