You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2012/07/13 11:48:36 UTC
svn commit: r1361130 [1/3] - in /ofbiz/trunk: ./
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/WEB-INF/actions/payment/
applications/accounting/webapp/accounting/WEB-INF/actions/reports/
applications/accou...
Author: jacopoc
Date: Fri Jul 13 09:48:32 2012
New Revision: 1361130
URL: http://svn.apache.org/viewvc?rev=1361130&view=rev
Log:
Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as well.
Added:
ofbiz/trunk/specialpurpose/birt/
- copied from r1360638, ofbiz/trunk/framework/birt/
ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
ofbiz/trunk/specialpurpose/birt/webapp/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy (props changed)
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/birt/
- copied from r1360745, ofbiz/trunk/specialpurpose/example/webapp/birt/
ofbiz/trunk/specialpurpose/birt/webapp/facility/
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
- copied unchanged from r1360638, ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
- copied unchanged from r1360638, ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/
ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/
ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign
- copied unchanged from r1360638, ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy (props changed)
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy (props changed)
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderByReferrer.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign
- copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign
ofbiz/trunk/specialpurpose/birt/widget/
ofbiz/trunk/specialpurpose/birt/widget/accounting/
ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml
ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml
ofbiz/trunk/specialpurpose/birt/widget/birt/
ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml
- copied, changed from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml
ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml
ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml
- copied, changed from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml
ofbiz/trunk/specialpurpose/birt/widget/facility/
ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml
ofbiz/trunk/specialpurpose/birt/widget/order/
ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
Removed:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy
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/payment/report/
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
ofbiz/trunk/applications/content/data/BirtHelpData.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderByReferrer.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/trunk/applications/product/webapp/facility/inventory/report/
ofbiz/trunk/framework/birt/
ofbiz/trunk/specialpurpose/example/webapp/birt/
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/birt.tld
ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml
ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
ofbiz/trunk/applications/content/ofbiz-component.xml
ofbiz/trunk/applications/order/data/OrderPortletData.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
ofbiz/trunk/build.xml
ofbiz/trunk/framework/build.xml
ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/trunk/framework/component-load.xml
ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
ofbiz/trunk/specialpurpose/birt/build.xml
ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml
ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl
ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl
ofbiz/trunk/specialpurpose/build.xml
ofbiz/trunk/specialpurpose/component-load.xml
ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Fri Jul 13 09:48:32 2012
@@ -105,8 +105,8 @@
<classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
- <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar"/>
@@ -176,7 +176,7 @@
<classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
<classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
<classpathentry kind="src" path="framework/bi/src"/>
- <classpathentry kind="src" path="framework/birt/src"/>
+ <classpathentry kind="src" path="specialpurpose/birt/src"/>
<classpathentry kind="src" path="framework/catalina/src"/>
<classpathentry kind="src" path="framework/common/src"/>
<classpathentry kind="src" path="framework/datafile/src"/>
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Fri Jul 13 09:48:32 2012
@@ -2252,37 +2252,37 @@ questions or comments regarding the usag
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
Eclipse Public License - v 1.0:
-ofbiz/trunk/framework/birt/lib/flute.jar
-ofbiz/trunk/framework/birt/lib/jaxrpc.jar
-ofbiz/trunk/framework/birt/lib/js.jar
-ofbiz/trunk/framework/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
-ofbiz/trunk/framework/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
-ofbiz/trunk/framework/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
-ofbiz/trunk/framework/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
-ofbiz/trunk/framework/birt/lib/saaj.jar
-ofbiz/trunk/framework/birt/lib/Tidy.jar
-ofbiz/trunk/framework/birt/lib/viewservlets.jar
+ofbiz/trunk/specialpurpose/birt/lib/flute.jar
+ofbiz/trunk/specialpurpose/birt/lib/jaxrpc.jar
+ofbiz/trunk/specialpurpose/birt/lib/js.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
+ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
+ofbiz/trunk/specialpurpose/birt/lib/saaj.jar
+ofbiz/trunk/specialpurpose/birt/lib/Tidy.jar
+ofbiz/trunk/specialpurpose/birt/lib/viewservlets.jar
ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.jar
ofbiz/trunk/framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar
ofbiz/trunk/framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar
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=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -2169,11 +2169,6 @@ 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>
@@ -2219,12 +2214,6 @@ 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"/>
@@ -2242,6 +2231,7 @@ under the License.
<response name="error" type="view" value="ComparativeIncomeStatement"/>
</request-map>
<request-map uri="BalanceSheet"><security https="true" auth="true"/><response name="success" type="view" value="BalanceSheet"/></request-map>
+ <request-map uri="BalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view" value="BalanceSheetPdf"/></request-map>
<request-map uri="ComparativeBalanceSheet"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheet"/></request-map>
<request-map uri="ComparativeBalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheetPdf"/></request-map>
<request-map uri="ComparativeBalanceSheet.csv"><security https="true" auth="true"/><response name="success" type="view" value="ComparativeBalanceSheetCsv"/></request-map>
@@ -2394,12 +2384,6 @@ 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"/>
@@ -2422,10 +2406,8 @@ 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>
-
<request-map uri="IncomeStatementListCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="IncomeStatementListCsv"/>
@@ -2436,18 +2418,10 @@ under the License.
<response name="success" type="view" value="BalanceSheetCsv"/>
</request-map>
- <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>
-
<request-map uri="TrialBalanceSearchResultsCsv.csv">
<security https="true" auth="true"/>
<response name="success" type="view" value="TrialBalanceSearchResultsCsv"/>
@@ -2562,21 +2536,6 @@ under the License.
</request-map>
<!-- Reports -->
- <request-map uri="paymentReport">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="paymentReport"/>
- </request-map>
- <request-map uri="paymentReportHtml">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
- <response name="success" type="view" value="ViewPaymentReportHtml"/>
- </request-map>
- <request-map uri="paymentReportPdf">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
- <response name="success" type="view" value="ViewPaymentReportPdf"/>
- </request-map>
-
<request-map uri="createWorkEffortAndPartyAssign">
<security https="true" auth="true"/>
<event type="service" invoke="createWorkEffortAndPartyAssign"/>
@@ -2626,7 +2585,6 @@ 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"/>
@@ -2828,23 +2786,22 @@ 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="birt" page="component://accounting/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/>
+ <view-map name="TrialBalanceSearchResultsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" 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="birt" page="component://accounting/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/>
+ <view-map name="IncomeStatementListPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListPdf" 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="BalanceSheetPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf" encoding="none"/>
<view-map name="BalanceSheetCsv" type="screencsv" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetCsv" content-type="text/csv" 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"/>
@@ -2883,7 +2840,6 @@ 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"/>
@@ -2898,11 +2854,6 @@ under the License.
<view-map name="GlAccountBalanceByCostCenter" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenter"/>
<view-map name="GlAccountBalanceByCostCenterPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenterPdf" content-type="application/pdf" encoding="none"/>
- <view-map name="paymentReport" type="screen" page="component://accounting/widget/PaymentScreens.xml#PaymentReport"/>
- <view-map name="ViewPaymentReportHtml" type="birt" page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="text/html"/>
- <view-map name="ViewPaymentReportPdf" type="birt" page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="application/pdf"/>
-
-
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jul 13 09:48:32 2012
@@ -398,9 +398,6 @@ under the License.
<parameter param-name="paymentId" from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
- <link target="paymentReport"/>
- </menu-item>
</menu>
<menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Fri Jul 13 09:48:32 2012
@@ -575,17 +575,4 @@ under the License.
<field name="transactionDate" position="1"><display/></field>
<field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
</form>
- <form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments" extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK">
- <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
- <drop-down>
- <option key="paymentReportHtml" description="text/html"></option>
- <option key="paymentReportPdf" description="application/pdf"></option>
- <!--option key="application/vnd.ms-excel">application/vnd.ms-excel</option>
- <option key="application/vnd.ms-word">application/vnd.ms-word</option>
- <option key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
- </drop-down>
- </field>
- <field name="searchButton"><hidden/></field>
- <field name="report" title="Report" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jul 13 09:48:32 2012
@@ -555,25 +555,4 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="PaymentReport">
- <section>
- <actions>
- <set field="headerItem" value="payments"/>
- <set field="tabButtonItem" value="paymentReport"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
+++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml Fri Jul 13 09:48:32 2012
@@ -201,7 +201,6 @@ image=/boot/vmlinuzNew
<xi:include href="../../../framework/testtools/documents/TestTools.xml" />
<xi:include href="../../../framework/documents/UnitTest.xml" />
<xi:include href="../../../framework/documents/SingleSignOn.xml" />
- <xi:include href="../../../framework/birt/documents/Birt.xml"/>
<xi:include href="../../../framework/documents/DataFiles.xml"/>
<appendix>
Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Fri Jul 13 09:48:32 2012
@@ -45,7 +45,6 @@ under the License.
<!-- these files cannot be loaded in their original component because they are earlier than the content component -->
<entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Fri Jul 13 09:48:32 2012
@@ -115,78 +115,12 @@
description=""/>
<PortletPortletCategory portalPortletId="PurchByPaymMeth" portletCategoryId="REPORT"/>
<PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchByPaymMeth" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/>
-
<PortalPortlet portalPortletId="ListPurchaseOrders"
portletName="List Purchase Orders"
screenName="ListPurchaseOrders"
screenLocation="component://order/widget/ordermgr/OrderViewScreens.xml"
description="List Purchase Orders"/>
<PortletPortletCategory portalPortletId="ListPurchaseOrders" portletCategoryId="ORDERMGR"/>
-
- <PortalPortlet portalPortletId="OrderByReferrer"
- portletName="Sale Orders By Referrer Report"
- screenName="SaleOrdersByReferrerReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="OrderByReferrer" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
-
- <PortalPortlet portalPortletId="OrderByChannel"
- portletName="Sale Orders by Channel"
- screenName="SaleOrdersByChannelReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="OrderByChannel" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/>
-
- <PortalPortlet portalPortletId="OrderDiscountCode"
- portletName="Orders with discount code"
- screenName="SaleOrderDiscountCodeReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="OrderDiscountCode" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" sequenceNum="7"/>
-
- <PortalPortlet portalPortletId="Last3MSalesReport"
- portletName="Last 3 Months Sales Report"
- screenName="Last3MonthsSalesReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="Last3MSalesReport" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
-
- <PortalPortlet portalPortletId="CouponSalesReport"
- portletName="Coupon Sales Report"
- screenName="CouponSalesReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="CouponSalesReport" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="9"/>
-
- <PortalPortlet portalPortletId="SalesReport"
- portletName="Sales Report"
- screenName="SalesReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" sequenceNum="10"/>
-
- <PortalPortlet portalPortletId="NBO_Report"
- portletName="Net Before Overhead Report"
- screenName="NetBeforeOverheadReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="NBO_Report" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="NBO_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="11"/>
-
- <PortalPortlet portalPortletId="PDR_Report"
- portletName="Product Demand Report"
- screenName="ProductDemandReport"
- screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
- description=""/>
- <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
- <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
-
<PortletCategory portletCategoryId="CUST_ORDERS" description="Customer Orders"/>
<PortalPortlet portalPortletId="ListCustReturns"
portletName="Customer Returns"
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -1155,92 +1155,8 @@ under the License.
<request-map uri="PurchasesByOrganizationReport.pdf"><security https="true" auth="true"/>
<response name="success" type="view" value="PurchasesByOrganizationReport"/>
</request-map>
-
- <request-map uri="checkReportBy">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy"/>
- <response name="dayPDF" type="request" value="SalesReport.pdf"/>
- <response name="weekPDF" type="request" value="SalesReportWeek.pdf"/>
- <response name="monthPDF" type="request" value="SalesReportMonth.pdf"/>
- <response name="dayExcel" type="request" value="SalesReport.excel"/>
- <response name="weekExcel" type="request" value="SalesReportWeek.excel"/>
- <response name="monthExcel" type="request" value="SalesReportMonth.excel"/>
- <response name="dayHTML" type="request" value="SalesReport.html"/>
- <response name="weekHTML" type="request" value="SalesReportWeek.html"/>
- <response name="monthHTML" type="request" value="SalesReportMonth.html"/>
- <response name="error" type="request-redirect" value="OrderPurchaseReportOptions">
- <redirect-parameter name="fromDate"/>
- <redirect-parameter name="reportBy" from="parameters.reportDate"/>
- </response>
- </request-map>
- <request-map uri="SalesReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportPDF"/>
- </request-map>
- <request-map uri="SalesReportWeek.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportWeekPDF"/>
- </request-map>
- <request-map uri="SalesReportMonth.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportMonthPDF"/>
- </request-map>
- <request-map uri="SalesReport.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportExcel"/>
- </request-map>
- <request-map uri="SalesReportWeek.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportWeekExcel"/>
- </request-map>
- <request-map uri="SalesReportMonth.excel"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportMonthExcel"/>
- </request-map>
- <request-map uri="SalesReport.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportHTML"/>
- </request-map>
- <request-map uri="SalesReportWeek.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportWeekHTML"/>
- </request-map>
- <request-map uri="SalesReportMonth.html"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
- <response name="success" type="view" value="SalesOrderReportMonthHTML"/>
- </request-map>
- <request-map uri="NetBeforeOverheadReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy"/>
- <response name="success" type="view" value="NetBeforeOverheadOrderReport"/>
- </request-map>
- <request-map uri="ProductDemandReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy"/>
- <response name="success" type="view" value="ProductDemandOrderReport"/>
- </request-map>
- <request-map uri="ProductContributionReport.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductContributionReport.groovy"/>
- <response name="success" type="view" value="ProductDemandOrderReport"/>
- </request-map>
- <request-map uri="OrderByReferrer.pdf"><security https="true" auth="true"/>
- <response name="success" type="view" value="OrderByReferrerReport"/>
- </request-map>
- <request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy"/>
- <response name="success" type="view" value="OrdersByChannelReport"/>
- </request-map>
- <request-map uri="OrderDiscountCode.pdf">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="SaleOrderDiscountCodeReport"/>
- </request-map>
- <request-map uri="Last3MonthsSalesReport.pdf"><security https="true" auth="true"/>
- <response name="success" type="view" value="Last3MonthsSalesReport"/>
- </request-map>
- <request-map uri="CouponSalesReport.pdf"><security https="true" auth="true"/>
- <response name="success" type="view" value="CouponSalesReport"/>
- </request-map>
-
- <!-- Requirement request mappings -->
+ <!-- Requirement request mappings -->
<request-map uri="FindRequirements">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindRequirements"/>
@@ -2023,23 +1939,6 @@ under the License.
<view-map name="OpenOrderItemsReport" type="screen" page="component://order/widget/ordermgr/ReportScreens.xml#OpenOrderItemsReport"/>
<view-map name="PurchasesByOrganizationReport" type="screenfop" page="component://order/widget/ordermgr/ReportScreens.xml#PurchasesByOrganizationReport" content-type="application/pdf" encoding="none"/>
- <view-map name="SalesOrderReportPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/pdf"/>
- <view-map name="SalesOrderReportWeekPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/pdf"/>
- <view-map name="SalesOrderReportMonthPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/pdf"/>
- <view-map name="SalesOrderReportExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/vnd.ms-excel"/>
- <view-map name="SalesOrderReportWeekExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/vnd.ms-excel"/>
- <view-map name="SalesOrderReportMonthExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/vnd.ms-excel"/>
- <view-map name="SalesOrderReportHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="text/html"/>
- <view-map name="SalesOrderReportWeekHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="text/html"/>
- <view-map name="SalesOrderReportMonthHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/>
- <view-map name="NetBeforeOverheadOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/>
- <view-map name="ProductDemandOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/>
- <view-map name="OrderByReferrerReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderByReferrer.rptdesign" content-type="application/pdf"/>
- <view-map name="OrdersByChannelReport" type="birt" page="component://order/webapp/ordermgr/reports/OrdersByChannel.rptdesign" content-type="application/pdf"/>
- <view-map name="SaleOrderDiscountCodeReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/>
- <view-map name="Last3MonthsSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/>
- <view-map name="CouponSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/CouponSalesReport.rptdesign" content-type="application/pdf"/>
-
<view-map name="FindRequirements" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#FindRequirements"/>
<view-map name="EditRequirement" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirement"/>
<view-map name="ListRequirementCustRequests" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementCustRequests"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Fri Jul 13 09:48:32 2012
@@ -195,78 +195,4 @@ under the License.
<field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field>
<field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
- <!--New From-->
- <form name="SalesReport" type="single" target="checkReportBy" title=""
- header-row-style="header-row" default-table-style="basic-table">
- <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
- <field name="reportBy" title="Report By">
- <drop-down>
- <option key="day" description="Days"></option>
- <option key="week" description="Weeks"></option>
- <option key="month" description="Months"></option>
- </drop-down>
- </field>
- <field name="exportType" title="Format Type">
- <drop-down>
- <option key="pdf" description="PDF"></option>
- <option key="excel" description="Excel"></option>
- <option key="html" description="HTML"></option>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
-
- <form name="NetBeforeOverheadReport" type="single" target="NetBeforeOverheadReport.pdf" title=""
- header-row-style="header-row" default-table-style="basic-table">
- <field name="productStoreId">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
- <entity-order-by field-name="storeName"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
-
- <form name="ProductDemandReport" type="single" target="ProductDemandReport.pdf" title=""
- header-row-style="header-row" default-table-style="basic-table">
- <field name="productStoreId">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
- <entity-order-by field-name="storeName"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
-
- <form name="OrderByReferrer" type="single" target="OrderByReferrer.pdf" target-window="_BLANK">
- <!--field name="referrerUrl"><text-find default-option="contains"/></field-->
- <field name="referrerUrl" title=" "><display description="All Referrer"></display></field>
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
- </form>
- <form name="SaleOrdersByChannel" type="single" target="OrdersByChannel.pdf" target-window="_BLANK">
- <field name="saleChannel">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
- <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
- </form>
- <form name="SaleOrderDiscountCode" type="single" target="OrderDiscountCode.pdf" target-window="_BLANK">
- <field name="discountCodeUrl" title=" "><display description="All order items with discount code"></display></field>
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
- </form>
- <form name="Last3MonthsSalesReport" type="single" target="Last3MonthsSalesReport.pdf" target-window="_BLANK">
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
- </form>
- <form name="CouponSalesReport" type="single" target="CouponSalesReport.pdf" target-window="_BLANK">
- <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
- </form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Fri Jul 13 09:48:32 2012
@@ -107,46 +107,6 @@ under the License.
</widgets>
</section>
</screen>
-
- <!--New Screen-->
- <screen name="SalesReport">
- <section>
- <actions>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <screenlet title="Sales Report">
- <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
-
- <screen name="NetBeforeOverheadReport">
- <section>
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <screenlet title="Net Before Overhead Report">
- <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
-
- <screen name="ProductDemandReport">
- <section>
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <screenlet title="Product Demand Report">
- <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
<screen name="OrderPurchaseReportPayment">
<section>
@@ -331,93 +291,4 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="SalesOrderReport">
- <section>
- <actions>
- <entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList">
- <condition-list combine="and">
- <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/>
- <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/>
- </condition-list>
- </entity-condition>
- </actions>
- <widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
- </platform-specific>
- </widgets>
- </section>
- </screen>
-
- <screen name="NetBeforeOverheadOrderReport">
- <section>
- <widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
- </platform-specific>
- </widgets>
- </section>
- </screen>
-
- <screen name="ProductDemandOrderReport ">
- <section>
- <widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
- </platform-specific>
- </widgets>
- </section>
- </screen>
-
- <!-- Sale Order By Referrer -->
- <screen name="SaleOrdersByReferrerReport">
- <section>
- <widgets>
- <screenlet title="Sale Orders by Referrer Report">
- <include-form name="OrderByReferrer" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <!-- Sale Order By Channel -->
- <screen name="SaleOrdersByChannelReport">
- <section>
- <widgets>
- <screenlet title="Sale Orders By Channel Report">
- <include-form name="SaleOrdersByChannel" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <!-- Sale Order with Discount Code -->
- <screen name="SaleOrderDiscountCodeReport">
- <section>
- <widgets>
- <screenlet title="Sale Orders Discount Code Report">
- <include-form name="SaleOrderDiscountCode" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <!-- Last Three Months Sales Report -->
- <screen name="Last3MonthsSalesReport">
- <section>
- <widgets>
- <screenlet title="Last Three Months Sales Report">
- <include-form name="Last3MonthsSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
- <!-- Coupon Sales Report -->
- <screen name="CouponSalesReport">
- <section>
- <widgets>
- <screenlet title="Coupon Sales Report">
- <include-form name="CouponSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -149,35 +149,6 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ViewFacilityInventoryByProductExport"/>
</request-map>
- <request-map uri="ViewFacilityInventoryHistoryReport">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewFacilityInventoryHistoryReport"/>
- </request-map>
- <request-map uri="RenderInventoryReportHtml">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportHtml"/>
- </request-map>
- <request-map uri="RenderInventoryReportPDF">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportPDF"/>
- </request-map>
- <request-map uri="RenderInventoryReportExcel">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportExcel"/>
- </request-map>
- <request-map uri="RenderInventoryReportMSWord">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportMSWord"/>
- </request-map>
- <request-map uri="RenderInventoryReportPPT">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportPPT"/>
- </request-map>
<request-map uri="FindFacilityTransfers">
<security https="true" auth="true"/>
@@ -1385,7 +1356,6 @@ under the License.
<view-map name="ViewFacilityInventoryByProductSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductSimple"/>
<view-map name="ViewFacilityInventoryByProductReport" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="application/pdf" encoding="none"/>
<view-map name="ViewFacilityInventoryByProductExport" type="screenxml" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="text/xml"/>
- <view-map name="ViewFacilityInventoryHistoryReport" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryHistoryReport"/>
<view-map name="EditFacilityGroups" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityGroups"/>
<view-map name="EditFacilityParties" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityParties"/>
<view-map name="ViewContactMechs" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewContactMechs"/>
@@ -1474,13 +1444,6 @@ under the License.
<view-map name="EditShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/>
<view-map name="FindShipmentGatewayConfigTypes" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/>
<view-map name="EditShipmentGatewayConfigType" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/>
-
- <!-- Export Report -->
- <view-map name="RenderInventoryReportHtml" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="text/html"/>
- <view-map name="RenderInventoryReportPDF" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/pdf"/>
- <view-map name="RenderInventoryReportExcel" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-excel"/>
- <view-map name="RenderInventoryReportMSWord" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-word"/>
- <view-map name="RenderInventoryReportPPT" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-powerpoint"/>
-
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Fri Jul 13 09:48:32 2012
@@ -853,35 +853,6 @@ under the License.
<submit/>
</field>
</form>
-
- <form name="ViewFacilityInventoryHistoryReportForm" extends="FindFacilityInventoryByProduct" target="RenderInventoryReportHtml" target-window="_BLANK">
- <field name="facilityId"><hidden/></field>
- <field name="productId"><hidden/></field>
- <field name="internalName"><hidden/></field>
- <field name="productTypeId"><hidden/></field>
- <field name="searchInProductCategoryId"><hidden/></field>
- <field name="productSupplierId"><hidden/></field>
- <field name="statusId"><hidden/></field>
- <field name="productsSoldThruTimestamp"><hidden/></field>
- <field name="VIEW_SIZE"><hidden/></field>
- <field name="monthsInPastLimit"><hidden/></field>
- <field name="fromDateSellThrough"><hidden/></field>
- <field name="thruDateSellThrough"><hidden/></field>
- <field name="offsetQOHQty"><hidden/></field>
- <field name="offsetATPQty"><hidden/></field>
- <field name="lastIntMonth" title="Number of last month to sold out"><text size="15" default-value="0"></text></field>
- <field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange">
- <drop-down allow-empty="false" >
- <option key="RenderInventoryReportHtml" description="HTML"/>
- <option key="RenderInventoryReportPDF" description="PDF"/>
- <!--option key="RenderInventoryReportExcel" description="MS-Excel"/>
- <option key="RenderInventoryReportMSWord" description="MS-Word"/>
- <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/-->
- </drop-down>
- </field>
- <field name="submitButton"><hidden/></field>
- <field name="report" title="Export Report" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
<!--Facility Content-->
<form name="AddFacilityContent" type="upload" focus-field-name="contentId"
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jul 13 09:48:32 2012
@@ -1473,33 +1473,6 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="ViewFacilityInventoryHistoryReport">
- <section>
- <actions>
- <set field="headerItem" value="reports"/>
- <set field="facilityId" from-field="parameters.facilityId"/>
- <entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container>
- <label style="h1" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
- </container>
- <container>
- <link target="ViewFacilityInventoryByProductReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
- <link target="ViewFacilityInventoryByProductExport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="ViewFacilityInventoryHistoryReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
- </container>
- <screenlet title="${uiLabelMap.FacilityInventoryHistoryReport}">
- <include-form name="ViewFacilityInventoryHistoryReportForm" location="component://product/widget/facility/FacilityForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditFacilityContent">
<section>
Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Fri Jul 13 09:48:32 2012
@@ -56,7 +56,6 @@ under the License.
<container>
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
<include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Fri Jul 13 09:48:32 2012
@@ -278,7 +278,6 @@ under the License.
<fileset dir="${ofbiz.home.dir}/framework/base/lib/commons" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting" includes="*.jar"/>
- <fileset dir="${ofbiz.home.dir}/framework/birt/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/>
@@ -287,6 +286,7 @@ under the License.
<fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/>
+ <fileset dir="${ofbiz.home.dir}/specialpurpose/birt/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/specialpurpose/ebaystore/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/>
<fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/>
@@ -1049,7 +1049,7 @@ under the License.
</exec>
<xmlproperty file="runtime/svninfo_tmp.xml"/>
- <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src,
+ <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src,
framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src,
framework/example/src, framework/geronimo/src, framework/jetty/src,
framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src,
@@ -1059,7 +1059,7 @@ under the License.
applications/product/src, applications/securityext/src, applications/workeffort/src, specialpurpose/assetmaint/src,
specialpurpose/ebay/src, specialpurpose/ebaystore/src, specialpurpose/ecommerce/src, specialpurpose/googlebase/src,
specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src,
- specialpurpose/scrum/src" />
+ specialpurpose/scrum/src, specialpurpose/birt/src" />
<property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test,
framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test,
applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test,
Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Fri Jul 13 09:48:32 2012
@@ -28,7 +28,7 @@ under the License.
security/build.xml,service/build.xml,entityext/build.xml,
bi/build.xml,minilang/build.xml,
webapp/build.xml,widget/build.xml,
- common/build.xml,datafile/build.xml,birt/build.xml,
+ common/build.xml,datafile/build.xml,
testtools/build.xml,
appserver/build.xml,webtools/build.xml"/>
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Fri Jul 13 09:48:32 2012
@@ -44,7 +44,6 @@ under the License.
<handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
<handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
<handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
- <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
<preprocessor>
<!-- Events to run on every request before security (chains exempt) -->
Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Fri Jul 13 09:48:32 2012
@@ -33,7 +33,6 @@ under the License.
<load-component component-location="service"/>
<load-component component-location="entityext"/>
<load-component component-location="bi"/>
- <load-component component-location="birt"/>
<load-component component-location="webapp"/>
<load-component component-location="widget"/>
<load-component component-location="appserver"/>
Modified: ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/dtd/site-conf.xsd?rev=1361130&r1=1361129&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/trunk/framework/webapp/dtd/site-conf.xsd Fri Jul 13 09:48:32 2012
@@ -652,8 +652,7 @@ under the License.
<xs:attribute type="xs:string" name="type" default="default">
<xs:annotation>
<xs:documentation>
- There are as much as types (of type view) as available defined and accessible event handlers.
- Most used is screen, others are notably screenxml, screentext, screencsv, screenfop, ftl, http and birt
+ The name of the view handler that will render the output: screen, screenfop, ftl etc...
A most comprehensive list can be found in the common-controller.
</xs:documentation>
</xs:annotation>
Re: svn commit: r1361130 [1/3] - in /ofbiz/trunk: ./ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/accou
Posted by Anil Patel <an...@hotwaxmedia.com>.
Jacopo,
Thanks for your efforts.
This step also opens Options in User community for using various third party BI/Reporting tools.
Thanks and Regards
Anil Patel
HotWax Media Inc
On Jul 13, 2012, at 3:58 PM, Jacopo Cappellato wrote:
> Thank you, Jacques: I have spent a lot of time enhancing the framework to make this possible and taking design decisions to isolate birt code into one component, so I truly appreciate your comment.
> I think that with this new layout the birt component, when moved to extras, will be easy to enhance and free to evolve accordingly to the desires of the maintainers of it; for example, they could decide to split it into two hot-deploy components: birt (with framework code) and birtappls (with reports) or similar.
>
> Jacopo
>
> On Jul 13, 2012, at 12:08 PM, Jacques Le Roux wrote:
>
>> Thanks for the effort Jacopo,
>>
>> Really appreciated!
>>
>> Jacques
>>
>> From: <ja...@apache.org>
>>> Author: jacopoc
>>> Date: Fri Jul 13 09:48:32 2012
>>> New Revision: 1361130
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1361130&view=rev
>>> Log:
>>> Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
>>> Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as well.
>>
>
Re: svn commit: r1361130 [1/3] - in /ofbiz/trunk: ./ applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/WEB-INF/actions/reports/
applications/accou
Posted by Olivier Heintz <ho...@nereide.biz>.
Le 13/07/2012 12:28, Jacopo Cappellato a écrit :
> Thank you, Jacques: I have spent a lot of time enhancing the framework to make this possible and taking design decisions to isolate birt code into one component, so I truly appreciate your comment.
> I think that with this new layout the birt component, when moved to extras, will be easy to enhance and free to evolve accordingly to the desires of the maintainers of it; for example, they could decide to split it into two hot-deploy components: birt (with framework code) and birtappls (with reports) or similar.
I put it in my ofbiz-extra todo list
> Jacopo
>
> On Jul 13, 2012, at 12:08 PM, Jacques Le Roux wrote:
>
>> Thanks for the effort Jacopo,
>>
>> Really appreciated!
>>
>> Jacques
>>
>> From:<ja...@apache.org>
>>> Author: jacopoc
>>> Date: Fri Jul 13 09:48:32 2012
>>> New Revision: 1361130
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1361130&view=rev
>>> Log:
>>> Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
>>> Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as well.
>
Re: svn commit: r1361130 [1/3] - in /ofbiz/trunk: ./ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/accou
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
Thank you, Jacques: I have spent a lot of time enhancing the framework to make this possible and taking design decisions to isolate birt code into one component, so I truly appreciate your comment.
I think that with this new layout the birt component, when moved to extras, will be easy to enhance and free to evolve accordingly to the desires of the maintainers of it; for example, they could decide to split it into two hot-deploy components: birt (with framework code) and birtappls (with reports) or similar.
Jacopo
On Jul 13, 2012, at 12:08 PM, Jacques Le Roux wrote:
> Thanks for the effort Jacopo,
>
> Really appreciated!
>
> Jacques
>
> From: <ja...@apache.org>
>> Author: jacopoc
>> Date: Fri Jul 13 09:48:32 2012
>> New Revision: 1361130
>>
>> URL: http://svn.apache.org/viewvc?rev=1361130&view=rev
>> Log:
>> Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
>> Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as well.
>
Re: svn commit: r1361130 [1/3] - in /ofbiz/trunk: ./ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/accou
Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks for the effort Jacopo,
Really appreciated!
Jacques
From: <ja...@apache.org>
> Author: jacopoc
> Date: Fri Jul 13 09:48:32 2012
> New Revision: 1361130
>
> URL: http://svn.apache.org/viewvc?rev=1361130&view=rev
> Log:
> Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt
> component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all
> these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for
> authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
> Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when
> interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex
> I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as
> well.
>
>
> Added:
> ofbiz/trunk/specialpurpose/birt/
> - copied from r1360638, ofbiz/trunk/framework/birt/
> ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
> ofbiz/trunk/specialpurpose/birt/webapp/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy (props changed)
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/birt/
> - copied from r1360745, ofbiz/trunk/specialpurpose/example/webapp/birt/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
> - copied unchanged from r1360638,
> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
> - copied unchanged from r1360638, ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
> ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/
> ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign
> - copied unchanged from r1360638, ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy (props changed)
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
> - copied unchanged from r1360745,
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy (props changed)
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderByReferrer.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReport.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign
> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign
> - copied unchanged from r1360745, ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign
> ofbiz/trunk/specialpurpose/birt/widget/
> ofbiz/trunk/specialpurpose/birt/widget/accounting/
> ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml
> ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml
> ofbiz/trunk/specialpurpose/birt/widget/birt/
> ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml
> - copied, changed from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml
> ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml
> ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml
> - copied, changed from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml
> ofbiz/trunk/specialpurpose/birt/widget/facility/
> ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
> ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml
> ofbiz/trunk/specialpurpose/birt/widget/order/
> ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
> ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
> Removed:
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy
> 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/payment/report/
> 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
> ofbiz/trunk/applications/content/data/BirtHelpData.xml
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderByReferrer.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportMonth.rptdesign
> ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReportWeek.rptdesign
> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
> ofbiz/trunk/applications/product/webapp/facility/inventory/report/
> ofbiz/trunk/framework/birt/
> ofbiz/trunk/specialpurpose/example/webapp/birt/
> ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/birt.tld
> ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml
> ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml
> Modified:
> ofbiz/trunk/.classpath
> ofbiz/trunk/LICENSE
> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
> ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
> ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
> ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
> ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
> ofbiz/trunk/applications/content/ofbiz-component.xml
> ofbiz/trunk/applications/order/data/OrderPortletData.xml
> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
> ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
> ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
> ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
> ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
> ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
> ofbiz/trunk/build.xml
> ofbiz/trunk/framework/build.xml
> ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
> ofbiz/trunk/framework/component-load.xml
> ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
> ofbiz/trunk/specialpurpose/birt/build.xml
> ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
> ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml
> ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
> ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
> ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl
> ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl
> ofbiz/trunk/specialpurpose/build.xml
> ofbiz/trunk/specialpurpose/component-load.xml
> ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
> ofbiz/trunk/specialpurpose/example/ofbiz-component.xml
> ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
> ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml
> ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
>
> Modified: ofbiz/trunk/.classpath
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/.classpath (original)
> +++ ofbiz/trunk/.classpath Fri Jul 13 09:48:32 2012
> @@ -105,8 +105,8 @@
> <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
> <classpathentry kind="lib" path="framework/base/lib/scripting/jansi-1.2.1.jar"/>
> <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
> - <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
> - <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
> + <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/>
> + <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
> <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.2.jar"/>
> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-ha.jar"/>
> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.28.catalina-tribes.jar"/>
> @@ -176,7 +176,7 @@
> <classpathentry kind="src" path="framework/base/build/gen-src/javacc"/>
> <classpathentry excluding="org/ofbiz/base/config/CoberturaInstrumenter.java" kind="src" path="framework/base/src"/>
> <classpathentry kind="src" path="framework/bi/src"/>
> - <classpathentry kind="src" path="framework/birt/src"/>
> + <classpathentry kind="src" path="specialpurpose/birt/src"/>
> <classpathentry kind="src" path="framework/catalina/src"/>
> <classpathentry kind="src" path="framework/common/src"/>
> <classpathentry kind="src" path="framework/datafile/src"/>
>
> Modified: ofbiz/trunk/LICENSE
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/LICENSE (original)
> +++ ofbiz/trunk/LICENSE Fri Jul 13 09:48:32 2012
> @@ -2252,37 +2252,37 @@ questions or comments regarding the usag
> =========================================================================
> The following libraries distributed with Apache OFBiz are licensed under the
> Eclipse Public License - v 1.0:
> -ofbiz/trunk/framework/birt/lib/flute.jar
> -ofbiz/trunk/framework/birt/lib/jaxrpc.jar
> -ofbiz/trunk/framework/birt/lib/js.jar
> -ofbiz/trunk/framework/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
> -ofbiz/trunk/framework/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
> -ofbiz/trunk/framework/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
> -ofbiz/trunk/framework/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
> -ofbiz/trunk/framework/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
> -ofbiz/trunk/framework/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
> -ofbiz/trunk/framework/birt/lib/saaj.jar
> -ofbiz/trunk/framework/birt/lib/Tidy.jar
> -ofbiz/trunk/framework/birt/lib/viewservlets.jar
> +ofbiz/trunk/specialpurpose/birt/lib/flute.jar
> +ofbiz/trunk/specialpurpose/birt/lib/jaxrpc.jar
> +ofbiz/trunk/specialpurpose/birt/lib/js.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.resolver_1.2.0.v201005080400.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.apache.xml.serializer_2.7.1.v201005080400.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.w3c.css.sac_1.3.0.v200805290154.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.smil_1.0.0.v200806040011.jar
> +ofbiz/trunk/specialpurpose/birt/lib/org.w3c.dom.svg_1.1.0.v201011041433.jar
> +ofbiz/trunk/specialpurpose/birt/lib/saaj.jar
> +ofbiz/trunk/specialpurpose/birt/lib/Tidy.jar
> +ofbiz/trunk/specialpurpose/birt/lib/viewservlets.jar
> ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.jar
> ofbiz/trunk/framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar
> ofbiz/trunk/framework/jetty/lib/jetty-continuation-8.1.2.v20120308.jar
>
> 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=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
> @@ -2169,11 +2169,6 @@ 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>
> @@ -2219,12 +2214,6 @@ 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"/>
> @@ -2242,6 +2231,7 @@ under the License.
> <response name="error" type="view" value="ComparativeIncomeStatement"/>
> </request-map>
> <request-map uri="BalanceSheet"><security https="true" auth="true"/><response name="success" type="view"
> value="BalanceSheet"/></request-map>
> + <request-map uri="BalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view"
> value="BalanceSheetPdf"/></request-map>
> <request-map uri="ComparativeBalanceSheet"><security https="true" auth="true"/><response name="success" type="view"
> value="ComparativeBalanceSheet"/></request-map>
> <request-map uri="ComparativeBalanceSheet.pdf"><security https="true" auth="true"/><response name="success" type="view"
> value="ComparativeBalanceSheetPdf"/></request-map>
> <request-map uri="ComparativeBalanceSheet.csv"><security https="true" auth="true"/><response name="success" type="view"
> value="ComparativeBalanceSheetCsv"/></request-map>
> @@ -2394,12 +2384,6 @@ 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"/>
> @@ -2422,10 +2406,8 @@ 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>
> -
> <request-map uri="IncomeStatementListCsv.csv">
> <security https="true" auth="true"/>
> <response name="success" type="view" value="IncomeStatementListCsv"/>
> @@ -2436,18 +2418,10 @@ under the License.
> <response name="success" type="view" value="BalanceSheetCsv"/>
> </request-map>
>
> - <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>
> -
> <request-map uri="TrialBalanceSearchResultsCsv.csv">
> <security https="true" auth="true"/>
> <response name="success" type="view" value="TrialBalanceSearchResultsCsv"/>
> @@ -2562,21 +2536,6 @@ under the License.
> </request-map>
>
> <!-- Reports -->
> - <request-map uri="paymentReport">
> - <security https="true" auth="true"/>
> - <response name="success" type="view" value="paymentReport"/>
> - </request-map>
> - <request-map uri="paymentReportHtml">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
> - <response name="success" type="view" value="ViewPaymentReportHtml"/>
> - </request-map>
> - <request-map uri="paymentReportPdf">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/>
> - <response name="success" type="view" value="ViewPaymentReportPdf"/>
> - </request-map>
> -
> <request-map uri="createWorkEffortAndPartyAssign">
> <security https="true" auth="true"/>
> <event type="service" invoke="createWorkEffortAndPartyAssign"/>
> @@ -2626,7 +2585,6 @@ 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"/>
> @@ -2828,23 +2786,22 @@ 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="birt"
> page="component://accounting/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/>
> + <view-map name="TrialBalanceSearchResultsPdf" type="screenfop"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalanceSearchResultsPdf" 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="birt"
> page="component://accounting/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/>
> + <view-map name="IncomeStatementListPdf" type="screenfop"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#IncomeStatementListPdf" 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="BalanceSheetPdf" type="screenfop"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetPdf" content-type="application/pdf"
> encoding="none"/>
> <view-map name="BalanceSheetCsv" type="screencsv"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#BalanceSheetCsv" content-type="text/csv" 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"/>
> @@ -2883,7 +2840,6 @@ 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"/>
>
> @@ -2898,11 +2854,6 @@ under the License.
> <view-map name="GlAccountBalanceByCostCenter" type="screen"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenter"/>
> <view-map name="GlAccountBalanceByCostCenterPdf" type="screenfop"
> page="component://accounting/widget/ReportFinancialSummaryScreens.xml#GlAccountBalanceByCostCenterPdf"
> content-type="application/pdf" encoding="none"/>
>
> - <view-map name="paymentReport" type="screen" page="component://accounting/widget/PaymentScreens.xml#PaymentReport"/>
> - <view-map name="ViewPaymentReportHtml" type="birt"
> page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="text/html"/>
> - <view-map name="ViewPaymentReportPdf" type="birt"
> page="component://accounting/webapp/accounting/payment/report/PaymentReport.rptdesign" content-type="application/pdf"/>
> -
> -
> <!-- end of view mappings -->
> </site-conf>
>
>
> Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jul 13 09:48:32 2012
> @@ -398,9 +398,6 @@ under the License.
> <parameter param-name="paymentId" from-field="payment.paymentId"/>
> </link>
> </menu-item>
> - <menu-item name="paymentReport" title="Payment Report">
> - <link target="paymentReport"/>
> - </menu-item>
> </menu>
>
> <menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
>
> Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Fri Jul 13 09:48:32 2012
> @@ -575,17 +575,4 @@ under the License.
> <field name="transactionDate" position="1"><display/></field>
> <field name="statusId" position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"
> description="${description}" key-field-name="statusId"/></field>
> </form>
> - <form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments"
> extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK">
> - <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange">
> - <drop-down>
> - <option key="paymentReportHtml" description="text/html"></option>
> - <option key="paymentReportPdf" description="application/pdf"></option>
> - <!--option key="application/vnd.ms-excel">application/vnd.ms-excel</option>
> - <option key="application/vnd.ms-word">application/vnd.ms-word</option>
> - <option key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option-->
> - </drop-down>
> - </field>
> - <field name="searchButton"><hidden/></field>
>- <field name="report" title="Report" widget-style="smallSubmit"><submit button-type="button"/></field>
> - </form>
> </forms>
>
> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
> +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Jul 13 09:48:32 2012
> @@ -555,25 +555,4 @@ under the License.
> </widgets>
> </section>
> </screen>
> - <screen name="PaymentReport">
> - <section>
> - <actions>
> - <set field="headerItem" value="payments"/>
> - <set field="tabButtonItem" value="paymentReport"/>
> - </actions>
> - <widgets>
> - <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
> - <decorator-section name="body">
> - <section>
> - <widgets>
> - <screenlet title="Payment Report">
> - <include-form name="PaymentReport"
> location="component://accounting/widget/PaymentForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </decorator-section>
> - </decorator-screen>
> - </widgets>
> - </section>
> - </screen>
> </screens>
>
> Modified: ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml (original)
> +++ ofbiz/trunk/applications/commonext/documents/ApacheOfbizTechnical.xml Fri Jul 13 09:48:32 2012
> @@ -201,7 +201,6 @@ image=/boot/vmlinuzNew
> <xi:include href="../../../framework/testtools/documents/TestTools.xml" />
> <xi:include href="../../../framework/documents/UnitTest.xml" />
> <xi:include href="../../../framework/documents/SingleSignOn.xml" />
> - <xi:include href="../../../framework/birt/documents/Birt.xml"/>
> <xi:include href="../../../framework/documents/DataFiles.xml"/>
>
> <appendix>
>
> Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
> +++ ofbiz/trunk/applications/content/ofbiz-component.xml Fri Jul 13 09:48:32 2012
> @@ -45,7 +45,6 @@ under the License.
> <!-- these files cannot be loaded in their original component because they are earlier than the content component -->
> <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
> <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
> - <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
>
> <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>
>
> Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
> +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Fri Jul 13 09:48:32 2012
> @@ -115,78 +115,12 @@
> description=""/>
> <PortletPortletCategory portalPortletId="PurchByPaymMeth" portletCategoryId="REPORT"/>
> <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PurchByPaymMeth" portletSeqId="00001" columnSeqId="00002"
> sequenceNum="4"/>
> -
> <PortalPortlet portalPortletId="ListPurchaseOrders"
> portletName="List Purchase Orders"
> screenName="ListPurchaseOrders"
> screenLocation="component://order/widget/ordermgr/OrderViewScreens.xml"
> description="List Purchase Orders"/>
> <PortletPortletCategory portalPortletId="ListPurchaseOrders" portletCategoryId="ORDERMGR"/>
> -
> - <PortalPortlet portalPortletId="OrderByReferrer"
> - portletName="Sale Orders By Referrer Report"
> - screenName="SaleOrdersByReferrerReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="OrderByReferrer" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001"
> sequenceNum="5"/>
> -
> - <PortalPortlet portalPortletId="OrderByChannel"
> - portletName="Sale Orders by Channel"
> - screenName="SaleOrdersByChannelReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="OrderByChannel" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001"
> sequenceNum="6"/>
> -
> - <PortalPortlet portalPortletId="OrderDiscountCode"
> - portletName="Orders with discount code"
> - screenName="SaleOrderDiscountCodeReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="OrderDiscountCode" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderDiscountCode" portletSeqId="00001"
> columnSeqId="00001" sequenceNum="7"/>
> -
> - <PortalPortlet portalPortletId="Last3MSalesReport"
> - portletName="Last 3 Months Sales Report"
> - screenName="Last3MonthsSalesReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="Last3MSalesReport" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="Last3MSalesReport" portletSeqId="00001"
> columnSeqId="00002" sequenceNum="8"/>
> -
> - <PortalPortlet portalPortletId="CouponSalesReport"
> - portletName="Coupon Sales Report"
> - screenName="CouponSalesReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="CouponSalesReport" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="CouponSalesReport" portletSeqId="00001"
> columnSeqId="00002" sequenceNum="9"/>
> -
> - <PortalPortlet portalPortletId="SalesReport"
> - portletName="Sales Report"
> - screenName="SalesReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="SalesReport" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002"
> sequenceNum="10"/>
> -
> - <PortalPortlet portalPortletId="NBO_Report"
> - portletName="Net Before Overhead Report"
> - screenName="NetBeforeOverheadReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="NBO_Report" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="NBO_Report" portletSeqId="00001" columnSeqId="00002"
> sequenceNum="11"/>
> -
> - <PortalPortlet portalPortletId="PDR_Report"
> - portletName="Product Demand Report"
> - screenName="ProductDemandReport"
> - screenLocation="component://order/widget/ordermgr/ReportScreens.xml"
> - description=""/>
> - <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
> - <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002"
> sequenceNum="12"/>
> -
> <PortletCategory portletCategoryId="CUST_ORDERS" description="Customer Orders"/>
> <PortalPortlet portalPortletId="ListCustReturns"
> portletName="Customer Returns"
>
> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
> @@ -1155,92 +1155,8 @@ under the License.
> <request-map uri="PurchasesByOrganizationReport.pdf"><security https="true" auth="true"/>
> <response name="success" type="view" value="PurchasesByOrganizationReport"/>
> </request-map>
> -
> - <request-map uri="checkReportBy">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy"/>
> - <response name="dayPDF" type="request" value="SalesReport.pdf"/>
> - <response name="weekPDF" type="request" value="SalesReportWeek.pdf"/>
> - <response name="monthPDF" type="request" value="SalesReportMonth.pdf"/>
> - <response name="dayExcel" type="request" value="SalesReport.excel"/>
> - <response name="weekExcel" type="request" value="SalesReportWeek.excel"/>
> - <response name="monthExcel" type="request" value="SalesReportMonth.excel"/>
> - <response name="dayHTML" type="request" value="SalesReport.html"/>
> - <response name="weekHTML" type="request" value="SalesReportWeek.html"/>
> - <response name="monthHTML" type="request" value="SalesReportMonth.html"/>
> - <response name="error" type="request-redirect" value="OrderPurchaseReportOptions">
> - <redirect-parameter name="fromDate"/>
> - <redirect-parameter name="reportBy" from="parameters.reportDate"/>
> - </response>
> - </request-map>
> - <request-map uri="SalesReport.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportPDF"/>
> - </request-map>
> - <request-map uri="SalesReportWeek.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportWeekPDF"/>
> - </request-map>
> - <request-map uri="SalesReportMonth.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportMonthPDF"/>
> - </request-map>
> - <request-map uri="SalesReport.excel"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportExcel"/>
> - </request-map>
> - <request-map uri="SalesReportWeek.excel"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportWeekExcel"/>
> - </request-map>
> - <request-map uri="SalesReportMonth.excel"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportMonthExcel"/>
> - </request-map>
> - <request-map uri="SalesReport.html"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportHTML"/>
> - </request-map>
> - <request-map uri="SalesReportWeek.html"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportWeekHTML"/>
> - </request-map>
> - <request-map uri="SalesReportMonth.html"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/>
> - <response name="success" type="view" value="SalesOrderReportMonthHTML"/>
> - </request-map>
> - <request-map uri="NetBeforeOverheadReport.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy"/>
> - <response name="success" type="view" value="NetBeforeOverheadOrderReport"/>
> - </request-map>
> - <request-map uri="ProductDemandReport.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy"/>
> - <response name="success" type="view" value="ProductDemandOrderReport"/>
> - </request-map>
> - <request-map uri="ProductContributionReport.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductContributionReport.groovy"/>
> - <response name="success" type="view" value="ProductDemandOrderReport"/>
> - </request-map>
>
> - <request-map uri="OrderByReferrer.pdf"><security https="true" auth="true"/>
> - <response name="success" type="view" value="OrderByReferrerReport"/>
> - </request-map>
> - <request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy"/>
> - <response name="success" type="view" value="OrdersByChannelReport"/>
> - </request-map>
> - <request-map uri="OrderDiscountCode.pdf">
> - <security https="true" auth="true"/>
> - <response name="success" type="view" value="SaleOrderDiscountCodeReport"/>
> - </request-map>
> - <request-map uri="Last3MonthsSalesReport.pdf"><security https="true" auth="true"/>
> - <response name="success" type="view" value="Last3MonthsSalesReport"/>
> - </request-map>
> - <request-map uri="CouponSalesReport.pdf"><security https="true" auth="true"/>
> - <response name="success" type="view" value="CouponSalesReport"/>
> - </request-map>
> -
> - <!-- Requirement request mappings -->
> + <!-- Requirement request mappings -->
> <request-map uri="FindRequirements">
> <security https="true" auth="true"/>
> <response name="success" type="view" value="FindRequirements"/>
> @@ -2023,23 +1939,6 @@ under the License.
> <view-map name="OpenOrderItemsReport" type="screen"
> page="component://order/widget/ordermgr/ReportScreens.xml#OpenOrderItemsReport"/>
> <view-map name="PurchasesByOrganizationReport" type="screenfop"
> page="component://order/widget/ordermgr/ReportScreens.xml#PurchasesByOrganizationReport" content-type="application/pdf"
> encoding="none"/>
>
> - <view-map name="SalesOrderReportPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"
> content-type="application/pdf"/>
> - <view-map name="SalesOrderReportWeekPDF" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/pdf"/>
> - <view-map name="SalesOrderReportMonthPDF" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/pdf"/>
> - <view-map name="SalesOrderReportExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"
> content-type="application/vnd.ms-excel"/>
> - <view-map name="SalesOrderReportWeekExcel" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/vnd.ms-excel"/>
> - <view-map name="SalesOrderReportMonthExcel" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/vnd.ms-excel"/>
> - <view-map name="SalesOrderReportHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"
> content-type="text/html"/>
> - <view-map name="SalesOrderReportWeekHTML" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="text/html"/>
> - <view-map name="SalesOrderReportMonthHTML" type="birt"
> page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/>
> - <view-map name="NetBeforeOverheadOrderReport" type="birt"
> page="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/>
> - <view-map name="ProductDemandOrderReport" type="birt"
> page="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/>
> - <view-map name="OrderByReferrerReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderByReferrer.rptdesign"
> content-type="application/pdf"/>
> - <view-map name="OrdersByChannelReport" type="birt" page="component://order/webapp/ordermgr/reports/OrdersByChannel.rptdesign"
> content-type="application/pdf"/>
> - <view-map name="SaleOrderDiscountCodeReport" type="birt"
> page="component://order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/>
> - <view-map name="Last3MonthsSalesReport" type="birt"
> page="component://order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/>
> - <view-map name="CouponSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/CouponSalesReport.rptdesign"
> content-type="application/pdf"/>
> -
> <view-map name="FindRequirements" type="screen"
> page="component://order/widget/ordermgr/RequirementScreens.xml#FindRequirements"/>
> <view-map name="EditRequirement" type="screen"
> page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirement"/>
> <view-map name="ListRequirementCustRequests" type="screen"
> page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementCustRequests"/>
>
> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
> +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Fri Jul 13 09:48:32 2012
> @@ -195,78 +195,4 @@ under the License.
> <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field>
> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit
> button-type="button"/></field>
> </form>
> -
> - <!--New From-->
> - <form name="SalesReport" type="single" target="checkReportBy" title=""
> - header-row-style="header-row" default-table-style="basic-table">
> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
> - <field name="reportBy" title="Report By">
> - <drop-down>
> - <option key="day" description="Days"></option>
> - <option key="week" description="Weeks"></option>
> - <option key="month" description="Months"></option>
> - </drop-down>
> - </field>
> - <field name="exportType" title="Format Type">
> - <drop-down>
> - <option key="pdf" description="PDF"></option>
> - <option key="excel" description="Excel"></option>
> - <option key="html" description="HTML"></option>
> - </drop-down>
> - </field>
> - <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit
> button-type="button"/></field>
> - </form>
> -
> - <form name="NetBeforeOverheadReport" type="single" target="NetBeforeOverheadReport.pdf" title=""
> - header-row-style="header-row" default-table-style="basic-table">
> - <field name="productStoreId">
> - <drop-down allow-empty="false">
> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
> - <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
> - <entity-order-by field-name="storeName"/>
> - </entity-options>
> - </drop-down>
> - </field>
> - <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit
> button-type="button"/></field>
> - </form>
> -
> - <form name="ProductDemandReport" type="single" target="ProductDemandReport.pdf" title=""
> - header-row-style="header-row" default-table-style="basic-table">
> - <field name="productStoreId">
> - <drop-down allow-empty="false">
> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
> - <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
> - <entity-order-by field-name="storeName"/>
> - </entity-options>
> - </drop-down>
> - </field>
> - <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit
> button-type="button"/></field>
> - </form>
> -
> - <form name="OrderByReferrer" type="single" target="OrderByReferrer.pdf" target-window="_BLANK">
> - <!--field name="referrerUrl"><text-find default-option="contains"/></field-->
> - <field name="referrerUrl" title=" "><display description="All Referrer"></display></field>
> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
> - </form>
> - <form name="SaleOrdersByChannel" type="single" target="OrdersByChannel.pdf" target-window="_BLANK">
> - <field name="saleChannel">
> - <drop-down allow-empty="false">
> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
> - <entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
> - <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
> - </entity-options>
> - </drop-down>
> - </field>
> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
> - </form>
> - <form name="SaleOrderDiscountCode" type="single" target="OrderDiscountCode.pdf" target-window="_BLANK">
> - <field name="discountCodeUrl" title=" "><display description="All order items with discount code"></display></field>
> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
> - </form>
> - <form name="Last3MonthsSalesReport" type="single" target="Last3MonthsSalesReport.pdf" target-window="_BLANK">
> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
> - </form>
> - <form name="CouponSalesReport" type="single" target="CouponSalesReport.pdf" target-window="_BLANK">
> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
> - </form>
> -</forms>
> +</forms>
> \ No newline at end of file
>
> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
> +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Fri Jul 13 09:48:32 2012
> @@ -107,46 +107,6 @@ under the License.
> </widgets>
> </section>
> </screen>
> -
> - <!--New Screen-->
> - <screen name="SalesReport">
> - <section>
> - <actions>
> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
> - </actions>
> - <widgets>
> - <screenlet title="Sales Report">
> - <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> -
> - <screen name="NetBeforeOverheadReport">
> - <section>
> - <actions>
> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
> - </actions>
> - <widgets>
> - <screenlet title="Net Before Overhead Report">
> - <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> -
> - <screen name="ProductDemandReport">
> - <section>
> - <actions>
> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
> - </actions>
> - <widgets>
> - <screenlet title="Product Demand Report">
> - <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
>
> <screen name="OrderPurchaseReportPayment">
> <section>
> @@ -331,93 +291,4 @@ under the License.
> </widgets>
> </section>
> </screen>
> -
> - <screen name="SalesOrderReport">
> - <section>
> - <actions>
> - <entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList">
> - <condition-list combine="and">
> - <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate"
> ignore-if-null="true"/>
> - <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate"
> ignore-if-null="true"/>
> - </condition-list>
> - </entity-condition>
> - </actions>
> - <widgets>
> - <platform-specific>
> - <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
> - </platform-specific>
> - </widgets>
> - </section>
> - </screen>
> -
> - <screen name="NetBeforeOverheadOrderReport">
> - <section>
> - <widgets>
> - <platform-specific>
> - <xml><html-template
> location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
> - </platform-specific>
> - </widgets>
> - </section>
> - </screen>
> -
> - <screen name="ProductDemandOrderReport ">
> - <section>
> - <widgets>
> - <platform-specific>
> - <xml><html-template
> location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
> - </platform-specific>
> - </widgets>
> - </section>
> - </screen>
> -
> - <!-- Sale Order By Referrer -->
> - <screen name="SaleOrdersByReferrerReport">
> - <section>
> - <widgets>
> - <screenlet title="Sale Orders by Referrer Report">
> - <include-form name="OrderByReferrer" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> - <!-- Sale Order By Channel -->
> - <screen name="SaleOrdersByChannelReport">
> - <section>
> - <widgets>
> - <screenlet title="Sale Orders By Channel Report">
> - <include-form name="SaleOrdersByChannel" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> - <!-- Sale Order with Discount Code -->
> - <screen name="SaleOrderDiscountCodeReport">
> - <section>
> - <widgets>
> - <screenlet title="Sale Orders Discount Code Report">
> - <include-form name="SaleOrderDiscountCode" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> - <!-- Last Three Months Sales Report -->
> - <screen name="Last3MonthsSalesReport">
> - <section>
> - <widgets>
> - <screenlet title="Last Three Months Sales Report">
> - <include-form name="Last3MonthsSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> - <!-- Coupon Sales Report -->
> - <screen name="CouponSalesReport">
> - <section>
> - <widgets>
> - <screenlet title="Coupon Sales Report">
> - <include-form name="CouponSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
> - </screenlet>
> - </widgets>
> - </section>
> - </screen>
> </screens>
>
> Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
> @@ -149,35 +149,6 @@ under the License.
> <security https="true" auth="true"/>
> <response name="success" type="view" value="ViewFacilityInventoryByProductExport"/>
> </request-map>
> - <request-map uri="ViewFacilityInventoryHistoryReport">
> - <security https="true" auth="true"/>
> - <response name="success" type="view" value="ViewFacilityInventoryHistoryReport"/>
> - </request-map>
> - <request-map uri="RenderInventoryReportHtml">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
> - <response name="success" type="view" value="RenderInventoryReportHtml"/>
> - </request-map>
> - <request-map uri="RenderInventoryReportPDF">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
> - <response name="success" type="view" value="RenderInventoryReportPDF"/>
> - </request-map>
> - <request-map uri="RenderInventoryReportExcel">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
> - <response name="success" type="view" value="RenderInventoryReportExcel"/>
> - </request-map>
> - <request-map uri="RenderInventoryReportMSWord">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
> - <response name="success" type="view" value="RenderInventoryReportMSWord"/>
> - </request-map>
> - <request-map uri="RenderInventoryReportPPT">
> - <security https="true" auth="true"/>
> - <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
> - <response name="success" type="view" value="RenderInventoryReportPPT"/>
> - </request-map>
>
> <request-map uri="FindFacilityTransfers">
> <security https="true" auth="true"/>
> @@ -1385,7 +1356,6 @@ under the License.
> <view-map name="ViewFacilityInventoryByProductSimple" type="screen"
> page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductSimple"/>
> <view-map name="ViewFacilityInventoryByProductReport" type="screenfop"
> page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="application/pdf"
> encoding="none"/>
> <view-map name="ViewFacilityInventoryByProductExport" type="screenxml"
> page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="text/xml"/>
> - <view-map name="ViewFacilityInventoryHistoryReport" type="screen"
> page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryHistoryReport"/>
> <view-map name="EditFacilityGroups" type="screen"
> page="component://product/widget/facility/FacilityScreens.xml#EditFacilityGroups"/>
> <view-map name="EditFacilityParties" type="screen"
> page="component://product/widget/facility/FacilityScreens.xml#EditFacilityParties"/>
> <view-map name="ViewContactMechs" type="screen"
> page="component://product/widget/facility/FacilityScreens.xml#ViewContactMechs"/>
> @@ -1474,13 +1444,6 @@ under the License.
> <view-map name="EditShipmentGatewayConfig"
> page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/>
> <view-map name="FindShipmentGatewayConfigTypes"
> page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/>
> <view-map name="EditShipmentGatewayConfigType"
> page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/>
> -
> - <!-- Export Report -->
> - <view-map name="RenderInventoryReportHtml" type="birt"
> page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="text/html"/>
> - <view-map name="RenderInventoryReportPDF" type="birt"
> page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/pdf"/>
> - <view-map name="RenderInventoryReportExcel" type="birt"
> page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-excel"/>
> - <view-map name="RenderInventoryReportMSWord" type="birt"
> page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-word"/>
> - <view-map name="RenderInventoryReportPPT" type="birt"
> page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign"
> content-type="application/vnd.ms-powerpoint"/>
> -
> +
> <!-- end of view mappings -->
> </site-conf>
>
> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
> +++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Fri Jul 13 09:48:32 2012
> @@ -853,35 +853,6 @@ under the License.
> <submit/>
> </field>
> </form>
> -
> - <form name="ViewFacilityInventoryHistoryReportForm" extends="FindFacilityInventoryByProduct"
> target="RenderInventoryReportHtml" target-window="_BLANK">
> - <field name="facilityId"><hidden/></field>
> - <field name="productId"><hidden/></field>
> - <field name="internalName"><hidden/></field>
> - <field name="productTypeId"><hidden/></field>
> - <field name="searchInProductCategoryId"><hidden/></field>
> - <field name="productSupplierId"><hidden/></field>
> - <field name="statusId"><hidden/></field>
> - <field name="productsSoldThruTimestamp"><hidden/></field>
> - <field name="VIEW_SIZE"><hidden/></field>
> - <field name="monthsInPastLimit"><hidden/></field>
> - <field name="fromDateSellThrough"><hidden/></field>
> - <field name="thruDateSellThrough"><hidden/></field>
> - <field name="offsetQOHQty"><hidden/></field>
> - <field name="offsetATPQty"><hidden/></field>
> - <field name="lastIntMonth" title="Number of last month to sold out"><text size="15" default-value="0"></text></field>
> - <field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange">
> - <drop-down allow-empty="false" >
> - <option key="RenderInventoryReportHtml" description="HTML"/>
> - <option key="RenderInventoryReportPDF" description="PDF"/>
> - <!--option key="RenderInventoryReportExcel" description="MS-Excel"/>
> - <option key="RenderInventoryReportMSWord" description="MS-Word"/>
> - <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/-->
> - </drop-down>
> - </field>
> - <field name="submitButton"><hidden/></field>
> - <field name="report" title="Export Report" widget-style="smallSubmit"><submit button-type="button"/></field>
> - </form>
>
> <!--Facility Content-->
> <form name="AddFacilityContent" type="upload" focus-field-name="contentId"
>
> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
> +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jul 13 09:48:32 2012
> @@ -1473,33 +1473,6 @@ under the License.
> </widgets>
> </section>
> </screen>
> -
> - <screen name="ViewFacilityInventoryHistoryReport">
> - <section>
> - <actions>
> - <set field="headerItem" value="reports"/>
> - <set field="facilityId" from-field="parameters.facilityId"/>
> - <entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
> - </actions>
> - <widgets>
> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
> - <decorator-section name="body">
> - <container>
> - <label style="h1" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor}
> ${facility.facilityName}"/>
> - </container>
> - <container>
> - <link target="ViewFacilityInventoryByProductReport?facilityId=${parameters.facilityId}"
> text="${uiLabelMap.CommonPrint}" style="buttontext"/>
> - <link target="ViewFacilityInventoryByProductExport?facilityId=${parameters.facilityId}"
> text="${uiLabelMap.CommonExport}" style="buttontext"/>
> - <link target="ViewFacilityInventoryHistoryReport?facilityId=${parameters.facilityId}"
> text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
> - </container>
> - <screenlet title="${uiLabelMap.FacilityInventoryHistoryReport}">
> - <include-form name="ViewFacilityInventoryHistoryReportForm"
> location="component://product/widget/facility/FacilityForms.xml"/>
> - </screenlet>
> - </decorator-section>
> - </decorator-screen>
> - </widgets>
> - </section>
> - </screen>
>
> <screen name="EditFacilityContent">
> <section>
>
> Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
> +++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Fri Jul 13 09:48:32 2012
> @@ -56,7 +56,6 @@ under the License.
> <container>
> <link target="ViewFacilityInventoryByProductReport?${searchParameterString}"
> text="${uiLabelMap.CommonPrint}" style="buttontext"/>
> <link target="ViewFacilityInventoryByProductExport?${searchParameterString}"
> text="${uiLabelMap.CommonExport}" style="buttontext"/>
> - <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}"
> text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
> </container>
> <screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
> <include-form name="FindFacilityInventoryByProduct"
> location="component://product/widget/facility/FacilityForms.xml"/>
>
> Modified: ofbiz/trunk/build.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/build.xml (original)
> +++ ofbiz/trunk/build.xml Fri Jul 13 09:48:32 2012
> @@ -278,7 +278,6 @@ under the License.
> <fileset dir="${ofbiz.home.dir}/framework/base/lib/commons" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/base/lib/j2eespecs" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting" includes="*.jar"/>
> - <fileset dir="${ofbiz.home.dir}/framework/birt/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/>
> @@ -287,6 +286,7 @@ under the License.
> <fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/>
> + <fileset dir="${ofbiz.home.dir}/specialpurpose/birt/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/specialpurpose/ebaystore/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/>
> <fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/>
> @@ -1049,7 +1049,7 @@ under the License.
> </exec>
> <xmlproperty file="runtime/svninfo_tmp.xml"/>
>
> - <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src,
> + <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src,
> framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src,
> framework/example/src, framework/geronimo/src, framework/jetty/src,
> framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src,
> @@ -1059,7 +1059,7 @@ under the License.
> applications/product/src, applications/securityext/src, applications/workeffort/src, specialpurpose/assetmaint/src,
> specialpurpose/ebay/src, specialpurpose/ebaystore/src, specialpurpose/ecommerce/src, specialpurpose/googlebase/src,
> specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src,
> - specialpurpose/scrum/src" />
> + specialpurpose/scrum/src, specialpurpose/birt/src" />
> <property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test,
> framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test,
> applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test,
>
> Modified: ofbiz/trunk/framework/build.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/build.xml (original)
> +++ ofbiz/trunk/framework/build.xml Fri Jul 13 09:48:32 2012
> @@ -28,7 +28,7 @@ under the License.
> security/build.xml,service/build.xml,entityext/build.xml,
> bi/build.xml,minilang/build.xml,
> webapp/build.xml,widget/build.xml,
> - common/build.xml,datafile/build.xml,birt/build.xml,
> + common/build.xml,datafile/build.xml,
> testtools/build.xml,
> appserver/build.xml,webtools/build.xml"/>
>
>
> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
> +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Fri Jul 13 09:48:32 2012
> @@ -44,7 +44,6 @@ under the License.
> <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
> <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
> <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
> - <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
>
> <preprocessor>
> <!-- Events to run on every request before security (chains exempt) -->
>
> Modified: ofbiz/trunk/framework/component-load.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/component-load.xml (original)
> +++ ofbiz/trunk/framework/component-load.xml Fri Jul 13 09:48:32 2012
> @@ -33,7 +33,6 @@ under the License.
> <load-component component-location="service"/>
> <load-component component-location="entityext"/>
> <load-component component-location="bi"/>
> - <load-component component-location="birt"/>
> <load-component component-location="webapp"/>
> <load-component component-location="widget"/>
> <load-component component-location="appserver"/>
>
> Modified: ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/dtd/site-conf.xsd?rev=1361130&r1=1361129&r2=1361130&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/webapp/dtd/site-conf.xsd (original)
> +++ ofbiz/trunk/framework/webapp/dtd/site-conf.xsd Fri Jul 13 09:48:32 2012
> @@ -652,8 +652,7 @@ under the License.
> <xs:attribute type="xs:string" name="type" default="default">
> <xs:annotation>
> <xs:documentation>
> - There are as much as types (of type view) as available defined and accessible event handlers.
> - Most used is screen, others are notably screenxml, screentext, screencsv, screenfop, ftl, http and birt
> + The name of the view handler that will render the output: screen, screenfop, ftl etc...
> A most comprehensive list can be found in the common-controller.
> </xs:documentation>
> </xs:annotation>
>
>