Author: jleroux
Date: Wed Jan 26 11:56:46 2011
New Revision: 1063686
URL: http://svn.apache.org/viewvc?rev=1063686&view=rev
Log:
A patch from Pierre Smits "Accounting: PDF rendering in same browser window as
of OFBiz in stead of new windows"
(https://issues.apache.org/jira/browse/OFBIZ-4138) - OFBIZ-4138
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
Wed Jan 26 11:56:46 2011
@@ -232,7 +232,7 @@ function getFinAccountTransRunningTotalA
jQuery("#togglePayment_${finAccountTrans.finAccountTransId}").click(function(){jQuery("#displayPayments_${finAccountTrans.finAccountTransId}").dialog("open")});
});
</script>
- <a
href="<@ofbizUrl>DepositSlip.pdf?finAccountTransId=${finAccountTrans.finAccountTransId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.AccountingDepositSlip}</a>
+ <a
href="<@ofbizUrl>DepositSlip.pdf?finAccountTransId=${finAccountTrans.finAccountTransId}</@ofbizUrl>"
target="_BLANK" class="buttontext">${uiLabelMap.AccountingDepositSlip}</a>
<#else>
${finAccountTrans.finAccountTransId}
</#if>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
Wed Jan 26 11:56:46 2011
@@ -21,7 +21,7 @@ under the License.
<div>
<form name="glAccountTrialBalanceReport"
id="glAccountTrialBalanceReport">
<div>
- <a
href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
+ <a
href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>"
target="_BLANK" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
</div>
<h3>${uiLabelMap.AccountingSubsidiaryLedger}</h3>
<h3>${uiLabelMap.FormFieldTitle_companyName} :
${(currentOrganization.groupName)!}</h3>
Modified:
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
(original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
Wed Jan 26 11:56:46 2011
@@ -19,7 +19,7 @@ under the License.
<#if commissionReportList?has_content>
<div>
- <a
href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>"
class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
+ <a
href="<@ofbizUrl>CommissionReport.pdf?isSearch=Y&productId=${parameters.productId!}&partyId=${parameters.partyId!}&fromDate=${parameters.fromDate!}&thruDate=${parameters.thruDate!}</@ofbizUrl>"
target="_BLANK" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
</div>
<table class="basic-table hover-bar" cellspacing="0">
<#-- Header Begins -->
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Wed Jan 26
11:56:46 2011
@@ -468,7 +468,7 @@ under the License.
<if-compare field="payment.statusId" operator="equals"
value="PMNT_NOT_PAID"/>
</and>
</condition>
- <link target="printChecks.pdf">
+ <link target="printChecks.pdf" target-window="_BLANK">
<parameter param-name="paymentId"
from-field="payment.paymentId"/>
</link>
</menu-item>
@@ -538,7 +538,7 @@ under the License.
<not><if-empty field="paymentGroupMembers"/></not>
</and>
</condition>
- <link target="DepositSlip.pdf">
+ <link target="DepositSlip.pdf" target-window="_BLANK">
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
</link>
</menu-item>
@@ -550,7 +550,7 @@ under the License.
<not><if-empty field="paymentGroupMembers"/></not>
</and>
</condition>
- <link target="printChecks.pdf">
+ <link target="printChecks.pdf" target-window="_BLANK">
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
</link>
</menu-item>
@@ -723,7 +723,7 @@ under the License.
</link>
</menu-item>
<menu-item name="acctgTransDetailReportPdf">
- <link text="${uiLabelMap.CommonPdf}" style="buttontext"
target="acctgTransDetailReportPdf.pdf">
+ <link text="${uiLabelMap.CommonPdf}" style="buttontext"
target="acctgTransDetailReportPdf.pdf" target-window="_BLANK">
<parameter param-name="acctgTransId"/>
</link>
</menu-item>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Wed Jan 26
11:56:46 2011
@@ -358,7 +358,7 @@ under the License.
</condition>
<widgets>
<container style="button-bar">
- <link target="DepositSlip.pdf"
text="${uiLabelMap.AccountingPrintDepositSlip}" style="buttontext">
+ <link target="DepositSlip.pdf"
target-window="_BLANK" text="${uiLabelMap.AccountingPrintDepositSlip}"
style="buttontext">
<parameter
param-name="paymentGroupId"/>
</link>
</container>
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Wed Jan 26 11:56:46
2011
@@ -140,7 +140,7 @@ under the License.
</hyperlink>
</field>
<field name="createTransactionDetailReportPDF"
title="${uiLabelMap.CommonEmptyHeader}" use-when="${isPosted=='Y'}"
widget-style="buttontext">
- <hyperlink target="acctgTransDetailReportPdf.pdf"
description="${uiLabelMap.AccountingInvoicePDF}">
+ <hyperlink target="acctgTransDetailReportPdf.pdf"
target-window="_BLANK" description="${uiLabelMap.AccountingInvoicePDF}">
<parameter param-name="acctgTransId"/>
</hyperlink>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Wed Jan 26
11:56:46 2011
@@ -114,7 +114,7 @@ under the License.
<parameter param-name="fromDate"
from-field="parameters.fromDate"/>
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
</link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransSearchResultPdf.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransSearchResultPdf.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="acctgTransId"
from-field="parameters.acctgTransId"/>
<parameter param-name="produtId"
from-field="parameters.produtId"/>
@@ -178,7 +178,7 @@ under the License.
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
<parameter param-name="paymentId"
from-field="parameters.paymentId"/>
</link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPdf.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPdf.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="produtId"
from-field="parameters.produtId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
@@ -195,7 +195,7 @@ under the License.
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
<parameter param-name="paymentId"
from-field="parameters.paymentId"/>
</link>
- <link
text="${uiLabelMap.AccountingExportWithInvoiceAndPaymentAsPdf}"
style="buttontext"
target="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf">
+ <link
text="${uiLabelMap.AccountingExportWithInvoiceAndPaymentAsPdf}"
style="buttontext"
target="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf"
target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="produtId"
from-field="parameters.produtId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
@@ -242,7 +242,7 @@ under the License.
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
<parameter param-name="paymentId"
from-field="parameters.paymentId"/>
</link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPDF.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="AcctgTransEntriesSearchResultsPDF.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId"/>
<parameter param-name="produtId"
from-field="parameters.produtId"/>
<parameter param-name="isPosted"
from-field="parameters.isPosted"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Jan 26
11:56:46 2011
@@ -95,7 +95,7 @@ under the License.
<link text="${uiLabelMap.AccountingExportAsCsv}"
style="button" target="ListGlAccountOrgCsv.csv">
<parameter param-name="organizationPartyId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ListGlAccountOrgPdf.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ListGlAccountOrgPdf.pdf" target-window="_BLANK">
<parameter param-name="organizationPartyId"/>
</link>
<include-form name="ListGlAccountOrganization"
location="component://accounting/widget/GlSetupForms.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Wed Jan 26
11:56:46 2011
@@ -47,12 +47,12 @@ under the License.
<field name="paymentGroupTypeId"
title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity
entity-name="PaymentGroupType"/></field>
<field name="paymentGroupName"><display
description="${paymentGroupName}"/></field>
<field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}
@and
${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="DepositSlip.pdf"
description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink target="DepositSlip.pdf" target-window="_BLANK"
description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
<field name="printCheck" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and
${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="printChecks.pdf"
description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <hyperlink target="printChecks.pdf" target-window="_BLANK"
description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1063686&r1=1063685&r2=1063686&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Wed Jan 26 11:56:46 2011
@@ -254,7 +254,7 @@ under the License.
<parameter
param-name="organizationPartyId" from-field="organizationPartyId"/>
<parameter
param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
</link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="TrialBalanceSearchResultsPdf.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext"
target="TrialBalanceSearchResultsPdf.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId" from-field="organizationPartyId"/>
<parameter
param-name="customTimePeriodId" from-field="parameters.customTimePeriodId"/>
</link>
@@ -387,7 +387,7 @@ under the License.
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="BalanceSheet.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="BalanceSheet.pdf" target-window="_BLANK">
<parameter param-name="organizationPartyId"/>
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
@@ -532,7 +532,7 @@ under the License.
<parameter param-name="period2ThruDate"/>
<parameter param-name="period2GlFiscalTypeId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeBalanceSheet.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeBalanceSheet.pdf" target-window="_BLANK">
<parameter param-name="organizationPartyId"/>
<parameter param-name="period1ThruDate"/>
<parameter param-name="period1GlFiscalTypeId"/>
@@ -737,7 +737,7 @@ under the License.
<parameter param-name="glFiscalTypeId"/>
<parameter
param-name="organizationPartyId"/>
</link>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="TransactionTotalsPdf.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="TransactionTotalsPdf.pdf" target-window="_BLANK">
<parameter param-name="fromDate"/>
<parameter param-name="thruDate"/>
<parameter param-name="glFiscalTypeId"/>
@@ -865,7 +865,7 @@ under the License.
<parameter param-name="organizationPartyId"
from-field="parameters.organizationPartyId"/>
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="IncomeStatementListPdf.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="IncomeStatementListPdf.pdf" target-window="_BLANK">
<parameter param-name="fromDate"
from-field="fromDate"/>
<parameter param-name="thruDate"
from-field="thruDate"/>
<parameter param-name="organizationPartyId"
from-field="parameters.organizationPartyId"/>
@@ -1019,7 +1019,7 @@ under the License.
<parameter param-name="organizationPartyId"/>
<parameter param-name="currencyUomId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeIncomeStatements.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeIncomeStatements.pdf" target-window="_BLANK">
<parameter param-name="period1FromDate"
from-field="period1FromDate"/>
<parameter param-name="period1ThruDate"
from-field="period1ThruDate"/>
<parameter param-name="period1GlFiscalTypeId"
from-field="period1GlFiscalTypeId"/>
@@ -1299,7 +1299,7 @@ under the License.
</and>
</condition>
<widgets>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="GlAccountBalanceByCostCenter.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="GlAccountBalanceByCostCenter.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
<parameter param-name="fromDate"
from-field="parameters.fromDate"/>
<parameter param-name="thruDate"
from-field="parameters.thruDate"/>
@@ -1368,7 +1368,7 @@ under the License.
<if-compare
field="parameters.showSearchResults" operator="equals" value="Y"/>
</condition>
<widgets>
- <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="InventoryValuation.pdf">
+ <link
text="${uiLabelMap.AccountingExportAsPdf}" style="button"
target="InventoryValuation.pdf" target-window="_BLANK">
<parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
<parameter param-name="facilityId"
from-field="parameters.facilityId"/>
<parameter param-name="productId"
from-field="parameters.productId"/>
@@ -1464,7 +1464,7 @@ under the License.
<parameter param-name="organizationPartyId"
from-field="organizationPartyId"/>
<parameter param-name="glFiscalTypeId"
from-field="glFiscalTypeId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="CashFlowStatementListPdf.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="CashFlowStatementListPdf.pdf" target-window="_BLANK">
<parameter param-name="fromDate"
from-field="fromDate"/>
<parameter param-name="thruDate"
from-field="thruDate"/>
<parameter param-name="organizationPartyId"
from-field="organizationPartyId"/>
@@ -1599,7 +1599,7 @@ under the License.
<parameter param-name="organizationPartyId"/>
<parameter param-name="currencyUomId"/>
</link>
- <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeCashFlowStatement.pdf">
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ComparativeCashFlowStatement.pdf" target-window="_BLANK">
<parameter param-name="period1FromDate"
from-field="period1FromDate"/>
<parameter param-name="period1ThruDate"
from-field="period1ThruDate"/>
<parameter param-name="period1GlFiscalTypeId"
from-field="period1GlFiscalTypeId"/>
