svn commit: r797730 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml script/org/ofbiz/accounting/payment/PaymentServices.xml

[apatel-2]

Author: apatel
Date: Sat Jul 25 09:34:56 2009
New Revision: 797730

URL: http://svn.apache.org/viewvc?rev=797730&view=rev
Log:
Return message if all payments are not ready for check run.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=797730&r1=797729&r2=797730&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Jul 25 09:34:56 2009
@@ -4614,6 +4614,9 @@
         <value xml:lang="th">ใบกำกับสินค้า</value>
         <value xml:lang="zh">发票</value>
     </property>
+    <property key="AccountingInvoicesRequiredInReadyStatus">
+        <value xml:lang="en">All Invoices should be in READY status for Check Run process.</value>
+    </property>
     <property key="AccountingIssueCheck">
         <value xml:lang="en">Issue Check</value>
     </property>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=797730&r1=797729&r2=797730&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Sat Jul 25 09:34:56 2009
@@ -512,6 +512,10 @@
                 </call-service>
                 <first-from-list list="invoicePaymentInfoList" entry="invoicePaymentInfo"/>
                 <set field="paymentAmount" value="${paymentAmount + invoicePaymentInfo.outstandingAmount}"/>
+            <else>
+                <add-error><fail-property resource="AccountingUiLabels" property="AccountingInvoicesRequiredInReadyStatus"/></add-error>
+                <check-errors/>
+            </else>
             </if-compare>
         </iterate>
         <if-compare field="paymentAmount" operator="greater" type="BigDecimal" value="0">