svn commit: r554137 - /ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r554137 - /ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

lektran
Author: lektran
Date: Fri Jul  6 22:33:48 2007
New Revision: 554137

URL: http://svn.apache.org/viewvc?view=rev&rev=554137
Log:
Applied fix from trunk for revision: 543924

Modified:
    ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

Modified: ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?view=diff&rev=554137&r1=554136&r2=554137
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/release4.0/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Fri Jul  6 22:33:48 2007
@@ -136,10 +136,7 @@
                 <log level="warning" message="Create Payment Application: Amount to apply [${paymentAppl.amountApplied}] is greater than the outstanding amount [${notApplied}] of the invoice [${invoice.invoiceId}]. Creating Payment Application for outstanding amount [${notApplied}] instead."/>
                 <set field="paymentAppl.amountApplied" from-field="notApplied"/>
             </if-compare-field>
-            
-            <!-- this is intentionally commented out because auto-filling billingAccountId from invoice to payment application will cause double-counting of
-            amount charged to billing accounts if there are multiple payment methods (ie, billing account + credit card)
-            see https://issues.apache.org/jira/browse/OFBIZ-682 -->
+
             <if-not-empty field-name="invoice.billingAccountId">
                 <set field="paymentAppl.billingAccountId" from-field="invoice.billingAccountId"/>
             </if-not-empty>