You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2016/02/20 10:05:08 UTC
svn commit: r1731348 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/reports/ widget/
Author: hansbak
Date: Sat Feb 20 09:05:08 2016
New Revision: 1731348
URL: http://svn.apache.org/viewvc?rev=1731348&view=rev
Log:
https://issues.apache.org/jira/browse/OFBIZ-6802 : corrective patch for xml and pdf error
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=1731348&r1=1731347&r2=1731348&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Sat Feb 20 09:05:08 2016
@@ -30,7 +30,7 @@ under the License.
<fo:block text-align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block>
<#if acctgTransEntryList?has_content>
<fo:block>${uiLabelMap.AccountingAcctgTransEntriesFor}
- <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!>
+ <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : parameters.get('ApplicationDecorator|organizationPartyId')}, false))!>
<#if partyName.partyTypeId == "PERSON">
${(partyName.firstName)!} ${(partyName.lastName)!}
<#elseif (partyName.partyTypeId)! == "PARTY_GROUP">
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1731348&r1=1731347&r2=1731348&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sat Feb 20 09:05:08 2016
@@ -100,6 +100,9 @@ under the License.
<field name="productId"><display-entity entity-name="Product"/></field>
<field name="externalId"><display/></field>
</form>
+ <form name="ListGlAccountPdf" extends="ListGlAccount">
+ <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext"><display/></field>
+ </form>
<form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount"
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=1731348&r1=1731347&r2=1731348&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sat Feb 20 09:05:08 2016
@@ -254,7 +254,7 @@ under the License.
<widgets>
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
+ <include-form name="ListGlAccountPdf" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=1731348&r1=1731347&r2=1731348&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Feb 20 09:05:08 2016
@@ -187,6 +187,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeIncomeStatementExpenses" type="list" list-name="expenseAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -199,6 +202,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeIncomeStatementIncome" type="list" list-name="incomeAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -211,6 +217,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="BalanceSheetParameters" type="single" target="BalanceSheet"
header-row-style="header-row" default-table-style="basic-table">
@@ -321,6 +330,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeBalanceSheetLiabilities" type="list" list-name="liabilityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -333,6 +345,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeBalanceSheetEquities" type="list" list-name="equityAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -345,6 +360,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeBalanceTotals" type="list" list-name="balanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
@@ -402,11 +420,16 @@ under the License.
<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">
+ <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">
+ <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">
+ <field name="accountCode"><display/></field>
</form>
<form name="IncomeStatementListCsv" type="list" list-name="glAccountIncomeList" view-size="99999">
@@ -586,6 +609,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="CashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -599,6 +625,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="CashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -610,6 +639,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="CashFlowBalanceTotals" type="list" list-name="cashFlowBalanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
@@ -666,6 +698,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeCashFlowStatementPeriodCashBalance" type="list" list-name="periodCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -682,6 +717,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeCashFlowStatementClosingCashBalance" type="list" list-name="closingCashBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -694,6 +732,9 @@ under the License.
<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">
+ <field name="accountCode"><display/></field>
+ </form>
<form name="ComparativeCashFlowBalanceTotals" type="list" list-name="cashFlowBalanceTotalList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1731348&r1=1731347&r2=1731348&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Sat Feb 20 09:05:08 2016
@@ -246,7 +246,7 @@ under the License.
</link>
<link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="TrialBalanceSearchResultsPdf.pdf" target-window="_BLANK">
<parameter param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
- <parameter param-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}">
+ <parameter param-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</link>
<include-form name="TrialBalanceReport" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<container style="h3">
@@ -299,7 +299,7 @@ under the License.
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId')}, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
<entity-condition entity-name="Party" list="parties">
<condition-expr field-name="partyId" operator="in" from-field="partyIds"/>
</entity-condition>
@@ -579,11 +579,11 @@ 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="ComparativeBalanceSheetAssets" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeBalanceSheetAssetsPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingLiabilities}"/>
- <include-form name="ComparativeBalanceSheetLiabilities" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeBalanceSheetLiabilitiesPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingEquities}"/>
- <include-form name="ComparativeBalanceSheetEquities" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeBalanceSheetEquitiesPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
<include-form name="ComparativeBalanceTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
@@ -752,7 +752,7 @@ under the License.
<container>
<include-form name="FindTransactionTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label text="${uiLabelMap.AccountingPostedTransactionTotals}"/>
- <include-form name="PostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="PostedTransactionTotalListPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label text="${uiLabelMap.AccountingUnPostedTransactionTotals}"/>
<include-form name="UnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label text="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}"/>
@@ -776,7 +776,7 @@ under the License.
<set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, parameters.get('ApplicationDecorator|organizationPartyId'), 'GROUP_ROLLUP')}" type="List"/>
<set field="partyIds[]" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
<service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true">
- <field-map field-name="organizationPartyId" value="parameters.get('ApplicationDecorator|organizationPartyId')"/>
+ <field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -1073,11 +1073,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="ComparativeIncomeStatementRevenues" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeIncomeStatementRevenuesPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingExpenses}"/>
- <include-form name="ComparativeIncomeStatementExpenses" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeIncomeStatementExpensesPdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingIncome}"/>
- <include-form name="ComparativeIncomeStatementIncome" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form 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>
@@ -1459,11 +1459,11 @@ under the License.
<label style="h1" text="${uiLabelMap.AccountingCashFlowStatement}"/>
<include-form name="FindCashFlowTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingOpeningCashBalance}"/>
- <include-form name="CashFlowStatementOpeningCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="CashFlowStatementOpeningCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form name="CashFlowStatementPeriodCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="CashFlowStatementPeriodCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form name="CashFlowStatementClosingCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="CashFlowStatementClosingCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
<include-form name="CashFlowBalanceTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>
@@ -1629,11 +1629,11 @@ 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="ComparativeCashFlowStatementOpeningCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeCashFlowStatementOpeningCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingPeriodCashBalance}"/>
- <include-form name="ComparativeCashFlowStatementPeriodCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeCashFlowStatementPeriodCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.AccountingClosingCashBalance}"/>
- <include-form name="ComparativeCashFlowStatementClosingCashBalance" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <include-form name="ComparativeCashFlowStatementClosingCashBalancePdf" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<label style="h3" text="${uiLabelMap.CommonTotal}"/>
<include-form name="ComparativeCashFlowBalanceTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</container>