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/13 07:37:37 UTC
svn commit: r1522782 - in /ofbiz/trunk: applications/product/config/
specialpurpose/birt/config/
specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/
specialpurpose/birt/webapp/facility/inventory/report/
specialpurpose/birt/widget/facility/
Author: jleroux
Date: Fri Sep 13 05:37:37 2013
New Revision: 1522782
URL: http://svn.apache.org/r1522782
Log:
I18n of FacilityInventoryHistoryReport, I moved the labels from Product to birt application, they could have stayed there, but I preferred to have them in one place. We need to i18n the Birt reports also
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign
ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Sep 13 05:37:37 2013
@@ -221,13 +221,6 @@
<value xml:lang="vi">ÄÆ¡n vá» tÃnh của sản phẩm trong kho chứa ${lookupPKMap.inventoryItemId} không thá» bá» cấm.</value>
<value xml:lang="zh">åºåæç» ${lookupPKMap.inventoryItemId} çåä½ææ¬ä¸è½æ¯è´çã</value>
</property>
- <property key="FacilityInventoryHistoryReport">
- <value xml:lang="en">Inventory History Report</value>
- <value xml:lang="it">Report storia inventario</value>
- <value xml:lang="ja">å¨åº«å±¥æ´ã¬ãã¼ã</value>
- <value xml:lang="vi">Báo cáo lá»ch sá» kho (Inventory)</value>
- <value xml:lang="zh">åºååå²è®°å½æ¥å</value>
- </property>
<property key="FacilityMultipleLocations">
<value xml:lang="en">Multiple Locations</value>
<value xml:lang="it">Posizioni multiple</value>
Modified: ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml Fri Sep 13 05:37:37 2013
@@ -37,23 +37,35 @@
<value xml:lang="ja">Eclipse BIRT æ¥å</value>
<value xml:lang="th">Eclipse BIRT Application</value>
<value xml:lang="zh">Eclipse BIRTåºç¨ç¨åº</value>
- </property>
+ </property>
+ <property key="BirtFacilityReportInventoryHistoryReport">
+ <value xml:lang="en">Inventory History Report</value>
+ <value xml:lang="fr">Historique du stock</value>
+ <value xml:lang="it">Report storia inventario</value>
+ <value xml:lang="ja">å¨åº«å±¥æ´ã¬ãã¼ã</value>
+ <value xml:lang="vi">Báo cáo lá»ch sá» kho (Inventory)</value>
+ <value xml:lang="zh">åºååå²è®°å½æ¥å</value>
+ </property>
+ <property key="BirtFacilityReportLastIntMonth">
+ <value xml:lang="en">Number of last month to sold out</value>
+ <value xml:lang="fr">Ruptures de stock, pour le nombre de derniers mois : </value>
+ </property>
<property key="BirtOrderReportAllReferrer">
<value xml:lang="en">All Referrer</value>
<value xml:lang="fr">Tous apporteurs d'affaires</value>
- </property>
+ </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>
<property key="BirtOrderReportCouponSalesReport">
<value xml:lang="en">Coupon Sales Report</value>
<value xml:lang="fr">Ventes promotionelles</value>
- </property>
+ </property>
<property key="BirtOrderReportFormatType">
<value xml:lang="en">Format Type</value>
<value xml:lang="fr">Format : </value>
- </property>
+ </property>
<property key="BirtOrderReportLast3MonthsSalesReport">
<value xml:lang="en">Last 3 Months Sales Report</value>
<value xml:lang="fr">Ventes des 3 derniers mois</value>
@@ -89,7 +101,7 @@
<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>
<property key="ExampleBirtExamples">
<value xml:lang="en">BIRT Examples</value>
<value xml:lang="ja">BIRT ãµã³ãã«</value>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy Fri Sep 13 05:37:37 2013
@@ -46,7 +46,6 @@
}else{
fromDateTime = UtilDateTime.getDayStart(UtilDateTime.toTimestamp(UtilDateTime.nowTimestamp()), (lastIntMonth*(-30)));
fromOrderDate = UtilDateTime.toDateString(fromDateTime,"MMMM dd, yyyy")
- Debug.logInfo("====fromDate======="+fromOrderDate.toString(),"");
}
birtParameters.facilityId = request.getParameter("facilityId");
Modified: ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign Fri Sep 13 05:37:37 2013
@@ -622,7 +622,7 @@ if(order = orders.next()){
<label id="413">
<property name="fontWeight">bold</property>
<property name="color">gray</property>
- <text-property name="text">Item sold out summary</text-property>
+ <text-property name="text">${uiLabelMap.BirtFacilityReportInventoryHistoryReport}</text-property>
</label>
</cell>
<cell id="198"/>
Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml Fri Sep 13 05:37:37 2013
@@ -87,7 +87,7 @@ under the License.
<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="lastIntMonth" title="${uiLabelMap.BirtFacilityReportLastIntMonth}"><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"/>
Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml?rev=1522782&r1=1522781&r2=1522782&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityScreens.xml Fri Sep 13 05:37:37 2013
@@ -24,6 +24,7 @@ under the License.
<screen name="InventoryReports">
<section>
<actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="CommonReports"/>
<set field="headerItem" value="reports"/>
<set field="tabButtonItem" value="EditFacilityInventoryItems"/>
@@ -55,7 +56,7 @@ under the License.
<container>
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
+ <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}" text="${uiLabelMap.BirtFacilityReportInventoryHistoryReport}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
<include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -72,6 +73,7 @@ under the License.
<screen name="ViewFacilityInventoryHistoryReport">
<section>
<actions>
+ <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
<set field="headerItem" value="reports"/>
<set field="facilityId" from-field="parameters.facilityId"/>
<entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
@@ -85,9 +87,9 @@ under the License.
<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"/>
+ <link target="ViewFacilityInventoryHistoryReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.BirtFacilityReportInventoryHistoryReport}" style="buttontext"/>
</container>
- <screenlet title="${uiLabelMap.FacilityInventoryHistoryReport}">
+ <screenlet title="${uiLabelMap.BirtFacilityReportInventoryHistoryReport}">
<include-form name="ViewFacilityInventoryHistoryReportForm" location="component://birt/widget/facility/FacilityForms.xml"/>
</screenlet>
</decorator-section>