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/10 21:08:30 UTC
svn commit: r1521589 - in /ofbiz/trunk: applications/order/widget/ordermgr/
framework/bi/config/ framework/bi/widget/ framework/common/config/
specialpurpose/birt/config/ specialpurpose/birt/webapp/ordermgr/reports/
specialpurpose/birt/widget/order/
Author: jleroux
Date: Tue Sep 10 19:08:29 2013
New Revision: 1521589
URL: http://svn.apache.org/r1521589
Log:
For "Order Report Issue" https://issues.apache.org/jira/browse/OFBIZ-5297
The quickInitDataWarehouse BI button used these dates (set in BI main screen)
<set field="fromDate" value="2008-01-01 00:00:00.0" type="Timestamp"/>
<set field="thruDate" value="2010-01-01 00:00:00.0" type="Timestamp"/>
This generated 1000+ records. I set 10 years ahead (from sept. 2013) in a new bi.properties file used by the BI main screen. So it generates only 3000+ records (and others related in BI DB) which is still reasonable. A message, placed at the top of the Order Reports page, informs users that for 4 Birt reports s/he needs 1st to run the data warehouse init using the BI button. Also this message clarifies the range, to be certain that in 10 years people will still easily know what to change...
I have also replaced a lot of labels and added English and French translations (by-product: some labels cleaning in CommonUiLabels.xml)
I did not do the same for the accounting paymentReport and ViewFacilityInventoryHistoryReport facility Birt reports which only need translation.
I noticed that there are no ways to get to ViewFacilityInventoryHistoryReport from UI though!
Added:
ofbiz/trunk/framework/bi/config/bi.properties (with props)
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/framework/bi/widget/BiScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.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=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Tue Sep 10 19:08:29 2013
@@ -26,10 +26,12 @@ 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>
Added: ofbiz/trunk/framework/bi/config/bi.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/config/bi.properties?rev=1521589&view=auto
==============================================================================
--- ofbiz/trunk/framework/bi/config/bi.properties (added)
+++ ofbiz/trunk/framework/bi/config/bi.properties Tue Sep 10 19:08:29 2013
@@ -0,0 +1,2 @@
+fromDate=2013-09-01
+thruDate=2023-09-01
\ No newline at end of file
Propchange: ofbiz/trunk/framework/bi/config/bi.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/bi/config/bi.properties
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/bi/config/bi.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/bi/widget/BiScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/widget/BiScreens.xml?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/widget/BiScreens.xml (original)
+++ ofbiz/trunk/framework/bi/widget/BiScreens.xml Tue Sep 10 19:08:29 2013
@@ -102,12 +102,15 @@ under the License.
<actions>
<set field="titleProperty" value="BusinessIntelligenceMainPage"/>
<set field="headerItem" value="main"/>
- <set field="fromDate" value="2008-01-01 00:00:00.0" type="Timestamp"/>
- <set field="thruDate" value="2010-01-01 00:00:00.0" type="Timestamp"/>
+ <property-to-field resource="bi" property="fromDate" field="fromDateProp" no-locale="true"/>
+ <property-to-field resource="bi" property="thruDate" field="thruDateProp" no-locale="true"/>
+ <set field="fromDate" from-field="fromDateProp" type="Timestamp"/>
+ <set field="thruDate" from-field="thruDateProp" type="Timestamp"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <label>fromDateProp = ${fromDateProp}</label>
<screenlet>
<container>
<platform-specific>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Sep 10 19:08:29 2013
@@ -7100,7 +7100,7 @@
<value xml:lang="zh">没æçï¼ _NA_</value>
</property>
<property key="CommonNoStatesProvincesExists">
- <value xml:lang="cs">Žádný Kraj/Samosprávný celek neexistuje</value>
+ <value xml:lang="cs">Žádný Kraj/Samosprávný celek neexistuje</value>
<value xml:lang="de">Es existiert kein Bundesland</value>
<value xml:lang="en">No States/Provinces exist</value>
<value xml:lang="es">No existen provincias</value>
@@ -12251,6 +12251,10 @@
<value xml:lang="zh-CN">ææ</value>
<value xml:lang="zh-TW">ææ</value>
</property>
+ <property key="CommonWeeks">
+ <value xml:lang="en">Weeks</value>
+ <value xml:lang="fr">Semaines</value>
+ </property>
<property key="CommonWeekly">
<value xml:lang="ar">أسبÙعÙا</value>
<value xml:lang="cs">TýdnÄ</value>
@@ -13772,7 +13776,7 @@
<value xml:lang="zh">å¸å¼</value>
<value xml:lang="zh-TW">å¹£å¥</value>
</property>
- <property key="FormFieldTitle_updateButton">
+ <property key="FormFieldTitle_updateButton">
<value xml:lang="ar">تØدÙØ«</value>
<value xml:lang="cs">Obnovit</value>
<value xml:lang="de">Aktualisieren</value>
Modified: ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml Tue Sep 10 19:08:29 2013
@@ -37,14 +37,59 @@
<value xml:lang="ja">Eclipse BIRT æ¥å</value>
<value xml:lang="th">Eclipse BIRT Application</value>
<value xml:lang="zh">Eclipse BIRTåºç¨ç¨åº</value>
- </property>
- <property key="FrameworkBirt">
- <value xml:lang="en">Framework Eclipse BIRT</value>
- <value xml:lang="ja">Eclipse BIRT ãã¬ã¼ã ã¯ã¼ã¯</value>
- <value xml:lang="th">Framework Eclipse BIRT</value>
- <value xml:lang="zh">Eclipse BIRTæ¡æ¶</value>
- </property>
-
+ </property>
+ <property key="BirtOrderReportAllReferrer">
+ <value xml:lang="en">All Referrer</value>
+ <value xml:lang="fr">Tous apporteurs d'affaires</value>
+ </property>
+ <property key="BirtOrderReportAllOrderItemsWithDiscountCode">
+ <value xml:lang="en">All order items with discount code</value>
+ <value xml:lang="fr">Tous les lignes de commandes ayant des codes promotionels</value>
+ </property>
+ <property key="BirtOrderReportCouponSalesReport">
+ <value xml:lang="en">Coupon Sales Report</value>
+ <value xml:lang="fr">Ventes promotionelles</value>
+ </property>
+ <property key="BirtOrderReportFormatType">
+ <value xml:lang="en">Format Type</value>
+ <value xml:lang="fr">Format : </value>
+ </property>
+ <property key="BirtOrderReportLast3MonthsSalesReport">
+ <value xml:lang="en">Last 3 Months Sales Report</value>
+ <value xml:lang="fr">Ventes des 3 derniers mois</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>
+ </property>
+ <property key="BirtOrderReportOrderByReferrer">
+ <value xml:lang="en">Order By Referrer</value>
+ <value xml:lang="fr">Commandes par apporteurs d'affaires</value>
+ </property>
+ <property key="BirtOrderReportProductDemandReport">
+ <value xml:lang="en">Product Demand Report</value>
+ <value xml:lang="fr">Demandes par produit</value>
+ </property>
+ <property key="BirtOrderReportReportBy">
+ <value xml:lang="en">Report By</value>
+ <value xml:lang="fr">Par : </value>
+ </property>
+ <property key="BirtOrderReportSalesReport">
+ <value xml:lang="en">Sales Report</value>
+ <value xml:lang="fr">Ventes depuis :</value>
+ </property>
+ <property key="BirtOrderReportSaleOrderDiscountCode">
+ <value xml:lang="en">Sales Order Discount Code</value>
+ <value xml:lang="fr">Ventes par codes promotionels</value>
+ </property>
+ <property key="BirtOrderReportSaleOrdersByChannel">
+ <value xml:lang="en">Sale Orders By Channel</value>
+ <value xml:lang="fr">Ventes par canaux</value>
+ </property>
+ <property key="BirtOrderReportsWarning">
+ <value xml:lang="en">Four Birt reports (Last 3 Months Sales, Sales, Sales Order Discount Code, Product Demand) require to feed the BI data base (note that the bi.properties file will need to be updated after September 2023). Then only new approved orders will be taken into account</value>
+ <value xml:lang="fr">Quatre tableau créés par Birt (Ventes des 3 derniers mois, Ventes, Ventes par codes promotionels, Demandes par produit) nécessitent d'alimenter la base de données d'Inform. décis. (notez aussi la mà j du fichier bi.properties nécessaire après septembre 2023). Seulemnt ensuite les commandes approuvées seront prises en compte.</value>
+ </property>
<property key="ExampleBirtExamples">
<value xml:lang="en">BIRT Examples</value>
<value xml:lang="ja">BIRT ãµã³ãã«</value>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign Tue Sep 10 19:08:29 2013
@@ -464,7 +464,7 @@ return true;]]></method>
<property name="fontWeight">bolder</property>
<property name="textAlign">center</property>
<property name="contentType">auto</property>
- <text-property name="content"><![CDATA[Orders By Sale Channel]]></text-property>
+ <text-property name="content"><![CDATA[Orders By Sales Channel]]></text-property>
</text>
<text id="577"/>
<extended-item extensionName="Crosstab" extensionVersion="2.5.0" id="634">
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Tue Sep 10 19:08:29 2013
@@ -26,14 +26,14 @@ under the License.
<form name="SalesReport" type="single" target="checkReportBy" title=""
header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field>
- <field name="reportBy" title="Report By">
+ <field name="reportBy" title="${uiLabelMap.BirtOrderReportReportBy}">
<drop-down>
- <option key="day" description="Days"></option>
- <option key="week" description="Weeks"></option>
- <option key="month" description="Months"></option>
+ <option key="day" description="${uiLabelMap.CommonDays}"></option>
+ <option key="week" description="${uiLabelMap.CommonWeeks}"></option>
+ <option key="month" description="${uiLabelMap.CommonMonths}"></option>
</drop-down>
</field>
- <field name="exportType" title="Format Type">
+ <field name="exportType" title="${uiLabelMap.BirtOrderReportFormatType}">
<drop-down>
<option key="pdf" description="PDF"></option>
<option key="excel" description="Excel"></option>
@@ -71,11 +71,11 @@ under the License.
<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="referrerUrl" title=" "><display description="${uiLabelMap.BirtOrderReportAllReferrer}"></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">
+ <field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
@@ -86,7 +86,7 @@ under the License.
<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="discountCodeUrl" title=" "><display description="${uiLabelMap.BirtOrderReportAllOrderItemsWithDiscountCode}"></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">
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml?rev=1521589&r1=1521588&r2=1521589&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml Tue Sep 10 19:08:29 2013
@@ -27,9 +27,10 @@ under the License.
<section>
<actions>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
- <screenlet title="Sales Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportSalesReport}">
<include-form name="SalesReport" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -40,9 +41,10 @@ under the License.
<section>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
- <screenlet title="Net Before Overhead Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportNetBeforeOverheadReport}">
<include-form name="NetBeforeOverheadReport" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -53,19 +55,23 @@ under the License.
<section>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
- <screenlet title="Product Demand Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportProductDemandReport}">
<include-form name="ProductDemandReport" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
</section>
</screen>
<!-- Sale Order By Referrer -->
- <screen name="SaleOrdersByReferrerReport">
+ <screen name="SaleOrdersByReferrerReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <screenlet title="Sale Orders by Referrer Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportOrderByReferrer}">
<include-form name="OrderByReferrer" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -74,8 +80,12 @@ under the License.
<!-- Sale Order By Channel -->
<screen name="SaleOrdersByChannelReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <screenlet title="Sale Orders By Channel Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportSaleOrdersByChannel}">
<include-form name="SaleOrdersByChannel" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -84,8 +94,11 @@ under the License.
<!-- Sale Order with Discount Code -->
<screen name="SaleOrderDiscountCodeReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <screenlet title="Sale Orders Discount Code Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportSaleOrderDiscountCode}">
<include-form name="SaleOrderDiscountCode" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -94,8 +107,11 @@ under the License.
<!-- Last Three Months Sales Report -->
<screen name="Last3MonthsSalesReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <screenlet title="Last Three Months Sales Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportLast3MonthsSalesReport}">
<include-form name="Last3MonthsSalesReport" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
@@ -104,20 +120,21 @@ under the License.
<!-- Coupon Sales Report -->
<screen name="CouponSalesReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <screenlet title="Coupon Sales Report">
+ <screenlet title="${uiLabelMap.BirtOrderReportCouponSalesReport}">
<include-form name="CouponSalesReport" location="component://birt/widget/order/OrderForms.xml"/>
</screenlet>
</widgets>
</section>
</screen>
-
-
-
<screen name="SalesOrderReport">
<section>
<actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
<entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList">
<condition-list combine="and">
<condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-empty="true"/>
@@ -126,29 +143,41 @@ under the License.
</entity-condition>
</actions>
<widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
- </platform-specific>
+ <screenlet title="${uiLabelMap.BirtOrderReportSalesReport}">
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml>
+ </platform-specific>
+ </screenlet>
</widgets>
</section>
</screen>
<screen name="NetBeforeOverheadOrderReport">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
- </platform-specific>
+ <screenlet title="${uiLabelMap.BirtOrderReportNetBeforeOverheadReport}">
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml>
+ </platform-specific>
+ </screenlet>
</widgets>
</section>
</screen>
<screen name="ProductDemandOrderReport ">
<section>
+ <actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
- <platform-specific>
- <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
- </platform-specific>
+ <screenlet title="${uiLabelMap.BirtOrderReportProductDemandReport}">
+ <platform-specific>
+ <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml>
+ </platform-specific>
+ </screenlet>
</widgets>
</section>
</screen>