You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/10/03 08:59:10 UTC
svn commit: r1763132 - in /ofbiz/trunk: applications/order/data/
specialpurpose/birt/config/ specialpurpose/birt/data/
specialpurpose/birt/webapp/ordermgr/WEB-INF/
specialpurpose/birt/webapp/ordermgr/reports/
specialpurpose/birt/widget/order/
Author: jleroux
Date: Mon Oct 3 08:59:10 2016
New Revision: 1763132
URL: http://svn.apache.org/viewvc?rev=1763132&view=rev
Log:
Fixes: Net Before Overhead Report is not working
(OFBIZ-7317)
Here is the patch that removes the NBO(Net Before Overhead) report from the
trunk. In the patch I have also removed the Demo data which is required by this
report only.
Note : Please remove below data from existing database to avoid any data
related problem in OrderPortletData.xml
<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"/>
Thanks: Rohit Koushal
Removed:
ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
Modified:
ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
Modified: ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml?rev=1763132&r1=1763131&r2=1763132&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml Mon Oct 3 08:59:10 2016
@@ -108,11 +108,6 @@
<value xml:lang="fr">Ventes des 3 derniers mois</value>
<value xml:lang="zh">最近3个月的销售报告</value>
</property>
- <property key="BirtOrderReportNetBeforeOverheadReport">
- <value xml:lang="en">Net Before Overhead Report</value>
- <value xml:lang="fr">Net avant frais généraux</value>
- <value xml:lang="zh">计入制造费用前的净值报表</value>
- </property>
<property key="BirtOrderReportProductDemandReport">
<value xml:lang="en">Product Demand Report</value>
<value xml:lang="fr">Demandes par produit</value>
Modified: ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml?rev=1763132&r1=1763131&r2=1763132&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml Mon Oct 3 08:59:10 2016
@@ -58,14 +58,6 @@
<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"
Modified: 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=1763132&r1=1763131&r2=1763132&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml Mon Oct 3 08:59:10 2016
@@ -81,10 +81,6 @@ under the License.
<event type="groovy" path="component://birt/groovyScripts/order/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/groovyScripts/order/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/groovyScripts/order/ProductDemandReport.groovy"/>
<response name="success" type="view" value="ProductDemandOrderReport"/>
@@ -119,7 +115,6 @@ under the License.
<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="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"/>
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1763132&r1=1763131&r2=1763132&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Mon Oct 3 08:59:10 2016
@@ -43,18 +43,6 @@ under the License.
<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" target-window="_BLANK">
- <field name="productStoreId">
- <drop-down allow-empty="true">
- <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" target-window="_BLANK">
<field name="productStoreId">
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml?rev=1763132&r1=1763131&r2=1763132&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml Mon Oct 3 08:59:10 2016
@@ -37,20 +37,6 @@ under the License.
</section>
</screen>
- <screen name="NetBeforeOverheadReport">
- <section>
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.BirtOrderReportNetBeforeOverheadReport}">
- <include-form name="NetBeforeOverheadReport" location="component://birt/widget/order/OrderForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
-
<screen name="ProductDemandReport">
<section>
<actions>
@@ -136,21 +122,6 @@ under the License.
</platform-specific>
</screenlet>
</widgets>
- </section>
- </screen>
-
- <screen name="NetBeforeOverheadOrderReport">
- <section>
- <actions>
- <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.BirtOrderReportNetBeforeOverheadReport}">
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
- </platform-specific>
- </screenlet>
- </widgets>
</section>
</screen>