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 [2/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...

Modified: ofbiz/trunk/specialpurpose/birt/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/build.xml?rev=1361130&r1=1360638&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/build.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/build.xml Fri Jul 13 09:48:32 2012
@@ -31,20 +31,20 @@ under the License.
 
     <path id="local.class.path">
         <fileset dir="${lib.dir}" includes="*.jar"/>
-        <fileset dir="../base/lib" includes="*.jar"/>
-        <fileset dir="../base/lib/commons" includes="*.jar"/>
-        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-        <fileset dir="../base/build/lib" includes="*.jar"/>
-        <fileset dir="../entity/lib" includes="*.jar"/>
-        <fileset dir="../entity/build/lib" includes="*.jar"/>
-        <fileset dir="../entityext/build/lib" includes="*.jar"/>
-        <fileset dir="../security/build/lib" includes="*.jar"/>
-        <fileset dir="../service/lib" includes="*.jar"/>
-        <fileset dir="../service/build/lib" includes="*.jar"/>
-        <fileset dir="../minilang/build/lib" includes="*.jar"/>
-        <fileset dir="../webapp/lib" includes="*.jar"/>
-        <fileset dir="../webapp/build/lib" includes="*.jar"/>
-        <fileset dir="../widget/build/lib" includes="*.jar"/>
-        <fileset dir="../common/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
     </path>
 </project>

Modified: ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml?rev=1361130&r1=1360638&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml Fri Jul 13 09:48:32 2012
@@ -36,4 +36,26 @@
         <value xml:lang="en">Framework Eclipse BIRT</value>
         <value xml:lang="th">Framework Eclipse BIRT</value>
     </property>
+
+    <property key="ExampleBirtExamples">
+        <value xml:lang="en">BIRT Examples</value>
+        <value xml:lang="th">ตัวอย่าง BIRT</value>
+    </property>
+    <property key="ExampleBirtChartReport">
+        <value xml:lang="en">HTML chart report</value>
+        <value xml:lang="fr">Graphiques HTML</value>
+    </property>
+    <property key="ExampleBirtChartViewHandler">
+        <value xml:lang="en">PDF chart report</value>
+        <value xml:lang="fr">Graphiques PDF</value>
+    </property>
+    <property key="ExampleBirtMail">
+        <value xml:lang="en">Send any format through Mail</value>
+    </property>
+    <property key="ExampleBirtReport">
+        <value xml:lang="en">HTML</value>
+    </property>
+    <property key="ExampleBirtViewHandler">
+        <value xml:lang="en">PDF</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml?rev=1361130&r1=1360638&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/data/BirtHelpData.xml Fri Jul 13 09:48:32 2012
@@ -19,5 +19,10 @@
 -->
 
 <entity-engine-xml>
-    <!-- The BIRT help data is located in the applications/content/data/BirtHelpData.xml file -->
+    <DataResource dataResourceId="HELP_BIRT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+                  objectInfo="specialpurpose/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+                  dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL"
+             dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" mapKey="BIRT_main"/>
 </entity-engine-xml>

Added: ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<entity-engine-xml>
+    <PortalPortlet portalPortletId="OrderByReferrer"
+                   portletName="Sale Orders By Referrer Report"
+                   screenName="SaleOrdersByReferrerReport"
+                   screenLocation="component://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.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://birt/widget/order/OrderScreens.xml"
+                   description=""/>
+    <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
+    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
+</entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml?rev=1361130&r1=1360638&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/ofbiz-component.xml Fri Jul 13 09:48:32 2012
@@ -18,14 +18,46 @@ specific language governing permissions 
 under the License.
 -->
 
-<ofbiz-component name="birt"
+<ofbiz-component name="birt" enabled="true"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="lib/*"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
 
+    <webapp name="accounting"
+            title="Accounting"
+            server="default-server"
+            location="webapp/accounting"
+            base-permission="OFBTOOLS,ACCOUNTING"
+            mount-point="/accounting"/>
+    <webapp name="facility"
+            title="Facility"
+            description="FacilityComponentDescription"
+            server="default-server"
+            location="webapp/facility"
+            base-permission="OFBTOOLS,FACILITY"
+            mount-point="/facility"/>
+    <webapp name="order"
+            title="Order"
+            description="OrderComponentDescription"
+            server="default-server"
+            location="webapp/ordermgr"
+            base-permission="OFBTOOLS,ORDERMGR"
+            mount-point="/ordermgr"/>
+    <!-- example -->
+    <webapp name="birt"
+            title="BIRT"
+            server="default-server"
+            location="webapp/birt"
+            base-permission="OFBTOOLS,WEBTOOLS"
+            mount-point="/birt"
+            app-bar-display="false"/>
+
     <container name="birt-container" loaders="main" class="org.ofbiz.birt.container.BirtContainer"/>
+
 </ofbiz-component>

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+    <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>
+
+    <description>Extended Accounting Controller Configuration File</description>
+
+    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
+
+    <request-map uri="paymentReport">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="paymentReport"/>
+    </request-map>
+    <request-map uri="PaymentAcctgTransEntriesPdf">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/PaymentAcctgTransEntryParameters.groovy"/>
+        <response name="success" type="view" value="PaymentAcctgTransEntriesPdf"/>
+    </request-map>
+    <request-map uri="InvoiceAcctgTransEntriesPdf">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/>
+        <response name="success" type="view" value="InvoiceAcctgTransEntriesPdf"/>
+    </request-map>
+    <request-map uri="TrialBalanceSearchResultsPdf.pdf">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/TrialBalanceParameters.groovy"/>
+        <response name="success" type="view" value="TrialBalanceSearchResultsPdf"/>
+    </request-map>
+    <request-map uri="IncomeStatementListPdf.pdf">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/IncomeStatementParameters.groovy"/>
+        <response name="success" type="view" value="IncomeStatementListPdf"/>
+    </request-map>
+    <request-map uri="BalanceSheet.pdf">
+        <security auth="true" https="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/BalanceSheetParameters.groovy"/>
+        <response name="success" type="view" value="BalanceSheetPdf"/>
+    </request-map>
+    <request-map uri="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf.pdf">
+        <security auth="true" https="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/AcctgTransEntriesSearchResultsParameters.groovy"/>
+        <response name="success" type="view" value="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf"/>
+    </request-map>
+    <request-map uri="paymentReportHtml">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/webapp/accounting/WEB-INF/actions/reports/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://birt/webapp/accounting/WEB-INF/actions/reports/PaymentReport.groovy"/>
+        <response name="success" type="view" value="ViewPaymentReportPdf"/>
+    </request-map>
+
+    <view-map name="paymentReport" type="screen" page="component://birt/widget/accounting/AccountingScreens.xml#PaymentReport"/>
+    <view-map name="PaymentAcctgTransEntriesPdf" type="birt" page="component://birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="InvoiceAcctgTransEntriesPdf" type="birt" page="component://birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="TrialBalanceSearchResultsPdf" type="birt" page="component://birt/webapp/accounting/reports/TrialBalance.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="IncomeStatementListPdf" type="birt" page="component://birt/webapp/accounting/reports/IncomeStatement.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="BalanceSheetPdf" type="birt" page="component://birt/webapp/accounting/reports/BalanceSheet.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="AcctgTransEntriesSearchResultsInvoiceAndPaymentPdf" type="birt" page="component://birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign" content-type="application/pdf" encoding="none"/>
+    <view-map name="ViewPaymentReportHtml" type="birt" page="component://birt/webapp/accounting/reports/PaymentReport.rptdesign" content-type="text/html"/>
+    <view-map name="ViewPaymentReportPdf" type="birt" page="component://birt/webapp/accounting/reports/PaymentReport.rptdesign" content-type="application/pdf"/>
+
+</site-conf>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<web-app>
+    <display-name>Open For Business - Accounting Manager</display-name>
+    <description>Accounting Manager Module of the Open For Business Project</description>
+
+    <context-param>
+        <param-name>entityDelegatorName</param-name>
+        <param-value>default</param-value>
+        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+    </context-param>
+    <context-param>
+        <param-name>localDispatcherName</param-name>
+        <param-value>accounting</param-value>
+        <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+    </context-param>
+    <context-param>
+        <param-name>serviceReaderUrls</param-name>
+        <param-value>/WEB-INF/services.xml</param-value>
+        <description>Configuration File(s) For The Service Dispatcher</description>
+    </context-param>
+    <context-param>
+        <param-name>mainDecoratorLocation</param-name>
+        <param-value>component://accounting/widget/CommonScreens.xml</param-value>
+        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
+    <context-param>
+        <param-name>partyDecoratorLocation</param-name>
+        <param-value>component://accounting/widget/CommonScreens.xml</param-value>
+        <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
+
+    <filter>
+        <filter-name>ContextFilter</filter-name>
+        <display-name>ContextFilter</display-name>
+        <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
+        <init-param>
+            <param-name>disableContextSecurity</param-name>
+            <param-value>N</param-value>
+        </init-param>
+        <init-param>
+            <param-name>allowedPaths</param-name>
+            <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+        </init-param>
+        <init-param>
+            <param-name>errorCode</param-name>
+            <param-value>403</param-value>
+        </init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
+    <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+    <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
+    <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
+
+    <servlet>
+        <servlet-name>ControlServlet</servlet-name>
+        <display-name>ControlServlet</display-name>
+        <description>Main Control Servlet</description>
+        <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ControlServlet</servlet-name>
+        <url-pattern>/control/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout> <!-- in minutes -->
+    </session-config>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.htm</welcome-file>
+    </welcome-file-list>
+</web-app>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml?rev=1361130&r1=1360745&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -26,7 +26,8 @@ under the License.
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     
     <description>BIRT Component Site Configuration File</description>
-    
+
+    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
     <!--
       These can be used to return the reports as views; make sure the classes are compiled and available
         <handler name="datavision" type="view" class="org.ofbiz.webapp.view.DataVisionViewHandler"/>
@@ -70,6 +71,22 @@ under the License.
         <response name="success" type="view" value="ViewHandler"/>
     </request-map>
 
+    <!-- BIRT example Requests -->
+    <request-map uri="BirtMain">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="BirtMain"/>
+    </request-map>
+
+    <!--flot example requests-->
+    <request-map uri="ExampleBarChart">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ExampleBarChart"/>
+    </request-map>
+    <request-map uri="ExamplePieChart">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ExamplePieChart"/>
+    </request-map>
+
     <request-map uri="chartReport">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="chartReport"/>
@@ -82,10 +99,10 @@ under the License.
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
-    <view-map name="main" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>
-    <view-map name="Report" type="screen" page="component://example/widget/example/BirtScreens.xml#Report"/>
-    <view-map name="chartReport" type="screen" page="component://example/widget/example/BirtScreens.xml#chartReport"/>
-    <view-map name="Mail" type="screen" page="component://example/widget/example/BirtScreens.xml#EditMail"/>
+    <view-map name="main" type="screen" page="component://birt/widget/birt/BirtScreens.xml#main"/>
+    <view-map name="Report" type="screen" page="component://birt/widget/birt/BirtScreens.xml#Report"/>
+    <view-map name="chartReport" type="screen" page="component://birt/widget/birt/BirtScreens.xml#chartReport"/>
+    <view-map name="Mail" type="screen" page="component://birt/widget/birt/BirtScreens.xml#EditMail"/>
     
     <!-- Supported Content Types -->
     <!--
@@ -99,7 +116,7 @@ under the License.
         application/vnd.oasis.opendocument.spreadsheet
         application/vnd.oasis.opendocument.presentation
      -->
-    <view-map name="ViewHandler" type="birt" page="component://example/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
-    <view-map name="chartViewHandler" type="birt" page="component://example/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/>
+    <view-map name="ViewHandler" type="birt" page="component://birt/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
+    <view-map name="chartViewHandler" type="birt" page="component://birt/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1361130&r1=1360745&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Fri Jul 13 09:48:32 2012
@@ -33,7 +33,7 @@ under the License.
     </context-param>
     <context-param>
         <param-name>mainDecoratorLocation</param-name>
-        <param-value>component://example/widget/example/CommonScreens.xml</param-value>
+        <param-value>component://birt/widget/birt/BirtScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
     <context-param>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl?rev=1361130&r1=1360745&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/chartReport.ftl Fri Jul 13 09:48:32 2012
@@ -20,7 +20,7 @@ under the License.
 <#assign birt = JspTaglibs["/WEB-INF/birt.tld"]/>
 
 <@birt.report id="birtReport"
-    reportDesign="component://example/webapp/birt/report/chart.rptdesign"
+    reportDesign="component://birt/webapp/birt/report/chart.rptdesign"
     baseURL="/birt"
     height="700"
     width="900"

Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl?rev=1361130&r1=1360745&r2=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/birt/report.ftl Fri Jul 13 09:48:32 2012
@@ -20,7 +20,7 @@ under the License.
 <#assign birt = JspTaglibs["/WEB-INF/birt.tld"]/>
 
 <@birt.report id="birtReport"
-    reportDesign="component://example/webapp/birt/report/example.rptdesign"
+    reportDesign="component://birt/webapp/birt/report/example.rptdesign"
     baseURL="/birt"
     height="700"
     width="900"

Added: ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+    <include location="component://product/webapp/facility/WEB-INF/controller.xml"/>
+
+    <description>Extended Facility Manager Controller Configuration File</description>
+
+    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
+
+    <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://birt/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://birt/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://birt/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://birt/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://birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
+        <response name="success" type="view" value="RenderInventoryReportPPT"/>
+    </request-map>
+
+    <view-map name="InventoryReports" type="screen" page="component://birt/widget/facility/FacilityScreens.xml#InventoryReports"/>
+    <view-map name="ViewFacilityInventoryHistoryReport" type="screen" page="component://birt/widget/facility/FacilityScreens.xml#ViewFacilityInventoryHistoryReport"/>
+    <!-- Export Report -->
+    <view-map name="RenderInventoryReportHtml" type="birt" page="component://birt/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="text/html"/>
+    <view-map name="RenderInventoryReportPDF" type="birt" page="component://birt/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="RenderInventoryReportExcel" type="birt" page="component://birt/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-excel"/>
+    <view-map name="RenderInventoryReportMSWord" type="birt" page="component://birt/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-word"/>
+    <view-map name="RenderInventoryReportPPT" type="birt" page="component://birt/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-powerpoint"/>
+
+</site-conf>

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+    <include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>
+
+    <description>Extended Order Manager Controller Configuration File</description>
+
+    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
+
+
+
+    <request-map uri="checkReportBy">
+        <security https="true" auth="true"/>
+        <event type="groovy" path="component://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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://birt/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>
+
+
+    <view-map name="SalesOrderReportPDF" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="SalesOrderReportWeekPDF" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/pdf"/>
+    <view-map name="SalesOrderReportMonthPDF" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/pdf"/>
+    <view-map name="SalesOrderReportExcel" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/vnd.ms-excel"/>
+    <view-map name="SalesOrderReportWeekExcel" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/vnd.ms-excel"/>
+    <view-map name="SalesOrderReportMonthExcel" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/vnd.ms-excel"/>
+    <view-map name="SalesOrderReportHTML" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="text/html"/>
+    <view-map name="SalesOrderReportWeekHTML" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="text/html"/>
+    <view-map name="SalesOrderReportMonthHTML" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/>
+    <view-map name="NetBeforeOverheadOrderReport" type="birt" page="component://birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="ProductDemandOrderReport" type="birt" page="component://birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="OrderByReferrerReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign" content-type="application/pdf"/>
+    <view-map name="OrdersByChannelReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign" content-type="application/pdf"/>
+    <view-map name="SaleOrderDiscountCodeReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="Last3MonthsSalesReport" type="birt" page="component://birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/>
+    <view-map name="CouponSalesReport" type="birt" page="component://birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign" content-type="application/pdf"/>
+
+</site-conf>

Added: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<web-app>
+    <display-name>Open For Business - Order Manager</display-name>
+    <description>Order Manager Module of the Open For Business Project</description>
+
+    <context-param>
+        <param-name>entityDelegatorName</param-name>
+        <param-value>default</param-value>
+        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+    </context-param>
+    <context-param>
+        <param-name>localDispatcherName</param-name>
+        <param-value>order</param-value>
+        <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+    </context-param>
+    <context-param>
+        <param-name>mainDecoratorLocation</param-name>
+        <param-value>component://order/widget/ordermgr/CommonScreens.xml</param-value>
+        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
+
+    <context-param>
+        <param-name>serviceReaderUrls</param-name>
+        <param-value>/WEB-INF/services.xml</param-value>
+        <description>Configuration File(s) For The Service Dispatcher</description>
+    </context-param>
+
+    <filter>
+        <filter-name>ContextFilter</filter-name>
+        <display-name>ContextFilter</display-name>
+        <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
+        <init-param>
+            <param-name>disableContextSecurity</param-name>
+            <param-value>N</param-value>
+        </init-param>
+        <init-param>
+            <param-name>allowedPaths</param-name>
+            <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+        </init-param>
+        <init-param>
+            <param-name>errorCode</param-name>
+            <param-value>403</param-value>
+        </init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+            <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
+    <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+    <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
+    <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
+
+    <servlet>
+        <servlet-name>ControlServlet</servlet-name>
+        <display-name>ControlServlet</display-name>
+        <description>Main Control Servlet</description>
+        <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>CatalogUrlServlet</servlet-name>
+        <display-name>CatalogUrlServlet</display-name>
+        <description>Catalog (Category/Product) URL Servlet</description>
+        <servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>ControlServlet</servlet-name>
+        <url-pattern>/control/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>CatalogUrlServlet</servlet-name>
+        <url-pattern>/products/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout> <!-- in minutes -->
+    </session-config>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.htm</welcome-file>
+    </welcome-file-list>
+</web-app>

Added: ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <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>

Added: ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingScreens.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <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://birt/widget/accounting/AccountingForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Copied: ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml (from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml?p2=ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml&p1=ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml&r1=1360745&r2=1361130&rev=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/BirtForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/birt/BirtForms.xml Fri Jul 13 09:48:32 2012
@@ -25,7 +25,7 @@ under the License.
         <field name="sendFrom"><text/></field>
         <field name="sendTo"><text/></field>
         <field name="subject"><text/></field>
-        <field name="birtReportLocation" tooltip="Example is component://example/webapp/birt/report/example.rptdesign"><text/></field>
+        <field name="birtReportLocation" tooltip="Example is component://birt/webapp/birt/report/example.rptdesign"><text/></field>
         <field name="birtContentType">
             <drop-down>
                 <option key="text/html" description="text/html"/>

Added: ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/birt/BirtMenus.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+
+    <menu name="BirtAppBar" title="${uiLabelMap.BirtApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    </menu>
+    <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item>
+        <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler"/></menu-item>
+        <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item>
+        <!-- Reports using charts-->
+        <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item>
+        <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler"/></menu-item>
+    </menu>
+</menus>

Copied: ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml (from r1360745, ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml?p2=ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml&p1=ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml&r1=1360745&r2=1361130&rev=1361130&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/BirtScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml Fri Jul 13 09:48:32 2012
@@ -21,6 +21,73 @@ under the License.
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
+    <screen name="main-decorator">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
+                <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
+                    then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
+                <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
+
+                <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
+                <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
+                <!-- TODO: Use transform to specify component URI -->
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
+                <set field="activeApp" value="birt" global="true"/>
+                <set field="applicationMenuName" value="BirtAppBar" global="true"/>
+                <set field="applicationMenuLocation" value="component://birt/widget/birt/BirtMenus.xml" global="true"/>
+                <!--set field="appheaderTemplate" value="component://example/webapp/appheader.ftl"/-->
+                <set field="applicationTitle" value="${uiLabelMap.BirtExampleApplication}" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="CommonBirtDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="Birt"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="BirtTabBar" location="component://birt/widget/birt/BirtMenus.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <container style="clear" />
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="main">
         <section>
             <actions>
@@ -55,7 +122,7 @@ under the License.
                                 <screenlet title="Using report tag">
                                     <platform-specific>
                                         <html>
-                                            <html-template location="component://example/webapp/birt/birt/report.ftl"/>
+                                            <html-template location="component://birt/webapp/birt/birt/report.ftl"/>
                                         </html>
                                     </platform-specific>
                                 </screenlet>
@@ -78,7 +145,7 @@ under the License.
                         <section>
                             <widgets>
                                 <screenlet title="Send BIRT report by mail">
-                                    <include-form location="component://example/widget/example/BirtForms.xml" name="EditMail"/>
+                                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="EditMail"/>
                                 </screenlet>
                             </widgets>
                         </section>
@@ -100,7 +167,7 @@ under the License.
                             <widgets>
                                 <screenlet title="Using report tag">
                                     <platform-specific>
-                                        <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html>
+                                        <html><html-template location="component://birt/webapp/birt/birt/chartReport.ftl"/></html>
                                     </platform-specific>
                                 </screenlet>
                             </widgets>

Added: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <form name="FindFacilityInventoryByProduct" type="single" target="${facilityInventoryByProductScreen}" title=""
+          header-row-style="header-row" default-table-style="basic-table">
+        <field name="facilityId"><hidden/></field>
+        <field name="action"><hidden value="SEARCH"/></field>
+        <field name="productId" title="${uiLabelMap.ProductProductId}">
+            <text/>
+        </field>
+        <field name="internalName" title="${uiLabelMap.ProductInternalName}">
+            <text/>
+        </field>
+        <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
+            <drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD">
+                <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+                    <entity-constraint name="isPhysical"  value="Y" operator="equals"/>
+                    <entity-constraint name="parentTypeId"  value="GOOD" operator="equals"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="searchInProductCategoryId" title="${uiLabelMap.ProductCategory}"><lookup target-form-name="LookupProductCategory"></lookup></field>
+        <field name="productSupplierId" title="${uiLabelMap.ProductSupplier}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} [${partyId}]">
+                    <entity-constraint name="roleTypeId" value="SUPPLIER" operator="equals"/>
+                    <entity-order-by field-name="partyId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="statusId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
+                </entity-options>
+                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="offsetQOHQty" title="${uiLabelMap.ProductQtyOffsetQOHBelow}"><text/></field>
+        <field name="offsetATPQty" title="${uiLabelMap.ProductQtyOffsetATPBelow}"><text/></field>
+        <field name="productsSoldThruTimestamp" title="${uiLabelMap.ProductShowProductsSoldThruTimestamp}">
+            <date-time default-value="${groovy: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/>
+        </field>
+        <field name="VIEW_SIZE" entry-name="viewSize" title="${uiLabelMap.ProductShowProductsPerPage}"><text/></field>
+        <field name="monthsInPastLimit" entry-name="monthsInPastLimit"><text/></field>
+        <field name="fromDateSellThrough"><date-time/></field>
+        <field name="thruDateSellThrough"><date-time/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </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>
+</forms>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+    <screen name="InventoryReports">
+        <section>
+            <actions>
+                <set field="titleProperty" value="CommonReports"/>
+                <set field="headerItem" value="reports"/>
+                <set field="tabButtonItem" value="EditFacilityInventoryItems"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+
+                <!-- This is the target of the search form-->
+                <set field="facilityInventoryByProductScreen" value="InventoryReports"/>
+
+                <set field="facilityId" from-field="parameters.facilityId"/>
+                <set field="productTypeId" from-field="parameters.productTypeId"/>
+                <set field="searchInProductCategoryId" from-field="parameters.searchInProductCategoryId"/>
+                <set field="productSupplierId" from-field="parameters.productSupplierId"/>
+                <set field="offsetQOHQty" from-field="parameters.offsetQOHQty"/>
+                <set field="offsetATPQty" from-field="parameters.offsetATPQty"/>
+                <set field="productsSoldThruTimestamp" from-field="parameters.productsSoldThruTimestamp" type="Timestamp"/>
+                <set field="internalName" from-field="parameters.internalName"/>
+                <set field="productId" from-field="parameters.productId"/>
+
+                <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/>
+                <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?${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"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
+                            <include-form name="ListFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </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://birt/widget/facility/FacilityForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Added: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1361130&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (added)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Fri Jul 13 09:48:32 2012
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+
+    <!--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>