This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4517846 Improved: List and Grid (OFBIZ-11345) (#371)
4517846 is described below
commit 451784674895628091aba42fa9303a7afa5dc183
Author: Pierre Smits <[email protected]>
AuthorDate: Tue Nov 30 17:49:49 2021 +0100
Improved: List and Grid (OFBIZ-11345) (#371)
According to the definition in widget-form.xsd the use of a combination of
a form with type="list" is deprecated in favour of a grid.
Modified:
ReportFinancialSummaryScreens.xml: from form ref to grid ref , additional
cleanup
ReportFinancialSummaryForms.xml: from form definition with list ref to grid
definition with list ref, additional clean-up
---
.../widget/ReportFinancialSummaryForms.xml | 166 ++++++++++----------
.../widget/ReportFinancialSummaryScreens.xml | 170 ++++++++++-----------
2 files changed, 168 insertions(+), 168 deletions(-)
diff --git a/applications/accounting/widget/ReportFinancialSummaryForms.xml
b/applications/accounting/widget/ReportFinancialSummaryForms.xml
index 9ea17ec..acc557b 100644
--- a/applications/accounting/widget/ReportFinancialSummaryForms.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryForms.xml
@@ -97,7 +97,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit" tooltip="Please enter From and Thru date in fields
above"><submit button-type="button"/></field>
</form>
- <form name="IncomeStatementRevenues" type="list"
list-name="revenueAccountBalanceList"
+ <grid name="IncomeStatementRevenues" list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -107,8 +107,8 @@ under the License.
</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="IncomeStatementExpenses" type="list"
list-name="expenseAccountBalanceList"
+ </grid>
+ <grid name="IncomeStatementExpenses" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -118,8 +118,8 @@ under the License.
</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="IncomeStatementIncome" type="list"
list-name="incomeAccountBalanceList"
+ </grid>
+ <grid name="IncomeStatementIncome" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -129,7 +129,7 @@ under the License.
</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>
+ </grid>
<form name="ComparativeIncomeStatementParameters" type="single"
target="ComparativeIncomeStatement" header-row-style="header-row"
default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="period1FromDate"
title="${uiLabelMap.FormFieldTitle_period1FromDate}" required-field="true"
position="1"><date-time type="timestamp"/></field>
@@ -175,7 +175,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ComparativeIncomeStatementRevenues" type="list"
list-name="revenueAccountBalanceList"
+ <grid name="ComparativeIncomeStatementRevenues"
list-name="revenueAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -186,11 +186,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeIncomeStatementRevenuesPdf"
extends="ComparativeIncomeStatementRevenues">
+ </grid>
+ <grid name="ComparativeIncomeStatementRevenuesPdf"
extends="ComparativeIncomeStatementRevenues">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeIncomeStatementExpenses" type="list"
list-name="expenseAccountBalanceList"
+ </grid>
+ <grid name="ComparativeIncomeStatementExpenses"
list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -201,11 +201,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeIncomeStatementExpensesPdf"
extends="ComparativeIncomeStatementExpenses">
+ </grid>
+ <grid name="ComparativeIncomeStatementExpensesPdf"
extends="ComparativeIncomeStatementExpenses">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeIncomeStatementIncome" type="list"
list-name="incomeAccountBalanceList"
+ </grid>
+ <grid name="ComparativeIncomeStatementIncome"
list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -216,10 +216,10 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeIncomeStatementIncomePdf"
extends="ComparativeIncomeStatementIncome">
+ </grid>
+ <grid name="ComparativeIncomeStatementIncomePdf"
extends="ComparativeIncomeStatementIncome">
<field name="accountCode"><display/></field>
- </form>
+ </grid>
<form name="BalanceSheetParameters" type="single" target="BalanceSheet"
header-row-style="header-row" default-table-style="basic-table">
@@ -234,7 +234,7 @@ under the License.
</field>
<field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="BalanceSheetAssets" type="list"
list-name="assetAccountBalanceList"
+ <grid name="BalanceSheetAssets" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -244,8 +244,8 @@ under the License.
</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"
+ </grid>
+ <grid name="BalanceSheetLiabilities"
list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -255,8 +255,8 @@ under the License.
</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"
+ </grid>
+ <grid name="BalanceSheetEquities" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -266,15 +266,15 @@ under the License.
</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="BalanceTotals" type="list" list-name="balanceTotalList"
+ </grid>
+ <grid name="BalanceTotals" list-name="balanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="totalName" value="${groovy:
uiLabelMap.get(totalName)}"/>
</row-actions>
<field name="totalName" title="${uiLabelMap.CommonTotal}"
title-area-style="tableheadhuge"><display description="${totalName}"/></field>
<field name="balance" title="_" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
+ </grid>
<form name="ComparativeBalanceSheetParameters" type="single"
target="ComparativeBalanceSheet"
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
@@ -318,7 +318,7 @@ under the License.
</field>
<field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="ComparativeBalanceSheetAssets" type="list"
list-name="assetAccountBalanceList"
+ <grid name="ComparativeBalanceSheetAssets"
list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -329,11 +329,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeBalanceSheetAssetsPdf"
extends="ComparativeBalanceSheetAssets">
+ </grid>
+ <grid name="ComparativeBalanceSheetAssetsPdf"
extends="ComparativeBalanceSheetAssets">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeBalanceSheetLiabilities" type="list"
list-name="liabilityAccountBalanceList"
+ </grid>
+ <grid name="ComparativeBalanceSheetLiabilities"
list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -344,11 +344,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeBalanceSheetLiabilitiesPdf"
extends="ComparativeBalanceSheetLiabilities">
+ </grid>
+ <grid name="ComparativeBalanceSheetLiabilitiesPdf"
extends="ComparativeBalanceSheetLiabilities">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeBalanceSheetEquities" type="list"
list-name="equityAccountBalanceList"
+ </grid>
+ <grid name="ComparativeBalanceSheetEquities"
list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -359,11 +359,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeBalanceSheetEquitiesPdf"
extends="ComparativeBalanceSheetEquities">
+ </grid>
+ <grid name="ComparativeBalanceSheetEquitiesPdf"
extends="ComparativeBalanceSheetEquities">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeBalanceTotals" type="list"
list-name="balanceTotalList"
+ </grid>
+ <grid name="ComparativeBalanceTotals" list-name="balanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="totalName" value="${groovy:
uiLabelMap.get(totalName)}"/>
@@ -371,7 +371,7 @@ under the License.
<field name="totalName" title-area-style="tableheadwide"><display
description="${totalName}"/></field>
<field name="balance1" title="Period1"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
<field name="balance2" title="Period2"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
- </form>
+ </grid>
<form name="SelectAcctReportPeriod" type="single" title="Select period for
report">
<field name="fromDate"><date-time/></field>
@@ -400,7 +400,7 @@ under the License.
</field>
<field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="PostedTransactionTotalList" type="list"
list-name="postedTransactionTotals"
+ <grid name="PostedTransactionTotalList" list-name="postedTransactionTotals"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="closingD" value="${openingD + D}" type="BigDecimal"/>
@@ -419,18 +419,18 @@ under the License.
<field name="C" title="${uiLabelMap.AccountingCreditFlag}"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
<field name="closingD" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="closingC" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="PostedTransactionTotalListPdf"
extends="PostedTransactionTotalList">
+ </grid>
+ <grid name="PostedTransactionTotalListPdf"
extends="PostedTransactionTotalList">
<field name="accountCode"><display/></field>
- </form>
- <form name="UnpostedTransactionTotalList" type="list"
list-name="unpostedTransactionTotals"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" extends="PostedTransactionTotalList">
+ </grid>
+ <grid name="UnpostedTransactionTotalList"
list-name="unpostedTransactionTotals" extends="PostedTransactionTotalList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode"><display/></field>
- </form>
- <form name="PostedAndUnpostedTransactionTotalList" type="list"
list-name="allTransactionTotals"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" extends="PostedTransactionTotalList">
+ </grid>
+ <grid name="PostedAndUnpostedTransactionTotalList"
list-name="allTransactionTotals" extends="PostedTransactionTotalList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode"><display/></field>
- </form>
+ </grid>
<form name="IncomeStatementListCsv" type="list"
list-name="glAccountIncomeList" view-size="99999">
<row-actions>
@@ -527,7 +527,7 @@ under the License.
<field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
- <form name="InventoryValuationList" type="list"
list-name="inventoryValuationList" odd-row-style="alternate-row"
default-table-style="basic-table hover-bar">
+ <grid name="InventoryValuationList" list-name="inventoryValuationList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="InventoryItemDetailForSum"
list="inventoryValuationList" use-cache="false">
<condition-list>
@@ -554,7 +554,7 @@ under the License.
<field name="unitCost" widget-style="tabletextright"><display
currency="${currencyUomId}" type="currency"/></field>
<field name="accountingQuantitySum"
widget-style="tabletextright"><display description="${accountingQuantitySum}
${quantityUom}"/></field>
<field name="value" widget-style="tabletextright"><display
description="${accountingQuantitySum * unitCost}" currency="${currencyUomId}"
type="currency"/></field>
- </form>
+ </grid>
<form name="TrialBalanceFinancialTimePeriodSelection" type="single"
header-row-style="header-row" target="TrialBalance"
default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
@@ -571,8 +571,8 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="TrialBalanceReport" type="list" list-name="accountBalances"
- odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <grid name="TrialBalanceReport" list-name="accountBalances"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
<parameter param-name="glAccountId"/>
@@ -584,7 +584,7 @@ under the License.
<field name="postedDebits" title="${uiLabelMap.AccountingDebitFlag}"
widget-style="tabletextright"><display description="${postedDebits}"
type="currency" currency="${currencyUomId}"/></field>
<field name="postedCredits" title="${uiLabelMap.AccountingCreditFlag}"
widget-style="tabletextright"><display description="${postedCredits}"
type="currency" currency="${currencyUomId}"/></field>
<field name="endingBalance"
title="${uiLabelMap.AccountingEndingBalance}"
widget-style="tabletextright"><display description="${endingBalance}"
type="currency" currency="${currencyUomId}"/></field>
- </form>
+ </grid>
<form name="CashFlowStatementParameters" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="selectedMonth" title="${uiLabelMap.CommonMonth}">
@@ -605,7 +605,7 @@ under the License.
</form>
<!-- Cash Flow Statement -->
- <form name="CashFlowStatementOpeningCashBalance" type="list"
list-name="openingCashBalanceList"
+ <grid name="CashFlowStatementOpeningCashBalance"
list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -615,11 +615,11 @@ under the License.
</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="CashFlowStatementOpeningCashBalancePdf"
extends="CashFlowStatementOpeningCashBalance">
+ </grid>
+ <grid name="CashFlowStatementOpeningCashBalancePdf"
extends="CashFlowStatementOpeningCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="CashFlowStatementPeriodCashBalance" type="list"
list-name="periodCashBalanceList"
+ </grid>
+ <grid name="CashFlowStatementPeriodCashBalance"
list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -631,11 +631,11 @@ under the License.
<field name="D" widget-style="tabletextright"
title="${uiLabelMap.AccountingTotalDebit_Receipts}"><display type="currency"
currency="${currencyUomId}"/></field>
<field name="C" widget-style="tabletextright"
title="${uiLabelMap.AccountingTotalCredit_Disbursement}"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="CashFlowStatementPeriodCashBalancePdf"
extends="CashFlowStatementPeriodCashBalance">
+ </grid>
+ <grid name="CashFlowStatementPeriodCashBalancePdf"
extends="CashFlowStatementPeriodCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="CashFlowStatementClosingCashBalance" type="list"
list-name="closingCashBalanceList"
+ </grid>
+ <grid name="CashFlowStatementClosingCashBalance"
list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -645,18 +645,18 @@ under the License.
</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="CashFlowStatementClosingCashBalancePdf"
extends="CashFlowStatementClosingCashBalance">
+ </grid>
+ <grid name="CashFlowStatementClosingCashBalancePdf"
extends="CashFlowStatementClosingCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="CashFlowBalanceTotals" type="list"
list-name="cashFlowBalanceTotalList"
+ </grid>
+ <grid name="CashFlowBalanceTotals" list-name="cashFlowBalanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="totalName" value="${groovy:
uiLabelMap.get(totalName)}"/>
</row-actions>
<field name="totalName" title="${uiLabelMap.CommonTotal}"
title-area-style="tableheadhuge"><display description="${totalName}"/></field>
<field name="balance" title="_" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
+ </grid>
<form name="FindCashFlowTotals" type="single" target="TransactionTotals"
title="Find list of cash flow totals"
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
@@ -693,7 +693,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ComparativeCashFlowStatementOpeningCashBalance" type="list"
list-name="openingCashBalanceList"
+ <grid name="ComparativeCashFlowStatementOpeningCashBalance"
list-name="openingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -704,11 +704,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeCashFlowStatementOpeningCashBalancePdf"
extends="ComparativeCashFlowStatementOpeningCashBalance">
+ </grid>
+ <grid name="ComparativeCashFlowStatementOpeningCashBalancePdf"
extends="ComparativeCashFlowStatementOpeningCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeCashFlowStatementPeriodCashBalance" type="list"
list-name="periodCashBalanceList"
+ </grid>
+ <grid name="ComparativeCashFlowStatementPeriodCashBalance"
list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -723,11 +723,11 @@ under the License.
<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="ComparativeCashFlowStatementPeriodCashBalancePdf"
extends="ComparativeCashFlowStatementPeriodCashBalance">
+ </grid>
+ <grid name="ComparativeCashFlowStatementPeriodCashBalancePdf"
extends="ComparativeCashFlowStatementPeriodCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeCashFlowStatementClosingCashBalance" type="list"
list-name="closingCashBalanceList"
+ </grid>
+ <grid name="ComparativeCashFlowStatementClosingCashBalance"
list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="accountCode">
<hyperlink description="${accountCode}"
target="FindAcctgTransEntries">
@@ -738,11 +738,11 @@ under the License.
<field name="accountName" title-area-style="tableheadwide"><display
description="${accountName}"/></field>
<field name="balance1" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="balance2" widget-style="tabletextright"><display
type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="ComparativeCashFlowStatementClosingCashBalancePdf"
extends="ComparativeCashFlowStatementClosingCashBalance">
+ </grid>
+ <grid name="ComparativeCashFlowStatementClosingCashBalancePdf"
extends="ComparativeCashFlowStatementClosingCashBalance">
<field name="accountCode"><display/></field>
- </form>
- <form name="ComparativeCashFlowBalanceTotals" type="list"
list-name="cashFlowBalanceTotalList"
+ </grid>
+ <grid name="ComparativeCashFlowBalanceTotals"
list-name="cashFlowBalanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="totalName" value="${groovy:
uiLabelMap.get(totalName)}"/>
@@ -750,7 +750,7 @@ under the License.
<field name="totalName" title-area-style="tableheadwide"><display
description="${totalName}"/></field>
<field name="balance1" title="Period1"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
<field name="balance2" title="Period2"
widget-style="tabletextright"><display type="currency"
currency="${currencyUomId}"/></field>
- </form>
+ </grid>
<!-- This is required to render the date range in the PDF: the two columns
layout is not supported -->
<form name="ComparativeCashFlowStatementParametersOneColumn" type="single"
target="" header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
diff --git a/applications/accounting/widget/ReportFinancialSummaryScreens.xml
b/applications/accounting/widget/ReportFinancialSummaryScreens.xml
index f34caba..6242ca1 100644
--- a/applications/accounting/widget/ReportFinancialSummaryScreens.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryScreens.xml
@@ -248,7 +248,7 @@ under the License.
<parameter
param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
<parameter
param-name="organizationPartyId"
value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</link>
- <include-form name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container style="h3">
<label
text="${uiLabelMap.AccountingDebitFlag}: ${postedDebitsTotal}"/>
</container>
@@ -283,7 +283,7 @@ under the License.
</actions>
<widgets>
<container>
- <include-form name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</widgets>
</section>
@@ -316,7 +316,7 @@ under the License.
<label
text="${uiLabelMap.AccountingConsolidatedDataFromDivisions}"/>
</container>
<include-form
name="TrialBalanceFinancialTimePeriodSelection"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <include-form name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="TrialBalanceReport"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container style="h3">
<label text="${uiLabelMap.AccountingDebitFlag}:
${postedDebitsTotal}"/>
</container>
@@ -363,13 +363,13 @@ under the License.
</link>
<screenlet
title="${uiLabelMap.AccountingBalanceSheet}">
<label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -397,13 +397,13 @@ under the License.
<label style="h1"
text="${uiLabelMap.AccountingBalanceSheet}"/>
<include-form name="BalanceSheetParameters"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -426,11 +426,11 @@ under the License.
</actions>
<widgets>
<label style="h3" text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -507,13 +507,13 @@ under the License.
</link>
<screenlet
title="${uiLabelMap.AccountingComparativeBalanceSheet}">
<label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="ComparativeBalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form
name="ComparativeBalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeBalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
- <include-form
name="ComparativeBalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeBalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -579,13 +579,13 @@ under the License.
<label style="h1"
text="${uiLabelMap.AccountingComparativeBalanceSheet}"/>
<include-form
name="ComparativeBalanceSheetParametersOneColumn"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingAssets}"/>
- <include-form
name="ComparativeBalanceSheetAssetsPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeBalanceSheetAssetsPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form
name="ComparativeBalanceSheetLiabilitiesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeBalanceSheetLiabilitiesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingEquities}"/>
- <include-form
name="ComparativeBalanceSheetEquitiesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeBalanceSheetEquitiesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -645,13 +645,13 @@ under the License.
</actions>
<widgets>
<label style="h3" text="${uiLabelMap.AccountingAssets}"/>
- <include-form name="ComparativeBalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceSheetAssets"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="ComparativeBalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceSheetLiabilities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="ComparativeBalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceSheetEquities"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
- <include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -709,13 +709,13 @@ under the License.
<parameter
param-name="organizationPartyId"/>
</link>
<screenlet
title="${uiLabelMap.AccountingPostedTransactionTotals}">
- <include-form
name="PostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="PostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.AccountingUnPostedTransactionTotals}">
- <include-form
name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}">
- <include-form
name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -752,11 +752,11 @@ under the License.
<container>
<include-form name="FindTransactionTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label
text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
- <include-form name="PostedTransactionTotalListPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="PostedTransactionTotalListPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label
text="${uiLabelMap.AccountingUnPostedTransactionTotals}"/>
- <include-form name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label
text="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}"/>
- <include-form
name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -787,11 +787,11 @@ under the License.
</actions>
<widgets>
<label text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
- <include-form name="PostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="PostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
- <include-form name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
- <include-form name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -838,13 +838,13 @@ under the License.
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
</link>
<label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
- <include-form name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
- <include-form name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
- <include-form name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -869,13 +869,13 @@ under the License.
<label style="h1"
text="${uiLabelMap.AccountingIncomeStatement}"/>
<include-form name="FindTransactionTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
- <include-form name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
- <include-form name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
- <include-form name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -900,13 +900,13 @@ under the License.
</actions>
<widgets>
<label style="h3" text="${uiLabelMap.AccountingRevenues}"/>
- <include-form name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingExpenses}"/>
- <include-form name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingIncome}"/>
- <include-form name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="IncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
- <include-form name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="BalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -998,13 +998,13 @@ under the License.
<parameter param-name="currencyUomId"/>
</link>
<label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
- <include-form
name="ComparativeIncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
- <include-form
name="ComparativeIncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
- <include-form
name="ComparativeIncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -1078,11 +1078,11 @@ under the License.
<label style="h1"
text="${uiLabelMap.AccountingComparativeIncomeStatement}"/>
<include-form
name="ComparativeIncomeStatementParametersOneColumn"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingRevenues}"/>
- <include-form
name="ComparativeIncomeStatementRevenuesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementRevenuesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingExpenses}"/>
- <include-form
name="ComparativeIncomeStatementExpensesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementExpensesPdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingIncome}"/>
- <include-form
name="ComparativeIncomeStatementIncomePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeIncomeStatementIncomePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
<include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
@@ -1154,11 +1154,11 @@ under the License.
</actions>
<widgets>
<label style="h3" text="${uiLabelMap.AccountingRevenues}"/>
- <include-form name="ComparativeIncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeIncomeStatementRevenues"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingExpenses}"/>
- <include-form name="ComparativeIncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeIncomeStatementExpenses"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingIncome}"/>
- <include-form name="ComparativeIncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeIncomeStatementIncome"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
<include-form name="ComparativeBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
@@ -1346,7 +1346,7 @@ under the License.
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
</link>
<screenlet
title="${uiLabelMap.AccountingInventoryValuationList}">
- <include-form
name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -1370,7 +1370,7 @@ under the License.
<decorator-section name="body">
<container>
<label style="h1"
text="${uiLabelMap.AccountingInventoryValuation}"/>
- <include-form name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -1387,7 +1387,7 @@ under the License.
</actions>
<widgets>
<container>
- <include-form name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="InventoryValuationList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</widgets>
</section>
@@ -1435,13 +1435,13 @@ under the License.
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
</link>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form
name="CashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form
name="CashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form
name="CashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -1463,15 +1463,15 @@ under the License.
<decorator-section name="body">
<container>
<label style="h1"
text="${uiLabelMap.AccountingCashFlowStatement}"/>
- <include-form name="FindCashFlowTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="FindCashFlowTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form
name="CashFlowStatementOpeningCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementOpeningCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form
name="CashFlowStatementPeriodCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementPeriodCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form
name="CashFlowStatementClosingCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="CashFlowStatementClosingCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -1490,13 +1490,13 @@ under the License.
</actions>
<widgets>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form name="CashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form name="CashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form name="CashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
- <include-form name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="CashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
@@ -1571,13 +1571,13 @@ under the License.
<parameter param-name="currencyUomId"/>
</link>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form
name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -1635,13 +1635,13 @@ under the License.
<label style="h1"
text="${uiLabelMap.AccountingComparativeCashFlowStatement}"/>
<include-form
name="ComparativeCashFlowStatementParametersOneColumn"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementOpeningCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementOpeningCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementPeriodCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementPeriodCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementClosingCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementClosingCashBalancePdf"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.CommonTotal}"/>
- <include-form
name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -1694,13 +1694,13 @@ under the License.
</actions>
<widgets>
<label style="h3"
text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementOpeningCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementPeriodCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3"
text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form
name="ComparativeCashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid
name="ComparativeCashFlowStatementClosingCashBalance"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
- <include-form name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-grid name="ComparativeCashFlowBalanceTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</screen>
