svn commit: r793335 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/invoice/InvoiceServices.xml script/org/ofbiz/accounting/payment/PaymentServices.xml webapp/accounting/reports/DepositSlip.fo.ftl

[ashish-18]

Author: ashish
Date: Sun Jul 12 11:54:15 2009
New Revision: 793335

URL: http://svn.apache.org/viewvc?rev=793335&view=rev
Log:
Minor fixes from Rishi Solanki.
- On empty list the Deposit slip Pdf generates error.
- removed calc tag instead of that used UEL expression, and fixed the running total functionality due to type mismatch.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=793335&r1=793334&r2=793335&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Sun Jul 12 11:54:15 2009
@@ -635,11 +635,7 @@
                 <result-to-field result-name="invoicePaymentInfoList"/>
             </call-service>
             <first-from-list list="invoicePaymentInfoList" entry="invoicePaymentInfo"/>
-            <calculate field="invoiceRunningTotal">
-                <calcop operator="add" field="invoiceRunningTotal">
-                    <calcop operator="get" field="invoicePaymentInfo.outstandingAmount"/>
-                </calcop>
-            </calculate>
+            <set field="invoiceRunningTotal" value="${invoiceRunningTotal + invoicePaymentInfo.outstandingAmount}" type="BigDecimal"/>
         </iterate>
         <field-to-result field="invoiceRunningTotal"/>
     </simple-method>

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=793335&r1=793334&r2=793335&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 Sun Jul 12 11:54:15 2009
@@ -435,7 +435,7 @@
             <entity-one entity-name="Payment" value-field="payment">
                 <field-map field-name="paymentId" from-field="paymentId"/>
             </entity-one>
-            <set field="paymentRunningTotal" value="${paymentRunningTotal + payment.amount}"/>
+            <set field="paymentRunningTotal" value="${paymentRunningTotal + payment.amount}" type="BigDecimal"/>
         </iterate>
         <field-to-result field="paymentRunningTotal"/>
     </simple-method>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl?rev=793335&r1=793334&r2=793335&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl Sun Jul 12 11:54:15 2009
@@ -111,6 +111,14 @@
                             </fo:block>
                         </fo:table-cell>
                     </fo:table-row>
+                <#else>
+                    <fo:table-row>
+                        <fo:table-cell number-columns-spanned="2"/>
+                        <fo:table-cell padding="2pt">
+                            <fo:block>${uiLabelMap.AccountingNoRecordFound}</fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell number-columns-spanned="2"/>
+                    </fo:table-row>
                 </#if>
             </fo:table-body>
         </fo:table>