svn commit: r890784 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: ashish
Date: Tue Dec 15 13:11:45 2009 New Revision: 890784 URL: http://svn.apache.org/viewvc?rev=890784&view=rev Log: Applied patch from jira issue - OFBIZ-3332 - Implement Comparative Cash Flow Statement. -- Here is modified patch for issue, now total of Receipts and disbursement is showing for selected time periods. Thanks Sumit & Jacopo for the contribution. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=890784&r1=890783&r2=890784&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Dec 15 13:11:45 2009 @@ -7790,6 +7790,22 @@ <value xml:lang="th">à¸à¹à¸§à¸à¹à¸§à¸¥à¸²à¸ªà¸±à¹à¸ à¹</value> <value xml:lang="zh">åæ¶é´æ®µ</value> </property> + <property key="AccountingPeriod1Credit_Disbursement"> + <value xml:lang="en">Period 1 Credit(Disbursement)</value> + <value xml:lang="hi_IN">ठवधि 1 à¤à¤®à¤¾</value> + </property> + <property key="AccountingPeriod2Credit_Disbursement"> + <value xml:lang="en">Period 2 Credit(Disbursement)</value> + <value xml:lang="hi_IN">ठवधि 2 à¤à¤®à¤¾</value> + </property> + <property key="AccountingPeriod1Debit_Receipts"> + <value xml:lang="en">Period 1 Debit(Receipts)</value> + <value xml:lang="hi_IN">ठवधि 1 नामà¥</value> + </property> + <property key="AccountingPeriod2Debit_Receipts"> + <value xml:lang="en">Period 2 Debit(Receipts)</value> + <value xml:lang="hi_IN">ठवधि 2 नामà¥</value> + </property> <property key="AccountingPeriod1NetIncome"> <value xml:lang="de">Nettogewinn in Periode1</value> <value xml:lang="en">Period1 Net Income</value> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy?rev=890784&r1=890783&r2=890784&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/ComparativeCashFlowStatement.groovy Tue Dec 15 13:11:45 2009 @@ -39,19 +39,21 @@ periodCashBalanceMap = [:]; periodCashBalanceList = []; periodCashBalanceList1.each { accountBalance -> - periodCashBalanceMap.put(accountBalance.glAccountId, UtilMisc.toMap("glAccountId", accountBalance.glAccountId, "accountCode", accountBalance.accountCode, "accountName", accountBalance.accountName, "balance1", accountBalance.balance, "balance2", BigDecimal.ZERO)); + periodCashBalanceMap.put(accountBalance.glAccountId, UtilMisc.toMap("glAccountId", accountBalance.glAccountId, "accountCode", accountBalance.accountCode, "accountName", accountBalance.accountName, "balance1", accountBalance.balance, "balance2", BigDecimal.ZERO, "D1", accountBalance.D, "C1", accountBalance.C, "D2", BigDecimal.ZERO, "C2", BigDecimal.ZERO)); } periodCashBalanceList2.each { accountBalance -> Map periodCashAccount = (Map)periodCashBalanceMap.get(accountBalance.glAccountId); if (!periodCashAccount) { - periodCashBalanceMap.put(accountBalance.glAccountId, UtilMisc.toMap("glAccountId", accountBalance.glAccountId, "accountCode", accountBalance.accountCode, "accountName", accountBalance.accountName, "balance2", accountBalance.balance, "balance1", BigDecimal.ZERO)); + periodCashBalanceMap.put(accountBalance.glAccountId, UtilMisc.toMap("glAccountId", accountBalance.glAccountId, "accountCode", accountBalance.accountCode, "accountName", accountBalance.accountName, "balance2", accountBalance.balance, "balance1", BigDecimal.ZERO, "D2", accountBalance.D, "C2", accountBalance.C, "D1", BigDecimal.ZERO, "C1", BigDecimal.ZERO)); } else { periodCashAccount.put("balance2", accountBalance.balance); + periodCashAccount.put("D2", accountBalance.D); + periodCashAccount.put("C2", accountBalance.C); } } periodCashBalanceList = UtilMisc.sortMaps(periodCashBalanceMap.values().asList(), UtilMisc.toList("accountCode")); -context.periodCashBalanceList = periodCashBalanceList; +context.periodCashBalanceList = periodCashBalanceList; closingCashBalanceMap = [:]; closingCashBalanceList = []; closingCashBalanceList1.each { accountBalance -> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=890784&r1=890783&r2=890784&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Dec 15 13:11:45 2009 @@ -695,7 +695,11 @@ </hyperlink> </field> <field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field> + <field name="D1" widget-style="tabletextright" title="${uiLabelMap.AccountingPeriod1Debit_Receipts}"><display type="currency" currency="${currencyUomId}"/></field> + <field name="C1" widget-style="tabletextright" title="${uiLabelMap.AccountingPeriod1Credit_Disbursement}"><display type="currency" currency="${currencyUomId}"/></field> <field name="balance1" widget-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> + <field name="D2" widget-style="tabletextright" title="${uiLabelMap.AccountingPeriod2Debit_Receipts}"><display type="currency" currency="${currencyUomId}"/></field> + <field name="C2" widget-style="tabletextright" title="${uiLabelMap.AccountingPeriod2Credit_Disbursement}"><display type="currency" currency="${currencyUomId}"/></field> <field name="balance2" widget-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field> </form> <form name="ComparativeCashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |