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 2013/09/12 19:07:12 UTC
svn commit: r1522664 - in /ofbiz/trunk/applications:
order/widget/ordermgr/ReportScreens.xml
product/webapp/facility/WEB-INF/controller.xml
Author: jleroux
Date: Thu Sep 12 17:07:12 2013
New Revision: 1522664
URL: http://svn.apache.org/r1522664
Log:
Following Jacopo's message on dev ML: http://markmail.org/message/yuogfjxddq2mum45
This reverts changes done for OFBIZ-5297
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1522664&r1=1522663&r2=1522664&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Thu Sep 12 17:07:12 2013
@@ -26,12 +26,10 @@ under the License.
<actions>
<set field="titleProperty" value="OrderReports"/>
<set field="headerItem" value="reports"/>
- <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="h3">${uiLabelMap.BirtOrderReportsWarning}</label>
<include-portal-page id="OrderReportPage"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1522664&r1=1522663&r2=1522664&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Thu Sep 12 17:07:12 2013
@@ -22,7 +22,7 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<include location="component://commonext/webapp/WEB-INF/controller.xml"/>
- <include location="component://birt/webapp/facility/WEB-INF/controller.xml" if-present="true"/>
+ <include location="component://birt/webapp/accounting/WEB-INF/controller.xml" if-present="true"/>
<description>Facility Manager Module Site Configuration File</description>