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 2010/10/01 12:40:39 UTC
svn commit: r1003469 [1/7] - in /ofbiz/trunk/applications/accounting:
config/ webapp/accounting/WEB-INF/
webapp/accounting/WEB-INF/actions/reports/ webapp/accounting/reports/ widget/
Author: hansbak
Date: Fri Oct 1 10:40:38 2010
New Revision: 1003469
URL: http://svn.apache.org/viewvc?rev=1003469&view=rev
Log:
1. add “Acctg Trans Entries PDF” menu item to “InvoiceSubTabBar”
2. add “Export with Invoice and Payment as PDF” into “FindAcctgTransEntries” screen
3. add these properties to AccountingUiLabels.xml
- AccountingCostOfGoodsSold = Cost Of Good Sold
- AccountingGrossMargin = Gross Margin
- AccountingOperatingExpenses = Operating Expenses
- AccountingDepreciation = Depreciation
- AccountingIncomeFromOperations = Income From Operations
- AccountingCurrentAssets = Current Assets
- AccountingLongTermAssets = Long Term Assets
- AccountingTotalAccumulatedDepreciation = Total Accumulated Depreciation
- AccountingTotalAssets = Total Assets
- AccountingCurrentLiabilities = Current Liabilities
- AccountingTotalLiabilitiesAndEquities = Total Liabilities and Equities
- AccountingExportWithInvoiceAndPaymentAsPdf = Export with Invoice and Payment as PDF
4. change balance sheet PDF report to using BIRT (re-arrange header fields and make report easier to be changed later)
5. change trial balance PDF report to using BIRT (re-arrange header fields and make report easier to be changed later)
6. change income statement PDF report to using BIRT (re-arrange header fields and make report easier to be changed later)
7. add new PDF report to show acctg trans entry of invoice (refer from “Acctg Trans Entries PDF” menu item)
8. add new PDF report to show acctg trans entry of payment (refer from “Acctg Trans Entries PDF” menu item)
9. add new PDF report to show search result of acctg trans entries (show only invoice ID and payment ID columns)
Added:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1003469&r1=1003468&r2=1003469&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Oct 1 10:40:38 2010
@@ -3319,6 +3319,9 @@
<value xml:lang="en">Export as PDF</value>
<value xml:lang="hi_IN">पà¥à¤¡à¥à¤à¤« à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤°à¥ निरà¥à¤¯à¤¾à¤¤</value>
</property>
+ <property key="AccountingExportWithInvoiceAndPaymentAsPdf">
+ <value xml:lang="en">Export with Invoice and Payment as PDF</value>
+ </property>
<property key="AccountingExternalAccountId">
<value xml:lang="ar">دÙÙÙ Øساب Ù
Øاسب٠خارجÙ</value>
<value xml:lang="de">Externe Konten-Nr.</value>
@@ -9118,6 +9121,39 @@
<value xml:lang="en">Total Quantity On Hand</value>
<value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाथ पर</value>
</property>
+ <property key="AccountingCostOfGoodsSold">
+ <value xml:lang="en">Cost Of Good Sold</value>
+ </property>
+ <property key="AccountingGrossMargin">
+ <value xml:lang="en">Gross Margin</value>
+ </property>
+ <property key="AccountingOperatingExpenses">
+ <value xml:lang="en">Operating Expenses</value>
+ </property>
+ <property key="AccountingDepreciation">
+ <value xml:lang="en">Depreciation</value>
+ </property>
+ <property key="AccountingIncomeFromOperations">
+ <value xml:lang="en">Income From Operations</value>
+ </property>
+ <property key="AccountingCurrentAssets">
+ <value xml:lang="en">Current Assets</value>
+ </property>
+ <property key="AccountingLongTermAssets">
+ <value xml:lang="en">Long Term Assets</value>
+ </property>
+ <property key="AccountingTotalAccumulatedDepreciation">
+ <value xml:lang="en">Total Accumulated Depreciation</value>
+ </property>
+ <property key="AccountingTotalAssets">
+ <value xml:lang="en">Total Assets</value>
+ </property>
+ <property key="AccountingCurrentLiabilities">
+ <value xml:lang="en">Current Liabilities</value>
+ </property>
+ <property key="AccountingTotalLiabilitiesAndEquities">
+ <value xml:lang="en">Total Liabilities and Equities</value>
+ </property>
<property key="AccountingTransactionIsAlreadyReconciled">
<value xml:lang="en">Transaction Is already Reconciled</value>
<value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पहलॠसॠहॠसमà¤à¥à¤¤à¤¾ हà¥</value>
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,48 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+def module = "AcctgTransEntriesSearchResultsParameters.groovy";
+
+try {
+ def birtParameters = [:];
+ birtParameters.organizationPartyId = parameters.organizationPartyId;
+ birtParameters.produtId = parameters.produtId;
+ birtParameters.isPosted = parameters.isPosted;
+ birtParameters.invoiceId = parameters.invoiceId;
+ birtParameters.acctgTransId = parameters.acctgTransId;
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
+ birtParameters.glAccountId = parameters.glAccountId;
+ birtParameters.shipmentId = parameters.shipmentId;
+ birtParameters.acctgTransTypeId = parameters.acctgTransTypeId;
+ birtParameters.workEffortId = parameters.workEffortId;
+ birtParameters.glJournalId = parameters.glJournalId;
+ birtParameters.partyId = parameters.partyId;
+ birtParameters.paymentId = parameters.paymentId;
+ if (parameters.fromDate) {
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ }
+ if (parameters.thruDate) {
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ }
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def module = "BalanceSheetParameters.groovy";
+
+try {
+ def birtParameters = [:];
+ if (parameters.fromDate) {
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ }
+ if (parameters.thruDate) {
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ }
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
+ birtParameters.organizationPartyId = parameters.organizationPartyId;
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def module = "IncomeStatementParameters.groovy";
+
+try {
+ def birtParameters = [:];
+ if (parameters.fromDate) {
+ birtParameters.fromDate = Timestamp.valueOf(parameters.fromDate);
+ }
+ if (parameters.thruDate) {
+ birtParameters.thruDate = Timestamp.valueOf(parameters.thruDate);
+ }
+ birtParameters.glFiscalTypeId = parameters.glFiscalTypeId;
+ birtParameters.organizationPartyId = parameters.organizationPartyId;
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def module = "InvoiceAcctgTransEntryParameters.groovy";
+
+try {
+ birtParameters = [:];
+ birtParameters.invoiceId = parameters.invoiceId;
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def module = "PaymentAcctgTransEntryParameters.groovy";
+
+try {
+ birtParameters = [:];
+ birtParameters.paymentId = parameters.paymentId;
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy?rev=1003469&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy (added)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy Fri Oct 1 10:40:38 2010
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def module = "TrialBalanceParameters.groovy";
+
+try {
+ def birtParameters = [:];
+ birtParameters.organizationPartyId = parameters.organizationPartyId;
+ birtParameters.customTimePeriodId = parameters.customTimePeriodId;
+ birtParameters.userLoginId = userLogin.userLoginId;
+ request.setAttribute("birtParameters", birtParameters);
+} catch (e) {
+ Debug.logError(e, module);
+}
+return "success";
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1003469&r1=1003468&r2=1003469&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Oct 1 10:40:38 2010
@@ -2156,6 +2156,11 @@ under the License.
<response name="success" type="view" value="paymentOverview"/>
<response name="error" type="view" value="paymentOverview"/>
</request-map>
+ <request-map uri="PaymentAcctgTransEntriesPdf">
+ <security https="true" auth="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy"/>
+ <response name="success" type="view" value="PaymentAcctgTransEntriesPdf"/>
+ </request-map>
<!-- ================ Entity Lookup Requests ================= -->
<request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
@@ -2201,6 +2206,12 @@ under the License.
<response name="success" type="view" value="PrintInvoices"/>
</request-map>
+ <request-map uri="InvoiceAcctgTransEntriesPdf">
+ <security https="true" auth="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/>
+ <response name="success" type="view" value="InvoiceAcctgTransEntriesPdf"/>
+ </request-map>
+
<!--Global GL Settings -->
<request-map uri="globalGLSettings">
<security auth="true" https="true"/>
@@ -2370,6 +2381,12 @@ under the License.
<response name="success" type="view" value="AcctgTransEntriesSearchResultsPdf"/>
</request-map>
+ <request-map uri="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf">
+ <security auth="true" https="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy"/>
+ <response name="success" type="view" value="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf"/>
+ </request-map>
+
<request-map uri="AcctgTransSearchResultsCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="AcctgTransSearchResultsCsv"/>
@@ -2392,6 +2409,7 @@ under the License.
<request-map uri="IncomeStatementListPdf.pdf">
<security https="true" auth="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy"/>
<response name="success" type="view" value="IncomeStatementListPdf"/>
</request-map>
@@ -2407,11 +2425,13 @@ under the License.
<request-map uri="BalanceSheet.pdf">
<security auth="true" https="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy"/>
<response name="success" type="view" value="BalanceSheetPdf"/>
</request-map>
<request-map uri="TrialBalanceSearchResultsPdf.pdf">
<security https="true" auth="true"/>
+ <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy"/>
<response name="success" type="view" value="TrialBalanceSearchResultsPdf"/>
</request-map>
@@ -2587,6 +2607,7 @@ under the License.
<view-map name="PrintChecks" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#PrintChecks" content-type="application/pdf" encoding="none"/>
<view-map name="FindSalesInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindSalesInvoicesByDueDate"/>
<view-map name="FindPurchaseInvoicesByDueDate" type="screen" page="component://accounting/widget/PaymentScreens.xml#FindPurchaseInvoicesByDueDate"/>
+ <view-map name="PaymentAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
<!-- Payment Group -->
<view-map name="FindPaymentGroup" type="screen" page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/>
@@ -2788,22 +2809,23 @@ under the License.
<view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF" content-type="application/pdf" encoding="none"/>
<view-map name="PrintCheckPDF" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintCheckPDF" content-type="application/pdf" encoding="none"/>
<view-map name="PrintInvoices" type="screenfop" page="component://accounting/widget/AccountingPrintScreens.xml#PrintInvoices" content-type="application/pdf" encoding="none"/>
+ <view-map name="InvoiceAcctgTransEntriesPdf" type="birt" page="component://accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
<!-- Financial Summary Reports -->
<view-map name="FinancialSummaryReportOptions" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#FinancialSummaryReportOptions"/>
<view-map name="SalesInvoiceByProductCategorySummary" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#SalesInvoiceByProductCategorySummary"/>
<view-map name="TrialBalance" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalance"/>
- <view-map name="TrialBalanceSearchResultsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" content-type="application/pdf" encoding="none"/>
+ <view-map name="TrialBalanceSearchResultsPdf" type="birt" page="component://accounting/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="TrialBalanceSearchResultsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="IncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatement"/>
- <view-map name="IncomeStatementListPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListPdf" content-type="application/pdf" encoding="none"/>
+ <view-map name="IncomeStatementListPdf" type="birt" page="component://accounting/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="IncomeStatementListCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListCsv" content-type="text/csv" encoding="none"/>
<view-map name="ComparativeIncomeStatement" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatement"/>
<view-map name="ComparativeIncomeStatementsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsPdf" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeIncomeStatementsCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeIncomeStatementsCsv" content-type="text/csv" encoding="none"/>
<view-map name="BalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheet"/>
<view-map name="BalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetCsv" content-type="text/csv" encoding="none"/>
- <view-map name="BalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf" encoding="none"/>
+ <view-map name="BalanceSheetPdf" type="birt" page="component://accounting/webapp/accounting/reports/BalanceSheet.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeBalanceSheet" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheet"/>
<view-map name="ComparativeBalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetPdf" content-type="application/pdf" encoding="none"/>
<view-map name="ComparativeBalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#ComparativeBalanceSheetCsv" content-type="text/csv" encoding="none"/>
@@ -2842,6 +2864,7 @@ under the License.
<view-map name="FixedAssetGeoLocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/>
<view-map name="AcctgTransEntriesSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf" content-type="application/pdf" encoding="none"/>
+ <view-map name="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf" type="birt" page="component://accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign" content-type="application/pdf" encoding="none"/>
<view-map name="AcctgTransSearchResultsCsv" type="screencsv" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultsCsv" content-type="text/csv" encoding="none"/>
<view-map name="AcctgTransSearchResultPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultPdf" content-type="application/pdf" encoding="none"/>