Author: jacopoc
Date: Fri Dec 4 12:53:27 2009
New Revision: 887179
URL: http://svn.apache.org/viewvc?rev=887179&view=rev
Log:
Reimplemented Balance Sheet report (added subtotals, improved layout,
especially the one of the PDF version, misc fixes); misc enhancements to the
Income Statement.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy?rev=887179&r1=887178&r2=887179&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
Fri Dec 4 12:53:27 2009
@@ -96,7 +96,7 @@
accountMap.put("balance", balance);
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
- accountBalanceList = transactionTotalsMap.values().asList();
+ accountBalanceList =
UtilMisc.sortMaps(transactionTotalsMap.values().asList(),
UtilMisc.toList("accountCode"));
// revenues are accounts of class CREDIT: the balance is given by credits
minus debits
balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit);
}
@@ -139,7 +139,7 @@
accountMap.put("balance", balance);
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
- accountBalanceList = transactionTotalsMap.values().asList();
+ accountBalanceList =
UtilMisc.sortMaps(transactionTotalsMap.values().asList(),
UtilMisc.toList("accountCode"));
// revenues are accounts of class DEBIT: the balance is given by debits
minus credits
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit);
}
@@ -182,7 +182,7 @@
accountMap.put("balance", balance);
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
- accountBalanceList = transactionTotalsMap.values().asList();
+ accountBalanceList =
UtilMisc.sortMaps(transactionTotalsMap.values().asList(),
UtilMisc.toList("accountCode"));
// revenues are accounts of class DEBIT: the balance is given by debits
minus credits
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit);
}
@@ -223,7 +223,7 @@
accountMap.put("balance", balance);
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
- accountBalanceList = transactionTotalsMap.values().asList();
+ accountBalanceList =
UtilMisc.sortMaps(transactionTotalsMap.values().asList(),
UtilMisc.toList("accountCode"));
// revenues are accounts of class DEBIT: the balance is given by debits
minus credits
balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit);
}
@@ -264,7 +264,7 @@
accountMap.put("balance", balance);
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
- accountBalanceList = transactionTotalsMap.values().asList();
+ accountBalanceList =
UtilMisc.sortMaps(transactionTotalsMap.values().asList(),
UtilMisc.toList("accountCode"));
// incomes are accounts of class CREDIT: the balance is given by credits
minus debits
balanceTotal = balanceTotalCredit.subtract(balanceTotalDebit);
}
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=887179&r1=887178&r2=887179&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Fri Dec 4 12:53:27 2009
@@ -2220,12 +2220,6 @@
<response name="error" type="view" value="ComparativeIncomeStatement"/>
</request-map>
<request-map uri="BalanceSheet"><security https="true"
auth="true"/><response name="success" type="view"
value="BalanceSheet"/></request-map>
- <request-map uri="prepareBalanceSheet">
- <security https="true" auth="true"/>
- <event type="service" invoke="prepareBalanceSheet"/>
- <response name="success" type="view" value="BalanceSheet"/>
- <response name="error" type="view" value="BalanceSheet"/>
- </request-map>
<request-map uri="ComparativeBalanceSheet"><security https="true"
auth="true"/><response name="success" type="view"
value="ComparativeBalanceSheet"/></request-map>
<request-map uri="prepareComparativeBalanceSheet">
<security https="true" auth="true"/>
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=887179&r1=887178&r2=887179&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
Fri Dec 4 12:53:27 2009
@@ -131,7 +131,7 @@
<field name="balance" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="BalanceSheetParameters" type="single"
target="prepareBalanceSheet"
+ <form name="BalanceSheetParameters" type="single" target="BalanceSheet"
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="thruDate"><date-time
default-value="${nowTimestamp}"/></field>
@@ -215,6 +215,40 @@
<field name="totalAmount" title-area-style="tableheadmedium"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
</form>
+ <form name="BalanceSheetAssets" type="list"
list-name="assetAccountBalanceList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries"
description="${accountCode}">
+ <parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
+ </hyperlink>
+ </field>
+ <field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
+ <field name="balance" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
+ </form>
+ <form name="BalanceSheetLiabilities" type="list"
list-name="liabilityAccountBalanceList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries"
description="${accountCode}">
+ <parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
+ </hyperlink>
+ </field>
+ <field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
+ <field name="balance" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
+ </form>
+ <form name="BalanceSheetEquities" type="list"
list-name="equityAccountBalanceList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries"
description="${accountCode}">
+ <parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
+ </hyperlink>
+ </field>
+ <field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
+ <field name="balance" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
+ </form>
+
<form name="FindTransactionTotals" type="single"
target="TransactionTotals" title="Find list of transaction totals"
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=887179&r1=887178&r2=887179&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Fri Dec 4 12:53:27 2009
@@ -302,55 +302,168 @@
<screenlet
title="${uiLabelMap.AccountingIncomeStatement}">
<include-form name="IncomeStatementParameters"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
+ <screenlet
title="${uiLabelMap.AccountingIncomeStatement}">
+ <link text="${uiLabelMap.AccountingExportAsCsv}"
style="button" target="IncomeStatementListCsv.csv">
+ <parameter param-name="fromDate"
from-field="parameters.fromDate"/>
+ <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
+ <parameter param-name="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="IncomeStatementListPdf.pdf">
+ <parameter param-name="fromDate"
from-field="parameters.fromDate"/>
+ <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
+ <parameter param-name="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
+ </container>
+ <include-form name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
+ </container>
+ <include-form name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
+ </container>
+ <include-form name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingNetSales}: ${revenueBalanceTotal}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingCostOfGoodsSold}: ${cogsExpense}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingGrossMargin}: ${grossMargin}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingOperatingExpenses}: ${sgaExpense}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingIncomeFromOperations}: ${incomeFromOperations}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingNetIncome}: ${netIncome}"/>
+ </container>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="BalanceSheet">
+ <section>
+ <actions>
+ <set field="viewSize" value="99999"/>
+ <set field="titleProperty" value="AccountingBalanceSheet"/>
+ <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
+ <set field="tabButtonItem2" value="BalanceSheet"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <service service-name="getPartyAccountingPreferences"
result-map="result">
+ <field-map field-name="organizationPartyId"/>
+ </service>
+ <set field="partyAcctgPreference"
from-field="result.partyAccountingPreference"/>
+ <set field="currencyUomId"
from-field="partyAcctgPreference.baseCurrencyUomId"/>
+ <set field="thruDate" from-field="parameters.thruDate"
type="Timestamp" default-value="${nowTimestamp}"/>
+ <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet
title="${uiLabelMap.AccountingBalanceSheet}">
+ <include-form name="BalanceSheetParameters"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <link text="${uiLabelMap.AccountingExportAsCsv}"
style="button" target="BalanceSheet.csv">
+ <parameter param-name="organizationPartyId"/>
+ <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
+ <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="BalanceSheet.pdf">
+ <parameter param-name="organizationPartyId"/>
+ <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
+ <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <screenlet
title="${uiLabelMap.AccountingBalanceSheet}">
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
+ </container>
+ <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
+ </container>
+ <include-form name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
+ </container>
+ <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingCurrentAssets}: ${currentAssetBalanceTotal}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingLongTermAssets}: ${longtermAssetBalanceTotal}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingCurrentLiabilities}:
${currentLiabilityBalanceTotal}"/>
+ </container>
+ <container>
+ <label style="h3"
text="${uiLabelMap.AccountingTotalLiabilitiesAndEquities}:
${liabilityEquityBalanceTotal}"/>
+ </container>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="BalanceSheetPdf">
+ <section>
+ <actions>
+ <set field="viewSize" value="99999"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <service service-name="getPartyAccountingPreferences"
result-map="result">
+ <field-map field-name="organizationPartyId"/>
+ </service>
+ <set field="partyAcctgPreference"
from-field="result.partyAccountingPreference"/>
+ <set field="currencyUomId"
from-field="partyAcctgPreference.baseCurrencyUomId"/>
+ <set field="thruDate" from-field="parameters.thruDate"
type="Timestamp" default-value="${nowTimestamp}"/>
+ <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="body">
<section>
- <condition>
- <not><if-empty field="totalNetIncome"/></not>
- </condition>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingIncomeStatement}">
- <link
text="${uiLabelMap.AccountingExportAsCsv}" style="button"
target="IncomeStatementListCsv.csv">
- <parameter param-name="fromDate"
from-field="parameters.fromDate"/>
- <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
- <parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
- </link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="IncomeStatementListPdf.pdf">
- <parameter param-name="fromDate"
from-field="parameters.fromDate"/>
- <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
- <parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
- </link>
- <container>
- <label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
- </container>
- <include-form
name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
+ <label style="h1"
text="${uiLabelMap.AccountingBalanceSheet}"/>
</container>
- <include-form
name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form
name="BalanceSheetParameters"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
</container>
- <include-form name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingNetSales}: ${revenueBalanceTotal}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
</container>
+ <include-form
name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingCostOfGoodsSold}: ${cogsExpense}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
</container>
+ <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingGrossMargin}: ${grossMargin}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingCurrentAssets}: ${currentAssetBalanceTotal}"/>
</container>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingOperatingExpenses}: ${sgaExpense}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingLongTermAssets}: ${longtermAssetBalanceTotal}"/>
</container>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingIncomeFromOperations}: ${incomeFromOperations}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingCurrentLiabilities}:
${currentLiabilityBalanceTotal}"/>
</container>
<container>
- <label style="h3"
text="${uiLabelMap.AccountingNetIncome}: ${netIncome}"/>
+ <label style="h3"
text="${uiLabelMap.AccountingTotalLiabilitiesAndEquities}:
${liabilityEquityBalanceTotal}"/>
</container>
- </screenlet>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -358,62 +471,27 @@
</widgets>
</section>
</screen>
-
- <screen name="BalanceSheet">
+ <screen name="BalanceSheetCsv">
<section>
<actions>
<set field="viewSize" value="99999"/>
- <set field="titleProperty" value="AccountingBalanceSheet"/>
- <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
- <set field="tabButtonItem2" value="BalanceSheet"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
<service service-name="getPartyAccountingPreferences"
result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="partyAcctgPreference"
from-field="result.partyAccountingPreference"/>
<set field="currencyUomId"
from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="assetBalancesList"
from-field="parameters.assetBalancesList"/>
- <set field="liabilityBalancesList"
from-field="parameters.liabilityBalancesList"/>
- <set field="equityBalancesList"
from-field="parameters.equityBalancesList"/>
+ <set field="thruDate" from-field="parameters.thruDate"
type="Timestamp" default-value="${nowTimestamp}"/>
+ <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy"/>
</actions>
<widgets>
- <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet
title="${uiLabelMap.AccountingBalanceSheet}">
- <include-form name="BalanceSheetParameters"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <section>
- <condition>
- <or>
- <not><if-empty
field="assetBalancesList"/></not>
- <not><if-empty
field="liabilityBalancesList"/></not>
- <not><if-empty
field="equityBalancesList"/></not>
- </or>
- </condition>
- <widgets>
- <link
text="${uiLabelMap.AccountingExportAsCsv}" style="button"
target="BalanceSheet.csv">
- <parameter
param-name="organizationPartyId"/>
- <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
- <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
- </link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="BalanceSheet.pdf">
- <parameter
param-name="organizationPartyId"/>
- <parameter param-name="thruDate"
from-field="parameters.thruDate"/>
- <parameter param-name="glFiscalTypeId"
from-field="parameters.glFiscalTypeId"/>
- </link>
- <screenlet
title="${uiLabelMap.AccountingAssets}">
- <include-form name="BalanceSheetAssetList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <screenlet
title="${uiLabelMap.AccountingLiabilities}">
- <include-form
name="BalanceSheetLiabilityList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <screenlet
title="${uiLabelMap.AccountingEquities}">
- <include-form
name="BalanceSheetEquityList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
+ <label style="h3" text="${uiLabelMap.AccountingAssets}"/>
+ <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <label style="h3" text="${uiLabelMap.AccountingLiabilities}"/>
+ <include-form name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <label style="h3" text="${uiLabelMap.AccountingEquities}"/>
+ <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -695,61 +773,6 @@
</section>
</screen>
- <screen name="BalanceSheetCsv">
- <section>
- <actions>
- <set field="viewSize" value="99999"/>
- <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
- <service service-name="prepareBalanceSheet"
result-map="result" auto-field-map="true"/>
- <set field="assetBalancesList"
from-field="result.assetBalancesList"/>
- <set field="liabilityBalancesList"
from-field="result.liabilityBalancesList"/>
- <set field="equityBalancesList"
from-field="result.equityBalancesList"/>
- </actions>
- <widgets>
- <container style="h3">
- <label text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="BalanceSheetAssetListCsv"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <label text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="BalanceSheetLiabilityListCsv"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <label text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="BalanceSheetEquityListCsv"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </widgets>
- </section>
- </screen>
-
- <screen name="BalanceSheetPdf">
- <section>
- <actions>
- <set field="viewSize" value="99999"/>
- <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
- <service service-name="prepareBalanceSheet"
result-map="result" auto-field-map="true"/>
- <set field="assetBalancesList"
from-field="result.assetBalancesList"/>
- <set field="liabilityBalancesList"
from-field="result.liabilityBalancesList"/>
- <set field="equityBalancesList"
from-field="result.equityBalancesList"/>
- <set field="isPdf" value="true" type="Boolean"/>
- </actions>
- <widgets>
- <decorator-screen name="SimpleDecorator"
location="component://common/widget/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <widgets>
- <container>
- <label
text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="BalanceSheetAssetList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <label
text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form
name="BalanceSheetLiabilityList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <label
text="${uiLabelMap.AccountingEquities}"/>
- <include-form
name="BalanceSheetEquityList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="TrialBalanceSearchResultsCsv">
<section>
<actions>
