You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/20 20:11:08 UTC
svn commit: r746341 [1/2] - in /ofbiz/trunk:
applications/accounting/webapp/ar/ applications/accounting/widget/
applications/ecommerce/config/ applications/ecommerce/webapp/ecommerce/cart/
applications/ecommerce/webapp/ecommerce/forum/ applications/eco...
Author: mrisaliti
Date: Fri Feb 20 19:11:06 2009
New Revision: 746341
URL: http://svn.apache.org/viewvc?rev=746341&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references
Modified:
ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
ofbiz/trunk/applications/ecommerce/widget/ForumForms.xml
ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/shark/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/main.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/main.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/main.ftl Fri Feb 20 19:11:06 2009
@@ -84,12 +84,12 @@
</td>
</tr>
<tr>
- <td colspan="3"><h1>${uiLabelMap.Reports}</h1></td>
+ <td colspan="3"><h1>${uiLabelMap.AccountingReports}</h1></td>
</tr>
<tr>
<td colspan="3">
<ul>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.ReportsAvailable}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingArPageTitleListReports}</a></li>
</ul>
<br/>
</td>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Feb 20 19:11:06 2009
@@ -287,7 +287,7 @@
<not><if-empty field="invoicesOtherCurrency"/></not>
</condition>
<widgets>
- <label style="h2" text="Othercurrency invoices"/>
+ <label style="h2" text="${uiLabelMap.FormFieldTitle_otherCurrency}"/>
<include-form name="listInvoicesNotAppliedOtherCurrency" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</widgets>
</section>
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -239,39 +239,39 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸à¸²à¸£à¸£à¸§à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¸à¸à¸¸à¸ #</value>
<value xml:lang="zh">确信å
æ¬äºä½ ç订å #</value>
</property>
- <property key="EcommerceBlogAddResponse">
+ <property key="EcommerceBlogAddResponse">
<value xml:lang="en">Add a response:</value>
<value xml:lang="it">Aggiungi una risposta:</value>
</property>
- <property key="EcommerceBlogAddResponseMessage">
+ <property key="EcommerceBlogAddResponseMessage">
<value xml:lang="en">You must be logged in to add a response.</value>
<value xml:lang="it">Devi essere autenticato per aggiungere una risposta.</value>
</property>
- <property key="EcommerceBlogAddThread">
+ <property key="EcommerceBlogAddThread">
<value xml:lang="en">Add a thread:</value>
<value xml:lang="it">Aggiungi una discussione:</value>
</property>
- <property key="EcommerceBlogArticle">
+ <property key="EcommerceBlogArticle">
<value xml:lang="en">Article</value>
<value xml:lang="it">Articolo</value>
</property>
- <property key="EcommerceBlogContentNotFound">
+ <property key="EcommerceBlogContentNotFound">
<value xml:lang="en">Unable to find Blog content!</value>
<value xml:lang="it">Non è possibile trovare il contenuto Blog!</value>
</property>
- <property key="EcommerceBlogEntryId">
+ <property key="EcommerceBlogEntryId">
<value xml:lang="en">Blog entry Id</value>
<value xml:lang="it">Voce blog</value>
</property>
- <property key="EcommerceBlogFullMessage">
+ <property key="EcommerceBlogFullMessage">
<value xml:lang="en">Full message</value>
<value xml:lang="it">Messaggio completo</value>
</property>
- <property key="EcommerceBlogLatestResponses">
+ <property key="EcommerceBlogLatestResponses">
<value xml:lang="en">Latest Responses</value>
<value xml:lang="it">Ultime risposte</value>
</property>
- <property key="EcommerceBlogMessageTree">
+ <property key="EcommerceBlogMessageTree">
<value xml:lang="en">Message tree</value>
<value xml:lang="it">Albero messaggi</value>
</property>
@@ -279,27 +279,27 @@
<value xml:lang="en">Posted on</value>
<value xml:lang="it">Inviato il</value>
</property>
- <property key="EcommerceBlogPreview">
+ <property key="EcommerceBlogPreview">
<value xml:lang="en">Preview</value>
<value xml:lang="it">Anteprima</value>
</property>
- <property key="EcommerceBlogPublish">
+ <property key="EcommerceBlogPublish">
<value xml:lang="en">Publish</value>
<value xml:lang="it">Pubblica</value>
</property>
- <property key="EcommerceBlogTopCenter">
+ <property key="EcommerceBlogTopCenter">
<value xml:lang="en">Top Center</value>
<value xml:lang="it">Alto al centro</value>
</property>
- <property key="EcommerceBlogTopLeft">
+ <property key="EcommerceBlogTopLeft">
<value xml:lang="en">Top Left</value>
<value xml:lang="it">Alto a sinistra</value>
</property>
- <property key="EcommerceBlogViewArticle">
+ <property key="EcommerceBlogViewArticle">
<value xml:lang="en">View Blog Article</value>
<value xml:lang="it">Mostra articolo blog</value>
</property>
- <property key="EcommerceBronze">
+ <property key="EcommerceBronze">
<value xml:lang="en">Bronze</value>
<value xml:lang="it">Bronzo</value>
</property>
@@ -2441,6 +2441,10 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">è´ç© å表</value>
</property>
+ <property key="EcommerceShortName">
+ <value xml:lang="en">Short Name</value>
+ <value xml:lang="it">Nome corto</value>
+ </property>
<property key="EcommerceShortSubject">
<value xml:lang="de">Thema Kurz</value>
<value xml:lang="en">Short Subject</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Fri Feb 20 19:11:06 2009
@@ -116,7 +116,7 @@
${uiLabelMap.EcommerceProductNumber}<input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id?if_exists}"/>
<#-- check if rental data present insert extra fields in Quick Add-->
<#if product?exists && product.getString("productTypeId") == "ASSET_USAGE">
- ${uiLabelMap.StartDate}: <input type="text" class="inputBox" size="10" name="reservStart" value=${requestParameters.reservStart?default("")}/>
+ ${uiLabelMap.EcommerceStartDate}: <input type="text" class="inputBox" size="10" name="reservStart" value=${requestParameters.reservStart?default("")}/>
${uiLabelMap.EcommerceLength}: <input type="text" class="inputBox" size="2" name="reservLength" value=${requestParameters.reservLength?default("")}/>
</div>
<div>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Fri Feb 20 19:11:06 2009
@@ -446,7 +446,7 @@
<textarea rows="8" cols="80" />
</field>
- <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="80"/></field>
+ <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="80"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Fri Feb 20 19:11:06 2009
@@ -237,7 +237,7 @@
<#assign groupNumber = groupIdx + 1>
<option value="${groupIdx}">${uiLabelMap.CommonGroup} ${groupNumber}</option>
</#list>
- <option value="-1">${uiLabelMap.CommonNew} ${uiLabelMap.Group}</option>
+ <option value="-1">${uiLabelMap.CommonNew} ${uiLabelMap.CommonGroup}</option>
</select>
</div>
</td>
Modified: ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Fri Feb 20 19:11:06 2009
@@ -420,7 +420,7 @@
<widgets>
<container id="fin-account-list" style="screenlet">
<container style="screenlet-header">
- <label style="boxhead" text="My Accounts"/>
+ <label style="boxhead" text="${uiLabelMap.EcommerceMyAccount}"/>
</container>
<container style="screenlet-body">
<iterate-section entry="ownedFinAccount" list="ownedFinAccountList">
Modified: ofbiz/trunk/applications/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/ForumForms.xml Fri Feb 20 19:11:06 2009
@@ -27,7 +27,7 @@
<field name="forumId"><hidden value="${parameters.forumId}"/></field>
<field name="threadContentId"><hidden value="${parameters.threadContentId}"/></field>
<field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
- <field name="contentName" title="Short Name" ><text/></field>
+ <field name="contentName" title="${uiLabelMap.EcommerceShortName}"><text/></field>
<field name="contentTypeId"><hidden value="DOCUMENT"/></field>
<field name="contentIdFrom"><hidden value="${contentAssoc.contentId}"/></field>
<field name="pubPtContentId"><hidden value="${parameters.forumId}"/></field>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Fri Feb 20 19:11:06 2009
@@ -206,7 +206,7 @@
<option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/>
</drop-down>
</field>
- <field name="statusId" title="Status">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CTNT_INITIAL_DRAFT">
<option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/>
<option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Fri Feb 20 19:11:06 2009
@@ -244,26 +244,26 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="salaryFlag">
<drop-down allow-empty="false" current="selected">
- <option key="Y" description="Y"/>
- <option key="N" description="N"/>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
</drop-down>
</field>
<field name="exemptFlag">
<drop-down allow-empty="false" current="selected">
- <option key="Y" description="Y"/>
- <option key="N" description="N"/>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
</drop-down>
</field>
<field name="fulltimeFlag">
<drop-down allow-empty="false" current="selected">
- <option key="Y" description="Y"/>
- <option key="N" description="N"/>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
</drop-down>
</field>
<field name="temporaryFlag">
<drop-down allow-empty="false" current="selected">
- <option key="Y" description="Y"/>
- <option key="N" description="N"/>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
</drop-down>
</field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -208,6 +208,14 @@
<value xml:lang="th">à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">ç产è¿è¡</value>
</property>
+ <property key="ManufacturingProductionRunComponentsByFeature">
+ <value xml:lang="en">Production Runs Componentes By Feature</value>
+ <value xml:lang="it">Componenti ordini di produzione per caratteristica</value>
+ </property>
+ <property key="ManufacturingProductionRunInfoAndOrder">
+ <value xml:lang="en">Production Runs Info And Order</value>
+ <value xml:lang="it">Ordini di produzione ifnroper caratteristica</value>
+ </property>
<property key="ManufacturingProductsComponents">
<value xml:lang="en">Products Components</value>
<value xml:lang="es">Componentes de productos</value>
@@ -217,6 +225,10 @@
<value xml:lang="th">สà¹à¸§à¸à¸à¸£à¸°à¸à¸à¸à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">产åç»ä»¶</value>
</property>
+ <property key="ManufacturingProductsStacks">
+ <value xml:lang="en">Products Stacks</value>
+ <value xml:lang="it">Pila prodotti</value>
+ </property>
<property key="ManufacturingQtyM2">
<value xml:lang="en">Square meters</value>
<value xml:lang="es">Metros cuadrados</value>
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -529,6 +529,10 @@
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸ªà¹à¸§à¸à¸à¸£à¸°à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">æ产åç»ä»¶æ·»å å°ç产è¿è¡</value>
</property>
+ <property key="ManufacturingAddProductionRunRoutingTaskNotCreated">
+ <value xml:lang="en">Add Production Run Routing Task Not Created</value>
+ <value xml:lang="it">Aggiunta componente prodotto ad un´compito non creato</value>
+ </property>
<property key="ManufacturingAddQuantityProduced">
<value xml:lang="de">Produzierte Menge hinzufügen</value>
<value xml:lang="en">Add Qty Produced</value>
@@ -891,6 +895,10 @@
<value xml:lang="th">à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸</value>
<value xml:lang="zh">å®æ</value>
</property>
+ <property key="ManufacturingConfigurationNotAvailable">
+ <value xml:lang="en">Configuration Not Available</value>
+ <value xml:lang="it">Configurazione non disponibile</value>
+ </property>
<property key="ManufacturingConfirmProductionRun">
<value xml:lang="de">Bestätigen</value>
<value xml:lang="en">Confirm</value>
@@ -1643,6 +1651,10 @@
<value xml:lang="th">à¹à¸à¸´à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸à¸à¸à¸°à¸à¸µà¹à¸¥à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">å¨è¿è¡æææ¸
åå表æ¶åçé误</value>
</property>
+ <property key="ManufacturingLotNotExists">
+ <value xml:lang="en">Lot Not Exists</value>
+ <value xml:lang="it">Lotto non esiste</value>
+ </property>
<property key="ManufacturingMachine">
<value xml:lang="de">Anlage</value>
<value xml:lang="en">Fixed Asset</value>
@@ -1998,6 +2010,14 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">订åæç»</value>
</property>
+ <property key="ManufacturingPackageConfiguratorError">
+ <value xml:lang="en">Package Configurator Error</value>
+ <value xml:lang="it">Errore configurazione pacco</value>
+ </property>
+ <property key="ManufacturingPackageContentsAndOrder">
+ <value xml:lang="en">Package Contents And Order</value>
+ <value xml:lang="it">Pacco contenuti e ordine</value>
+ </property>
<property key="ManufacturingPackageLabelsReport">
<value xml:lang="de">Etiketten</value>
<value xml:lang="en">Package Labels Report</value>
@@ -2008,6 +2028,10 @@
<value xml:lang="th">รายà¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸¥à¸²à¸à¸«à¸µà¸à¸«à¹à¸</value>
<value xml:lang="zh">å
è£
æ ç¾æ¥å</value>
</property>
+ <property key="ManufacturingPackageNumber">
+ <value xml:lang="en">Package Number</value>
+ <value xml:lang="it">Numero pacco</value>
+ </property>
<property key="ManufacturingPrintProductionRun">
<value xml:lang="de">Produktionsauftrag drucken</value>
<value xml:lang="en">Manufacturing Print Production Run</value>
@@ -2027,6 +2051,10 @@
<value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸</value>
<value xml:lang="zh">å
¥åºæ°é</value>
</property>
+ <property key="ManufacturingProduceQuantityMessage">
+ <value xml:lang="en">If required, materials will be issued as well.</value>
+ <value xml:lang="it">Se richiesto, i materiali saranno prelevati.</value>
+ </property>
<property key="ManufacturingProductAssocNotExist">
<value xml:lang="de">Produkt-Zuordnung nicht vorhanden</value>
<value xml:lang="en">ProductAssoc does not exist</value>
@@ -2097,6 +2125,10 @@
<value xml:lang="th">รหัสสิà¸à¸à¹à¸²à¸à¸¶à¸</value>
<value xml:lang="zh">产åæ è¯å°</value>
</property>
+ <property key="ManufacturingProductIsWIP">
+ <value xml:lang="en">Product is WIP</value>
+ <value xml:lang="it">Prodotto è di tipo WIP</value>
+ </property>
<property key="ManufacturingProductLevel">
<value xml:lang="de">Produkt-Ebene</value>
<value xml:lang="en">Product Level</value>
@@ -2145,6 +2177,10 @@
<value xml:lang="it">Virtuale</value>
<value xml:lang="th">à¹à¸à¸¢à¸à¸±à¹à¸à¸«à¸¡à¸</value>
</property>
+ <property key="ManufacturingProductionResQtyCalc">
+ <value xml:lang="en">Production Res Qty Calc</value>
+ <value xml:lang="it">Quantità riservata produzione</value>
+ </property>
<property key="ManufacturingProductionRun">
<value xml:lang="de">Produktionsauftrag</value>
<value xml:lang="en">Production Run</value>
@@ -2183,6 +2219,22 @@
<value xml:lang="th">à¸à¸´à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">å
³éç产è¿è¡</value>
</property>
+ <property key="ManufacturingProductionRunCompletionDateNotCorrect">
+ <value xml:lang="en">Production Run Completion Date Not Correct</value>
+ <value xml:lang="it">Data completamento ordine di produzione non corretta</value>
+ </property>
+ <property key="ManufacturingProductionRunComponentAdded">
+ <value xml:lang="en">Production Run Component Added</value>
+ <value xml:lang="it">Aggiunta componente ordine di produzione</value>
+ </property>
+ <property key="ManufacturingProductionRunComponentNotAdded">
+ <value xml:lang="en">Production Run Component Not Added</value>
+ <value xml:lang="it">Componente ordine di produzione non aggiunto</value>
+ </property>
+ <property key="ManufacturingProductionRunComponentNotExists">
+ <value xml:lang="en">Production Run Component Not Exists</value>
+ <value xml:lang="it">Componente ordine di produzione non esiste</value>
+ </property>
<property key="ManufacturingProductionRunComponents">
<value xml:lang="de">Komponenten des Produktionsauftrages</value>
<value xml:lang="en">Production Run Components</value>
@@ -2191,6 +2243,10 @@
<value xml:lang="it">Compomenti Ordine di Produzione</value>
<value xml:lang="th">สà¹à¸§à¸à¸à¸£à¸°à¸à¸à¸à¸à¸à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value>
</property>
+ <property key="ManufacturingProductionRunComponentUpdated">
+ <value xml:lang="en">Production Run Component Updated</value>
+ <value xml:lang="it">Componente ordine di produzione aggiornato</value>
+ </property>
<property key="ManufacturingProductionRunCosts">
<value xml:lang="de">Produktionsauftrags-Kosten</value>
<value xml:lang="en">Production Run Costs</value>
@@ -2220,6 +2276,10 @@
<value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
<value xml:lang="zh">ç产è¿è¡æ
åµ</value>
</property>
+ <property key="ManufacturingProductionRunDeclareAndProduce">
+ <value xml:lang="en">Production Run Declare And Produce</value>
+ <value xml:lang="it">Ordine di produzione dichiara e produci</value>
+ </property>
<property key="ManufacturingProductionRunFixedAssetAssign">
<value xml:lang="de">Anlage zuweisen</value>
<value xml:lang="en">Fixed Asset Assign</value>
@@ -2267,6 +2327,14 @@
<value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸´à¸à¸à¸¥</value>
<value xml:lang="zh">ç产è¿è¡å称</value>
</property>
+ <property key="ManufacturingProductionRunNotCreated">
+ <value xml:lang="en">Production Run Not Created</value>
+ <value xml:lang="it">Ordine di produzione non creato</value>
+ </property>
+ <property key="ManufacturingProductionRunNotExists">
+ <value xml:lang="en">Production Run Not Exists</value>
+ <value xml:lang="it">Ordine di produzione non esiste</value>
+ </property>
<property key="ManufacturingProductionRunNotUpdated">
<value xml:lang="de">Aktualisierung des Produktionsauftrages nicht erfolgreich, für weitere Informationen siehe Log</value>
<value xml:lang="en">Production Run update failed see log for more information</value>
@@ -2285,6 +2353,22 @@
<value xml:lang="it">Stampa documento ordine di produzione</value>
<value xml:lang="th">à¸à¸´à¸¡à¸à¹à¹à¸à¸à¸ªà¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
</property>
+ <property key="ManufacturingProductionRunPrinted">
+ <value xml:lang="en">Production Run Printed</value>
+ <value xml:lang="it">Ordine di produzione stampato</value>
+ </property>
+ <property key="ManufacturingProductionRunPriorityMissing">
+ <value xml:lang="en">Production Run Priority Missing</value>
+ <value xml:lang="it">Ordine di produzione priorità mancante</value>
+ </property>
+ <property key="ManufacturingProductionRunProduce">
+ <value xml:lang="en">Production Run Produce</value>
+ <value xml:lang="it">Ordine di produzione prodotto</value>
+ </property>
+ <property key="ManufacturingProductionRunProductProducedNotStillAvailable">
+ <value xml:lang="en">Production Run Product Produce Not Still Available</value>
+ <value xml:lang="it">Ordine di produzione prodotto da produrre non ancora disponibile</value>
+ </property>
<property key="ManufacturingProductionRunProductComponent">
<value xml:lang="de">Komponente für Produktionsauftrag</value>
<value xml:lang="en">Production Run Product Component</value>
@@ -2343,6 +2427,38 @@
<value xml:lang="it">Stato Ordine di Produzione cambiato con successo.</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¸ªà¸à¸²à¸à¸°à¸à¸²à¸£à¸à¸¥à¸´à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§</value>
</property>
+ <property key="ManufacturingProductionRunStatusNotChanged">
+ <value xml:lang="en">Production Run Status Not Changed</value>
+ <value xml:lang="it">Stato ordine di produzione non cambiato</value>
+ </property>
+ <property key="ManufacturingProductionRunStatusNotChangedMandatoryProductionRunFound">
+ <value xml:lang="en">Production Run Status Not Changed Mandatory Production Run Found</value>
+ <value xml:lang="it">Stato ordine di produzione non cambiato per l'ordine di produzione trovato</value>
+ </property>
+ <property key="ManufacturingProductionRunStatusNotChangedMandatoryProductionRunNotCompleted">
+ <value xml:lang="en">Production Run Status Not Changed Mandatory Production Run Not Completed</value>
+ <value xml:lang="it">Stato ordine di produzione non cambiato per l'ordine di produzione non completato</value>
+ </property>
+ <property key="ManufacturingProductionRunTaskCannotStartDocsNotPrinted">
+ <value xml:lang="en">Production Run Task Cannot Start Docs Not Printed</value>
+ <value xml:lang="it">Compito ordine di produzione non può iniziare con documento non stampato</value>
+ </property>
+ <property key="ManufacturingProductionRunTaskCannotStartPrevTasksNotCompleted">
+ <value xml:lang="en">Production Run Task Cannot Start Prev Tasks Not Completed</value>
+ <value xml:lang="it">Compito ordine di produzione non può iniziare un precedente compito non completato</value>
+ </property>
+ <property key="ManufacturingProductionRunTaskNotExists">
+ <value xml:lang="en">Production Run Task Not Exists</value>
+ <value xml:lang="it">Compito ordine di produzione non esiste</value>
+ </property>
+ <property key="ManufacturingProductionRunTaskNotRunning">
+ <value xml:lang="en">Production Run Task Not Running</value>
+ <value xml:lang="it">Compito ordine di produzione non in esecuzione</value>
+ </property>
+ <property key="ManufacturingProductionRunTaskStatusChanged">
+ <value xml:lang="en">Production Run Task Status Changed</value>
+ <value xml:lang="it">Compito ordine di produzione stato cambiato</value>
+ </property>
<property key="ManufacturingProductionRunTasks">
<value xml:lang="de">Arbeitsgänge des Produktionsauftrages</value>
<value xml:lang="en">Production Run Tasks</value>
@@ -2509,6 +2625,18 @@
<value xml:lang="it">Fabbisogno</value>
<value xml:lang="th">รหัสà¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£</value>
</property>
+ <property key="ManufacturingRequirementNotDeleted">
+ <value xml:lang="en">Requirement Non Deleted</value>
+ <value xml:lang="it">Fabbisogno non cancellato</value>
+ </property>
+ <property key="ManufacturingRequirementNotExists">
+ <value xml:lang="en">Requirement Non Exists</value>
+ <value xml:lang="it">Fabbisogno non esistente</value>
+ </property>
+ <property key="ManufacturingRequirementNotUpdated">
+ <value xml:lang="en">Requirement Non Updated</value>
+ <value xml:lang="it">Fabbisogno non aggiornato</value>
+ </property>
<property key="ManufacturingRequirementStartDate">
<value xml:lang="de">Start-Datum Bedarf</value>
<value xml:lang="en">Requirement Start Date</value>
@@ -2665,6 +2793,22 @@
<value xml:lang="th">รหัสà¸à¸²à¸£à¸à¸³à¸à¸²à¸</value>
<value xml:lang="zh">è§ç¨ä»»å¡æ è¯</value>
</property>
+ <property key="ManufacturingRoutingTaskIdMissing">
+ <value xml:lang="en">Routing Task Id Missing</value>
+ <value xml:lang="it">Codice operazione mancante</value>
+ </property>
+ <property key="ManufacturingRoutingTaskNotExists">
+ <value xml:lang="en">Routing Task Not Exists</value>
+ <value xml:lang="it">Codice operazione non esiste</value>
+ </property>
+ <property key="ManufacturingRoutingTaskSeqIdAlreadyExist">
+ <value xml:lang="en">Routing Task Seq Id Already Exists</value>
+ <value xml:lang="it">Codice operazione sequenza già esistente</value>
+ </property>
+ <property key="ManufacturingRoutingTaskStartDateBeforePRun">
+ <value xml:lang="en">Routing Task Start Date Before Production Run</value>
+ <value xml:lang="it">Codice operazione data inizio prima dell'ordine di produzione</value>
+ </property>
<property key="ManufacturingRoutingTaskToMissing">
<value xml:lang="de">Arbeitsgang An fehlt</value>
<value xml:lang="en">Routing Task To is Missing</value>
@@ -2723,6 +2867,10 @@
<value xml:lang="th">à¸à¸´à¹à¸à¸ªà¹à¸§à¸à¸à¸£à¸°à¸à¸à¸ %</value>
<value xml:lang="zh">åºåå ç´ %</value>
</property>
+ <property key="ManufacturingSelectedFeatures">
+ <value xml:lang="en">Selected Features</value>
+ <value xml:lang="it">Caratteristica selezionata</value>
+ </property>
<property key="ManufacturingShipmentPlanStockReport">
<value xml:lang="de">Bericht über Bestände für Versand-Plan</value>
<value xml:lang="en">Shipment Plan Stock Report </value>
@@ -2743,6 +2891,10 @@
<value xml:lang="th">à¹à¸à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸</value>
<value xml:lang="zh">è¿è¾è®¡å</value>
</property>
+ <property key="ManufacturingShipmentWorkEffortTasks">
+ <value xml:lang="en">Shipment WorkEffort Tasks</value>
+ <value xml:lang="it">Compiti impegni di lavoro spedizione</value>
+ </property>
<property key="ManufacturingShowBOMAssocs">
<value xml:lang="de">Stückliste anzeigen</value>
<value xml:lang="en">Show BOM</value>
Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Feb 20 19:11:06 2009
@@ -209,7 +209,7 @@
// Find the product
product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExists", locale));
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExist", locale));
}
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
@@ -1178,7 +1178,7 @@
// Find the product
GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExists", locale));
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExist", locale));
}
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
@@ -1252,7 +1252,7 @@
// Find the product
GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExists", locale));
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductNotExist", locale));
}
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Fri Feb 20 19:11:06 2009
@@ -36,7 +36,6 @@
<div class="screenlet-body">
<#if product?has_content>
<a href="<@o...@ofbizUrl>?productId=${productId}&bomType=${productAssocTypeId}" class="buttontext">${uiLabelMap.ManufacturingBillOfMaterials}</a>
- <!--<a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.ManufacturingProductRoutings}]</a></span>-->
</#if>
<br/>
<br/>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl Fri Feb 20 19:11:06 2009
@@ -19,10 +19,4 @@
<#if mrpName?exists>
<h1>${uiLabelMap.ManufacturingMrpName} ${mrpName?if_exists}</h1>
- <#--
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingMRPPRunsProductsByFeature}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsComponentsByFeature}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsComponentsByFeature1}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsProductsStacks}</a></div>
- -->
</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Fri Feb 20 19:11:06 2009
@@ -258,7 +258,7 @@
<form name="ProductionRunDeclareAndProduceTop" type="single" skip-end="true" target="productionRunDeclareAndProduce" title="" default-map-name="productionRunData"
header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortId"><hidden/></field>
- <field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}" tooltip="If required, materials will be issued as well."><text/></field>
+ <field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}" tooltip="${uiLabelMap.ManufacturingProduceQuantityMessage}"><text/></field>
<field name="inventoryItemTypeId">
<drop-down allow-empty="false" no-current-selected-key="NON_SERIAL_INV_ITEM">
<entity-options entity-name="InventoryItemType" description="${description}"/>
@@ -776,7 +776,7 @@
<field name="productionRunId"><hidden/></field>
<field name="fromDate"><ignored/></field>
<field name="reserveOrderEnumId"><ignored/></field>
- <field name="workEffortId" title="${uiLabelMap.ManufacturingTask}">
+ <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskId}">
<drop-down allow-empty="false">
<entity-options entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]">
<entity-constraint name="workEffortParentId" env-name="productionRunId"/>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Fri Feb 20 19:11:06 2009
@@ -35,15 +35,6 @@
</#if>
<div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
- <#-- new reports -->
- <#--
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsProductsByFeature}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature2}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingSPPRunsComponentsByFeature3}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageContentsAndOrder}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsProductsAndOrder}</a></div>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPRunsInfoAndOrder}</a></div>
- -->
</div>
</div>
<#else>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl Fri Feb 20 19:11:06 2009
@@ -20,7 +20,7 @@
<#-- Mandatory work efforts -->
<#if mandatoryWorkEfforts?has_content>
<p>
- ${uiLabelMap.ManufacturingMandatoryProductionRuns}
+ ${uiLabelMap.ManufacturingMandatoryWorkEfforts}
<#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
<#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
<#if "PRUN_COMPLETED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_CLOSED" == mandatoryWorkEffort.getString("currentStatusId")>
@@ -38,7 +38,7 @@
<#-- Dependent work efforts -->
<#if dependentWorkEfforts?has_content>
<p>
- ${uiLabelMap.ManufacturingDependentProductionRuns}
+ ${uiLabelMap.ManufacturingDependentWorkEfforts}
<#list dependentWorkEfforts as dependentWorkEffortAssoc>
<#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
<#if "PRUN_COMPLETED" == dependentWorkEffort.currentStatusId || "PRUN_CLOSED" == dependentWorkEffort.currentStatusId>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl Fri Feb 20 19:11:06 2009
@@ -113,7 +113,7 @@
<fo:inline font-size="10pt">${uiLabelMap.ManufacturingEstimatedShipDate} :</fo:inline>
<fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate?if_exists}</fo:inline>
<#else>
- <fo:inline font-size="10pt">${uiLabelMap.PickingPeriod} :</fo:inline>
+ <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPickingPeriod} :</fo:inline>
<fo:inline font-weight="bold" font-size="10pt">${mrpName}</fo:inline>
</#if>
</fo:block>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl Fri Feb 20 19:11:06 2009
@@ -89,7 +89,7 @@
</fo:table-cell>
<fo:table-cell>
<fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
- <fo:inline font-size="8pt">${uiLabelMap.PackageNumber}: </fo:inline>
+ <fo:inline font-size="8pt">${uiLabelMap.ManufacturingPackageNumber}: </fo:inline>
<fo:inline font-size="11pt">${package.packageId}</fo:inline>
</fo:block>
</fo:table-cell>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Fri Feb 20 19:11:06 2009
@@ -430,7 +430,7 @@
<property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="titleProperty" value="ProductionRunReport"/>
+ <set field="titleProperty" value="ManufacturingReports"/>
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Fri Feb 20 19:11:06 2009
@@ -57,7 +57,7 @@
<screen name="CuttingListReport">
<section>
<actions>
- <set field="title" value="Cutting List Report"/>
+ <set field="titlePropery" value="ManufacturingCuttingListReport"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
@@ -75,7 +75,7 @@
<screen name="MRPPRunsProductsByFeature">
<section>
<actions>
- <set field="title" value="MRPPRunsProductsByFeature"/>
+ <set field="titleProperty" value="ManufacturingProductionRunComponentsByFeature"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
@@ -99,7 +99,7 @@
<screen name="SPPRunsProductsByFeature">
<section>
<actions>
- <set field="title" value="SPPRunsProductsByFeature"/>
+ <set field="titleProperty" value="ManufacturingProductionRunComponentsByFeature"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="planName" value="SP_${shipmentId}"/>
@@ -126,7 +126,7 @@
<screen name="MRPPRunsComponentsByFeature">
<section>
<actions>
- <set field="title" value="MRPPRunsComponentsByFeature"/>
+ <set field="titleProperty" value="ManufacturingProductionRunComponentsByFeature"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
@@ -151,7 +151,7 @@
<screen name="SPPRunsComponentsByFeature">
<section>
<actions>
- <set field="title" value="SPPRunsComponentsByFeature"/>
+ <set field="titleProperty" value="ManufacturingProductionRunComponentsByFeature"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="planName" value="SP_${shipmentId}"/>
<set field="showLocation" from-field="parameters.showLocation"/>
@@ -180,7 +180,7 @@
<screen name="PRunsProductsStacks">
<section>
<actions>
- <set field="title" value="PRunsProductsStacks"/>
+ <set field="titleProperty" value="ManufacturingProductsStacks"/>
<set field="mrpName" from-field="parameters.mrpName"/>
<set field="planName" value="MRP_${mrpName}"/>
@@ -206,14 +206,15 @@
<screen name="PackageContentsAndOrder">
<section>
<actions>
- <set field="title" value="PackageContentsAndOrder"/>
+ <set field="titleProperty" value="ManufacturingPackageContentsAndOrder"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="planName" value="SP_${shipmentId}"/>
<set field="taskNamePar" from-field="parameters.taskNamePar"/>
<set field="productCategoryIdPar" from-field="parameters.productCategoryIdPar"/>
<set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/>
-
+
+ <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
@@ -232,7 +233,7 @@
<screen name="PRunsProductsAndOrder">
<section>
<actions>
- <set field="title" value="PRunsProductsAndOrder"/>
+ <set field="titleProperty" value="ManufacturingPackageContentsAndOrder"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="planName" value="SP_${shipmentId}"/>
@@ -257,7 +258,7 @@
<screen name="PRunsInfoAndOrder">
<section>
<actions>
- <set field="title" value="PRunsInfoAndOrder"/>
+ <set field="titleProperty" value="ManufacturingProductionRunInfoAndOrder"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="planName" value="SP_${shipmentId}"/>
@@ -282,7 +283,7 @@
<screen name="ShipmentPlanStockReport">
<section>
<actions>
- <set field="title" value="ShipmentPlanStockReport"/>
+ <set field="titleProperty" value="ManufacturingShipmentPlanStockReport"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
@@ -301,10 +302,11 @@
<screen name="ShipmentLabel">
<section>
<actions>
- <set field="title" value="ShipmentLabel"/>
+ <set field="titleProperty" value="ProductShippingLabel"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy"/>
@@ -320,7 +322,7 @@
<screen name="ShipmentWorkEffortTasks">
<section>
<actions>
- <set field="title" value="ShipmentWorkEffortTasks"/>
+ <set field="titleProperty" value="ManufacturingShipmentWorkEffortTasks"/>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -812,6 +812,10 @@
<value xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¹à¸¥à¹à¸à¹ URL</value>
<value xml:lang="zh">æ¿ä»£å¾½æ ç½å</value>
</property>
+ <property key="MarketingTrackingCodeProdCatalogId">
+ <value xml:lang="en">Tracking Code Prod Catalog Id</value>
+ <value xml:lang="it">Codice tracciatura catalogo</value>
+ </property>
<property key="MarketingTrackingCodeRedirectUrl">
<value xml:lang="en">Redirect URL</value>
<value xml:lang="es">URL</value>
@@ -968,6 +972,10 @@
<value xml:lang="th">รหัสà¹à¸«à¸¥à¹à¸à¸à¸µà¹à¸¡à¸²</value>
<value xml:lang="zh">æºæ è¯</value>
</property>
+ <property key="MarketingTrackingCodeVisitUserLoginId">
+ <value xml:lang="en">Tracking Code Visit User Login Id</value>
+ <value xml:lang="it">Codice tracciatura utente visita</value>
+ </property>
<property key="MarketingTrackingCodeVisitVisitId">
<value xml:lang="en">Visit Id</value>
<value xml:lang="es">Código de visita</value>
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Fri Feb 20 19:11:06 2009
@@ -1011,7 +1011,7 @@
this.cart.setCurrency(this.dispatcher,currencyUomId);
result = ServiceUtil.returnSuccess();
} catch (CartItemModifyException ex) {
- result = ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"Set currency error",this.cart.getLocale()) + ex.getMessage());
+ result = ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderSetCurrencyError",this.cart.getLocale()) + ex.getMessage());
return result;
}
return result;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Fri Feb 20 19:11:06 2009
@@ -365,7 +365,7 @@
<input type="radio" name="checkOutPaymentId" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span>${uiLabelMap.FinancialAccount} #${finAccount.finAccountId}</span>
+ <span>${uiLabelMap.AccountingFinAccount} #${finAccount.finAccountId}</span>
</td>
</tr>
</#list>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Fri Feb 20 19:11:06 2009
@@ -108,10 +108,10 @@
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="addFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="addFromShoppingList?shoppingListId=${shoppingListId}" description="View List" also-hidden="false"/>
+ <hyperlink target="addFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" also-hidden="false"/>
</field>
<field name="addAllFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="Quick Add All" also-hidden="false"/>
+ <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"/>
</field>
</form>
<form name="AddFromShoppingList" type="list" list-name="shoppinglistitems" target=""
@@ -127,7 +127,7 @@
</form>
<form name="AddFromShoppingListAll" type="single" target="">
<field name="addAllFromList" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="Quick Add All" also-hidden="false"/>
+ <hyperlink target="addAllFromShoppingList?shoppingListId=${shoppingListId}" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false"/>
</field>
<field name="returnToOrderEntry" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="orderentry" description="${uiLabelMap.OrderOrderReturn}" also-hidden="false"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Fri Feb 20 19:11:06 2009
@@ -27,7 +27,7 @@
<screen name="OrderPDF">
<section>
<actions>
- <set field="title" value="Order"/>
+ <set field="titleProperty" value="OrderOrder"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
@@ -141,7 +141,7 @@
<screen name="ShipGroupsPDF">
<section>
<actions>
- <set field="title" value="Ship Groups"/>
+ <set field="titleProperty" value="OrderShipGroups"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri Feb 20 19:11:06 2009
@@ -351,7 +351,7 @@
<order-by field-name="-lastUpdatedStamp" />
</entity-and>
</actions>
- <field name="_rowSubmit" title="S">
+ <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
<check/>
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
@@ -645,7 +645,7 @@
<field name="note" widget-area-style="fieldWidth200">
<display />
</field>
- <field name="_rowSubmit" title="S">
+ <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
<check />
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Fri Feb 20 19:11:06 2009
@@ -202,8 +202,8 @@
</field>
<field name="showInSelect">
<drop-down allow-empty="true">
- <option key="Y" description="Y"/>
- <option key="N" description="N"/>
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Feb 20 19:11:06 2009
@@ -772,7 +772,7 @@
<field name="timeEntryId"><hidden/></field>
<field name="timesheetId">
<lookup size="10" target-form-name="LookupTimesheet">
- <sub-hyperlink target="EditTimesheet?timesheetId=${timesheetId}" link-style="buttontext" description="TS:${timesheetId}"/>
+ <sub-hyperlink target="EditTimesheet?timesheetId=${timesheetId}" link-style="buttontext" description="${uiLabelMap.WorkEffortTimesheet}:${timesheetId}"/>
</lookup>
</field>
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Fri Feb 20 19:11:06 2009
@@ -123,14 +123,14 @@
</fo:table-row>
<#if scheduleWorkEffort?has_content>
<fo:table-row>
- <fo:table-cell><fo:block>${uiLabelMap.WorkEffortActualStartDate}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_actualStartDate}</fo:block></fo:table-cell>
<#if scheduleWorkEffort.actualStartDate?has_content>
<#assign actualStartDate = scheduleWorkEffort.get("actualStartDate")>
<fo:table-cell><fo:block>${actualStartDate?string.short}</fo:block></fo:table-cell>
<#else>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</#if>
- <fo:table-cell><fo:block>${uiLabelMap.WorkEffortActualCompletionDate}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_actualCompletionDate}</fo:block></fo:table-cell>
<#if scheduleWorkEffort.actualCompletionDate?has_content>
<#assign actualCompletionDate = scheduleWorkEffort.get("actualCompletionDate")>
<fo:table-cell><fo:block>${actualCompletionDate?string.short}</fo:block></fo:table-cell>
@@ -141,7 +141,7 @@
<#assign workEffortPurposeType = scheduleWorkEffort.getRelatedOne("WorkEffortPurposeType")?if_exists>
<#if workEffortPurposeType?has_content>
<fo:table-row>
- <fo:table-cell><fo:block>${uiLabelMap.WorkEffortWorkEffortPurposeTypeId}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.FormFieldTitle_workEffortPurposeTypeId}</fo:block></fo:table-cell>
<fo:table-cell number-columns-spanned="3"><fo:block>${workEffortPurposeType.workEffortPurposeTypeId}--${workEffortPurposeType.description}</fo:block></fo:table-cell>
</fo:table-row>
</#if>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Fri Feb 20 19:11:06 2009
@@ -37,7 +37,7 @@
<field name="workEffortIdFrom"><hidden value="${parameters.workEffortIdFrom}"/></field>
<field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>
<field name="fromDate"><hidden value="${parameters.fromDate}"/></field>
- <field map-name="workEffortAssoc" name="workEffortAssocTypeId" title="${uiLabelMap.WorkEffortWorkEffortAssocTypeId}" use-when="workEffortIdFrom!=null">
+ <field map-name="workEffortAssoc" name="workEffortAssocTypeId" title="${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}" use-when="workEffortIdFrom!=null">
<display-entity entity-name="WorkEffortAssocType" description="${description}"/>
</field>
<!-- End of child workeffort fields -->
Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -181,6 +181,10 @@
<value xml:lang="it">Mio profilo</value>
<value xml:lang="th">à¸à¸£à¸°à¸§à¸±à¸à¸´à¸ªà¹à¸§à¸à¸à¸±à¸§à¸à¸à¸à¸à¸±à¸</value>
</property>
+ <property key="MyPageSendEmailToEveryCustomerRequestChange">
+ <value xml:lang="en">Send Email To Every Customer Request Change</value>
+ <value xml:lang="it">Invia email ad ogni cambio richiesta cliente</value>
+ </property>
<property key="MyPageTaskActEndDate">
<value xml:lang="en">Task Act End</value>
<value xml:lang="fr">Fin réelle de de la tâche</value>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Feb 20 19:11:06 2009
@@ -80,7 +80,7 @@
<form name="custPreferences" type="single" target="updateCustPreferences" default-map-name="preferences.userPrefMap">
<field name="userPrefGroupTypeId"><hidden value="MyPage"/></field>
- <field name="sendCustRequestEmail" title="Send Email To Every Customer Request Change"><check/></field>
+ <field name="sendCustRequestEmail" title="${uiLabelMap.MyPageSendEmailToEveryCustomerRequestChange}"><check/></field>
<field name="updateButton"><submit/></field>
</form>
@@ -109,7 +109,7 @@
<field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
<hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&donePage=${parameters.donePage}"/>
</field>
- <field name="_rowSubmit" title="S">
+ <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
<check />
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Fri Feb 20 19:11:06 2009
@@ -128,7 +128,7 @@
<field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
<hyperlink description="${subject}" target="deleteCommunicationEvents?portalPageId=${parameters.portalPageId}"/>
</field>
- <field name="_rowSubmit" title="S">
+ <field name="_rowSubmit" title="${uiLabelMap.CommonYes}">
<check />
</field>
<field name="deleteSelectedButton" widget-style="smallSubmit">
@@ -306,7 +306,7 @@
<form name="RegisterPerson" type="single" target="createRegister" default-map-name="personInfo"
focus-field-name="salutation" header-row-style="header-row" default-table-style="basic-table">
<field name="webSiteId"><hidden value="${webSiteId}"/></field>
- <field name="salutation" title="Salutation" ><text size="40" maxlength="60"/></field>
+ <field name="salutation"><text size="40" maxlength="60"/></field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field>
<field name="middleName" title="${uiLabelMap.PartyMiddleName}" ><text size="40" maxlength="60"/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field>
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Feb 20 19:11:06 2009
@@ -806,7 +806,7 @@
// store the "order"
if (UtilValidate.isEmpty(this.orderId)){ // if order does not exist
- output.print(UtilProperties.getMessage(PosTransaction.resource,"Saving",defaultLocale));
+ output.print(UtilProperties.getMessage(PosTransaction.resource,"PosSaving",defaultLocale));
Map orderRes = ch.createOrder(session.getUserLogin());
//Debug.log("Create Order Resp : " + orderRes, module);
@@ -1395,7 +1395,6 @@
cart.setOrderName(shoppingListName);
//cart.setExternalId(shoppingListName);
//cart.setInternalCode("Internal Code");
- //Debug.logInfo(UtilProperties.getMessage("pos","Saving",defaultLocale), module);
//ch.setCheckOutOptions(null, null, null, null, null, "shipping instructions", null, null, null, "InternalId", null, null, null);
Map orderRes = ch.createOrder(session.getUserLogin());
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Fri Feb 20 19:11:06 2009
@@ -897,6 +897,10 @@
<value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸§à¸²à¸à¹à¸à¸</value>
<value xml:lang="zh">已计åå·¥æ¶</value>
</property>
+ <property key="ProjectMgrPrintableNote">
+ <value xml:lang="en">Printable Note</value>
+ <value xml:lang="it">Nota stampabile</value>
+ </property>
<property key="ProjectMgrPrivateOrPublic">
<value xml:lang="en">Private/Public</value>
<value xml:lang="fr">Privé/Public</value>
@@ -1061,6 +1065,10 @@
<value xml:lang="th">หยุà¸à¹à¸§à¹à¸à¸±à¹à¸§à¸à¸£à¸²à¸§</value>
<value xml:lang="zh">æå</value>
</property>
+ <property key="ProjectMgrSetStatusInProgress">
+ <value xml:lang="en">Set status to In Progress</value>
+ <value xml:lang="it">Imposta stato a in corso</value>
+ </property>
<property key="ProjectMgrSkillStandards">
<value xml:lang="en">Skill Standards</value>
<value xml:lang="fr">Compétences standards</value>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Feb 20 19:11:06 2009
@@ -399,7 +399,7 @@
</condition>
<link target="TimeSheetStatusToComplete?timesheetId=${timesheet.timesheetId}&statusId=TIMESHEET_COMPLETED"/>
</menu-item>
- <menu-item name="TimeSheetStatustoProgress" title="Set status to In Progress">
+ <menu-item name="TimeSheetStatustoProgress" title="${uiLabelMap.ProjectMgrSetStatusInProgress}">
<condition>
<and>
<not><if-empty field="timesheet"/></not>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Fri Feb 20 19:11:06 2009
@@ -131,7 +131,7 @@
<include-form name="ViewRequestWorkEfforts" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent">
- <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}" text="New Content"/>
+ <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}" text="${uiLabelMap.CommonNew} ${uiLabelMap.ContentContent}"/>
<include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</container>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Fri Feb 20 19:11:06 2009
@@ -156,7 +156,7 @@
<screen name="MyTimesheet">
<section>
<actions>
- <set field="titleProperty" value="TimesheetMyTime"/>
+ <set field="titleProperty" value="WorkEffortMyTimesheets"/>
<set field="headerItem" value="mytimesheet"/>
<set field="tabButtonItem" value="edittimesheet"/>
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=746341&r1=746340&r2=746341&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Feb 20 19:11:06 2009
@@ -186,7 +186,7 @@
<field name="estimatedStartDate"><display type="date"/></field>
<field name="estimatedCompletionDate"><display type="date"/></field>
<field name="actualStartDate"><display type="date"/></field>
- <field name="actualCompletionDate"><display type="date"/></field>
+ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
<field name="plannedHours"><display/></field>
<field name="actualHours"><display/></field>
<field name="createdStamp"><display type="date"/></field>
@@ -241,8 +241,8 @@
<option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
</drop-down>
</field>
- <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field>
- <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field>
+ <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field>
+ <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
@@ -549,8 +549,8 @@
</field>
<field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}" widget-area-style="centered"><display type="date"/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" widget-area-style="centered"><display type="date"/></field>
- <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}" widget-area-style="centered"><display type="date"/></field>
- <field name="actualCompletionDate" title="${uiLabelMap.ProjectMgrWorkEffortActualCompletionDate}" widget-area-style="centered"><display type="date"/></field>
+ <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}" widget-area-style="centered"><display type="date"/></field>
+ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}" widget-area-style="centered"><display type="date"/></field>
<field name="plannedHours" widget-area-style="centered"><display/></field>
<field name="actualHours" widget-area-style="centered"><display/></field>
<field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}&statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>