svn commit: r731373 [1/3] - in /ofbiz/trunk/applications: manufacturing/config/ manufacturing/webapp/manufacturing/jobshopmgt/ manufacturing/webapp/manufacturing/routing/ marketing/config/ order/config/ party/config/ party/webapp/partymgr/party/ party/...

Sun, 04 Jan 2009 14:02:56 -0800 

Author: mrisaliti
Date: Sun Jan  4 14:02:30 2009
New Revision: 731373

URL: http://svn.apache.org/viewvc?rev=731373&view=rev
Log:
A lot of cleaning into WorkEffort labels (Part of OFBIZ-1780)

Modified:
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
    
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
    ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
    ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Sun 
Jan  4 14:02:30 2009
@@ -19,26 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-    <property key="FormFieldTitle_actualCompletionDate">
-        <value xml:lang="de">Ist-Fertigstellungs-Datum</value>
-        <value xml:lang="en">Actual Completion Date</value>
-        <value xml:lang="es">Fecha de terminación real</value>
-        <value xml:lang="fr">Date exacte d'achèvement</value>
-        <value xml:lang="it">Data Completamento Attuale</value>
-        <value xml:lang="ro">Data Terminare Actuala</value>
-        <value 
xml:lang="th">วันที่ทำเสร็จจริง</value>
-        <value xml:lang="zh">实际结束日期</value>
-    </property>
-    <property key="FormFieldTitle_actualStartDate">
-        <value xml:lang="de">Ist-Start-Datum</value>
-        <value xml:lang="en">Actual Start Date</value>
-        <value xml:lang="es">Fecha de comienzo real</value>
-        <value xml:lang="fr">Date de début réelle</value>
-        <value xml:lang="it">Data Inizio Attuale</value>
-        <value xml:lang="ro">Data initiere Actuala</value>
-        <value 
xml:lang="th">วันที่เริ่มจริง</value>
-        <value xml:lang="zh">实际开始日期</value>
-    </property>
     <property key="FormFieldTitle_allocatedCost">
         <value xml:lang="de">Verrechnete Kosten</value>
         <value xml:lang="en">Allocated Cost</value>
@@ -67,7 +47,7 @@
         <value xml:lang="en">Cancel Date Time</value>
         <value xml:lang="es">Fecha y hora de cancelación</value>
         <value xml:lang="fr">Date et heure d'annulation</value>
-        <value xml:lang="it">Data/Ora di Annullamento</value>
+        <value xml:lang="it">Data/ora di annullamento</value>
         <value xml:lang="th">ยกเลิกวัน เวลา</value>
     </property>
     <property key="FormFieldTitle_costCustomMethodId">
@@ -98,16 +78,6 @@
         <value xml:lang="it">Scostamento Anni Di Default</value>
         <value 
xml:lang="th">ค่าชดเชยปีที่ผิดสัญญา</value>
     </property>
-    <property key="FormFieldTitle_estimatedCompletionDate">
-        <value xml:lang="de">Geschätztes Fertigstellungsdatum</value>
-        <value xml:lang="en">Estimated Completion Date</value>
-        <value xml:lang="es">Fecha de terminación estimada</value>
-        <value xml:lang="fr">Date prévue d'achèvement</value>
-        <value xml:lang="it">Data Completamento Stimata</value>
-        <value xml:lang="ro">Data Terminare Stimata</value>
-        <value 
xml:lang="th">วันที่คาดว่าจะเสร็จ</value>
-        <value xml:lang="zh">预计结束日期</value>
-    </property>
     <property key="FormFieldTitle_estimatedDuration">
         <value xml:lang="de">Geschätzte Dauer</value>
         <value xml:lang="en">Estimated Duration</value>
@@ -116,26 +86,6 @@
         <value xml:lang="it">Durata Stimata</value>
         <value xml:lang="th">ประมาณเวลา</value>
     </property>
-    <property key="FormFieldTitle_estimatedMilliSeconds">
-        <value xml:lang="de">Geschätzte Millisekunden</value>
-        <value xml:lang="en">Estimated Milli Seconds</value>
-        <value xml:lang="es">Milisegundos estimados</value>
-        <value xml:lang="fr">Estimation en millisecondes</value>
-        <value xml:lang="it">Milli Secondi Stimati</value>
-        <value xml:lang="ro">Milisecunde Stimate</value>
-        <value 
xml:lang="th">ประมาณเป็นพันวินาที</value>
-        <value xml:lang="zh">预计毫秒数</value>
-    </property>
-    <property key="FormFieldTitle_estimatedSetupMillis">
-        <value xml:lang="de">Geschätzte Rüstzeit (Millisekunden)</value>
-        <value xml:lang="en">Estimated Setup Millis</value>
-        <value xml:lang="es">Tiempo de setup en milisegundos</value>
-        <value xml:lang="fr">Configuration estimée en millisecondes</value>
-        <value xml:lang="it">Configurazione Stimata in Milli secondi</value>
-        <value xml:lang="ro">Configuratie Stimata in Milisecunde</value>
-        <value 
xml:lang="th">ประมาณการติดตั้ง</value>
-        <value xml:lang="zh">预计安装毫秒数</value>
-    </property>
     <property key="FormFieldTitle_estimatedStartDate">
         <value xml:lang="de">Geschätztes Start-Datum</value>
         <value xml:lang="en">Estimated Start Date</value>
@@ -154,14 +104,6 @@
         <value xml:lang="it">Fallisce se i Prodotti Non Sono 
Disponibili</value>
         <value 
xml:lang="th">เกิดความผิดพลาดถ้าไม่มีสินค้าอยู่</value>
     </property>
-    <property key="FormFieldTitle_finishDateTime">
-        <value xml:lang="de">Fertigstellungszeit</value>
-        <value xml:lang="en">Finish Date Time</value>
-        <value xml:lang="es">Fecha de terminación</value>
-        <value xml:lang="fr">Date et heure de fin</value>
-        <value xml:lang="it">Data/Ora di Termine</value>
-        <value xml:lang="th">วัน 
เวลาที่เสร็จ</value>
-    </property>
     <property key="FormFieldTitle_fixedAssetId">
         <value xml:lang="de">Anlagen-Nr.</value>
         <value xml:lang="en">Fixed Asset Id</value>
@@ -213,7 +155,7 @@
         <value xml:lang="en">Job Id</value>
         <value xml:lang="es">Código del trabajo</value>
         <value xml:lang="fr">Réf. du job</value>
-        <value xml:lang="it">Numero Lavoro</value>
+        <value xml:lang="it">Numero lavoro</value>
         <value xml:lang="th">รหัสงาน</value>
     </property>
     <property key="FormFieldTitle_jobName">
@@ -221,7 +163,7 @@
         <value xml:lang="en">Job Name</value>
         <value xml:lang="es">Nombre del trabajo</value>
         <value xml:lang="fr">Nom du job</value>
-        <value xml:lang="it">Nome Lavoro</value>
+        <value xml:lang="it">Nome lavoro</value>
         <value xml:lang="th">ชื่องาน</value>
     </property>
     <property key="FormFieldTitle_manufacturingTask">
@@ -237,9 +179,8 @@
         <value xml:lang="en">Max Retry</value>
         <value xml:lang="es">Número máximo de intentos</value>
         <value xml:lang="fr">Nb de tentatives max</value>
-        <value xml:lang="it">Tentativi Massimi</value>
-        <value xml:lang="th">ทดสอบใหม่มากสุด
-        </value>
+        <value xml:lang="it">Tentativi massimi</value>
+        <value 
xml:lang="th">ทดสอบใหม่มากสุด</value>
     </property>
     <property key="FormFieldTitle_mondayCapacity">
         <value xml:lang="de">Montagskapazität</value>
@@ -327,16 +268,6 @@
         <value xml:lang="th">การผลิตสินค้า</value>
         <value xml:lang="zh">生产运行</value>
     </property>
-    <property key="FormFieldTitle_quantityProduced">
-        <value xml:lang="de">Produzierte Menge</value>
-        <value xml:lang="en">Quantity Produced</value>
-        <value xml:lang="es">Cantidad fabricada</value>
-        <value xml:lang="fr">Quantité produite</value>
-        <value xml:lang="it">Quantità Prodotta</value>
-        <value xml:lang="ro">Cantitate Produsa</value>
-        <value xml:lang="th">จำนวนสินค้า</value>
-        <value xml:lang="zh">已生产的数量</value>
-    </property>
     <property key="FormFieldTitle_quantityToProduce">
         <value xml:lang="de">Zu produzierende Menge</value>
         <value xml:lang="en">Quantity To Produce</value>
@@ -576,7 +507,7 @@
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de fin real</value>
         <value xml:lang="fr">Date d'achèvement</value>
-        <value xml:lang="it">Data Completamento</value>
+        <value xml:lang="it">Data completamento</value>
         <value xml:lang="ro">Data Completament</value>
         <value xml:lang="th">วันที่ทำเสร็จ</value>
         <value xml:lang="zh">完成日期</value>
@@ -614,7 +545,7 @@
         <value xml:lang="en">Start Date</value>
         <value xml:lang="es">Fecha de inicio real</value>
         <value xml:lang="fr">Date de début</value>
-        <value xml:lang="it">Data Inizio</value>
+        <value xml:lang="it">Data inizio</value>
         <value xml:lang="ro">Data Initiala</value>
         <value xml:lang="th">วันที่เริ่มต้น</value>
         <value xml:lang="zh">开始日期</value>

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
 Sun Jan  4 14:02:30 2009
@@ -74,7 +74,7 @@
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell padding="2pt">
-                            
<fo:block>${uiLabelMap.FormFieldTitle_estimatedStartDate}:</fo:block>
+                            <fo:block> 
title="${uiLabelMap.ManufacturingStartDate}":</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if 
productionRunData.estimatedStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate,
 "dd/MM/yyyy")}</#if></fo:block>
@@ -88,7 +88,7 @@
                     </fo:table-row>
                     <fo:table-row>
                         <fo:table-cell padding="2pt">
-                            
<fo:block>${uiLabelMap.FormFieldTitle_estimatedCompletionDate}:</fo:block>
+                            
<fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if 
productionRunData.estimatedCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate,
 "dd/MM/yyyy")}</#if></fo:block>

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=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
 Sun Jan  4 14:02:30 2009
@@ -659,22 +659,22 @@
         <field name="workEffortName" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${workEffortName} " cache="true"/>
         </field>
-        <field name="quantityToProduce" entry-name="workEffortIdFrom">
+        <field name="quantityToProduce" 
title="${uiLabelMap.ManufacturingQuantityToProduce}" 
entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${quantityToProduce} " cache="true"/>
         </field>
-        <field name="quantityProduced" entry-name="workEffortIdFrom">
+        <field name="quantityProduced" 
title="${uiLabelMap.ManufacturingQuantityProduced}" 
entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${quantityProduced} " cache="true"/>
         </field>
-        <field name="estimatedStartDate" entry-name="workEffortIdFrom">
+        <field name="estimatedStartDate" 
title="${uiLabelMap.ManufacturingStartDate}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${estimatedStartDate} " 
cache="true"/>
         </field>
         <field name="estimatedCompletionDate" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${estimatedCompletionDate} " 
cache="true"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortIdFrom">
+        <field name="actualStartDate" 
title="${uiLabelMap.ManufacturingActualStartDate}" 
entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
-        <field name="actualCompletionDate" entry-name="workEffortIdFrom">
+        <field name="actualCompletionDate" 
title="${uiLabelMap.ManufacturingActualCompletionDate}" 
entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualCompletionDate} " 
cache="true"/>
         </field>
     </form>
@@ -686,22 +686,22 @@
         <field name="workEffortName" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${workEffortName} " cache="true"/>
         </field>
-        <field name="quantityToProduce" entry-name="workEffortIdTo">
+        <field name="quantityToProduce" 
title="${uiLabelMap.ManufacturingQuantityToProduce}" 
entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${quantityToProduce} " cache="true"/>
         </field>
-        <field name="quantityProduced" entry-name="workEffortIdTo">
+        <field name="quantityProduced" 
title="${uiLabelMap.ManufacturingQuantityProduced}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${quantityProduced} " cache="true"/>
         </field>
-        <field name="estimatedStartDate" entry-name="workEffortIdTo">
+        <field name="estimatedStartDate" 
title="${uiLabelMap.ManufacturingStartDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${estimatedStartDate} " 
cache="true"/>
         </field>
         <field name="estimatedCompletionDate" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${estimatedCompletionDate} " 
cache="true"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortIdTo">
+        <field name="actualStartDate" 
title="${uiLabelMap.ManufacturingActualStartDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
-        <field name="actualCompletionDate" entry-name="workEffortIdTo">
+        <field name="actualCompletionDate" 
title="${uiLabelMap.ManufacturingActualCompletionDate}" 
entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualCompletionDate} " 
cache="true"/>
         </field>
     </form>

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
 Sun Jan  4 14:02:30 2009
@@ -48,7 +48,7 @@
         </field>
         <field name="workEffortName" 
title="${uiLabelMap.ManufacturingRoutingName}"><display/></field>
         <field name="description"><display/></field>
-        <field name="quantityToProduce"><display/></field>
+        <field name="quantityToProduce" 
title="${uiLabelMap.ManufacturingQuantityToProduce}"><display/></field>
     </form>
     <form name="EditRouting" type="single" target="UpdateRouting" title="" 
default-map-name="routing"
         header-row-style="header-row" default-table-style="basic-table">
@@ -58,7 +58,7 @@
         <field name="workEffortId" use-when="routing!=null"><hidden/></field>
         <field name="workEffortName" 
title="${uiLabelMap.ManufacturingRoutingName}"><text/></field>
         <field name="description"><text/></field>
-        <field name="quantityToProduce"><text/></field>
+        <field name="quantityToProduce" 
title="${uiLabelMap.ManufacturingQuantityToProduce}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}">
             <submit button-type="button"/>
         </field>
@@ -105,8 +105,8 @@
         <field name="fixedAssetId">
             <display-entity entity-name="FixedAsset" 
description="${fixedAssetName}"/>
         </field>
-        <field name="estimatedSetupMillis"><display/></field>
-        <field name="estimatedMilliSeconds"><display/></field>
+        <field name="estimatedSetupMillis" 
title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><display/></field>
+        <field name="estimatedMilliSeconds" 
title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><display/></field>
     </form>
     <form name="EditRoutingTask" type="single" target="UpdateRoutingTask" 
title="" default-map-name="routingTask"
         header-row-style="header-row" default-table-style="basic-table">
@@ -130,8 +130,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="estimatedSetupMillis"><text/></field>
-        <field name="estimatedMilliSeconds"><text/></field>
+        <field name="estimatedSetupMillis" 
title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><text/></field>
+        <field name="estimatedMilliSeconds" 
title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><text/></field>
         <field name="estimateCalcMethod">
             <drop-down allow-empty="true">
                 <entity-options entity-name="CustomMethod" 
key-field-name="customMethodId" description="${description}">

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Jan  4 
14:02:30 2009
@@ -264,22 +264,6 @@
         <value xml:lang="th">งบประมาณ</value>
         <value xml:lang="zh">已预算的费用</value>
     </property>
-    <property key="FormFieldTitle_cmDetail">
-        <value xml:lang="en">Contact Mech Detail</value>
-        <value xml:lang="fr">Détail des coordonnées</value>
-        <value xml:lang="it">Dettaglio Contatto</value>
-        <value xml:lang="ro">Detaliu Contact</value>
-        <value 
xml:lang="th">รายละเอียดวิธีการติดต่อ</value>
-        <value xml:lang="zh">详细联系方式</value>
-    </property>
-    <property key="FormFieldTitle_contactListId">
-        <value xml:lang="en">Contact List Id</value>
-        <value xml:lang="fr">Réf. de liste de contact</value>
-        <value xml:lang="it">Lista di Contatto</value>
-        <value xml:lang="ro">Lista de Contact</value>
-        <value 
xml:lang="th">รหัสรายการติดต่อ</value>
-        <value xml:lang="zh">联系列表标识</value>
-    </property>
     <property key="FormFieldTitle_custReqestId">
         <value xml:lang="en">Cust Reqest Id</value>
         <value xml:lang="fr">Réf. de requête de client</value>
@@ -288,14 +272,6 @@
         <value 
xml:lang="th">รหัสคำร้องของลูกค้า</value>
         <value xml:lang="zh">客户请求标识</value>
     </property>
-    <property key="FormFieldTitle_estimatedCost">
-        <value xml:lang="en">Estimated Cost</value>
-        <value xml:lang="fr">Coût estimé</value>
-        <value xml:lang="it">Costo Stimato</value>
-        <value xml:lang="ro">Cost Stimat</value>
-        <value xml:lang="th">ประมาณราคา</value>
-        <value xml:lang="zh">预计费用</value>
-    </property>
     <property key="FormFieldTitle_partyClassificationGroupId">
         <value xml:lang="en">Party Classification Group Id</value>
         <value xml:lang="fr">Groupe de classification d'acteur</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sun Jan  4 14:02:30 
2009
@@ -274,18 +274,6 @@
         <value 
xml:lang="th">รหัสลักษณะภายนอก</value>
         <value xml:lang="zh">外部标识</value>
     </property>
-    <property key="FormFieldTitle_facilityId">
-        <value xml:lang="de">Lager ID</value>
-        <value xml:lang="en">Facility Id</value>
-        <value xml:lang="es">Código de almacén</value>
-        <value xml:lang="fr">Réf. du lieu de stockage</value>
-        <value xml:lang="it">Codice Stabilimento </value>
-        <value xml:lang="nl">Faciliteit Id</value>
-        <value xml:lang="ro">Cod Compartiment </value>
-        <value xml:lang="ru">Код склада</value>
-        <value xml:lang="th">รหัสคลังสินค้า</value>
-        <value xml:lang="zh">场所标识</value>
-    </property>
     <property key="FormFieldTitle_facilityQuantityOnHandTotal">
         <value xml:lang="de">Lagermenge Verfügbar Total</value>
         <value xml:lang="en">Facility Quantity On Hand Total</value>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Jan  4 14:02:30 
2009
@@ -71,7 +71,9 @@
         <value xml:lang="fr">Détail des coordonées</value>
         <value xml:lang="it">Dettagli Contatto</value>
         <value xml:lang="nl">Details contactmech</value>
+        <value xml:lang="ro">Detaliu Contact</value>
         <value 
xml:lang="th">รายละเอียดในการติดต่อ</value>
+        <value xml:lang="zh">详细联系方式</value>
     </property>
     <property key="FormFieldTitle_commonName">
         <value xml:lang="de">Allgemeiner Name</value>
@@ -124,7 +126,7 @@
         <value xml:lang="en">Contact List Id</value>
         <value xml:lang="es">Codigo Lista de contactos</value>
         <value xml:lang="fr">Liste de contact</value>
-        <value xml:lang="it">Lista Contatto</value>
+        <value xml:lang="it">Lista contatto</value>
         <value xml:lang="nl">ID contactlijst</value>
         <value xml:lang="ro">Lista Contact</value>
         <value xml:lang="ru">Коди контактного 
списка</value>
@@ -160,7 +162,7 @@
         <value xml:lang="en">Contact Mech Type Id</value>
         <value xml:lang="es">Código Tipo Mecanismo de contacto</value>
         <value xml:lang="fr">Réf. type de coordonées</value>
-        <value xml:lang="it">Tipo Contatto</value>
+        <value xml:lang="it">Tipo contatto</value>
         <value xml:lang="nl">Soort contactmech</value>
         <value xml:lang="ro">Tip Contact</value>
         <value xml:lang="ru">Код типа способа связи</value>
@@ -253,7 +255,9 @@
         <value xml:lang="en">Default Rate</value>
         <value xml:lang="es">Tasa por defecto</value>
         <value xml:lang="fr">Taux par défaut</value>
+        <value xml:lang="it">Percentuale di Default</value>
         <value xml:lang="nl">Standaard tarief</value>
+        <value 
xml:lang="th">ค่าเริ่มต้นอัตรา</value>
         <value xml:lang="zh">默认费率</value>
     </property>
     <property key="FormFieldTitle_disabledDateTime">
@@ -7519,6 +7523,14 @@
         <value 
xml:lang="th">รหัสประเภทสถานะกลุ่มผู้ใช้จาก
 (ใหม่)</value>
         <value xml:lang="zh">会员角色类型标识来自 (新)</value>
     </property>
+    <property key="PartyRoleTypeIdMissing">
+        <value xml:lang="en">Role Type ID is missing.</value>
+        <value xml:lang="fr">Réf. de type de rôle manquant</value>
+        <value xml:lang="it">Tipo ruolo è mancante.</value>
+        <value xml:lang="ro">Tip Rol lipseste.</value>
+        <value 
xml:lang="th">ไม่พบรหัสประเภทสถานะ</value>
+        <value xml:lang="zh">没有找到角色类型标识。</value>
+    </property>
     <property key="PartyRoleTypeIdTo">
         <value xml:lang="de">Akteur Rolle Typ ID an (neu)</value>
         <value xml:lang="en">Party Role Type Id To (NEW)</value>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml 
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sun Jan 
 4 14:02:30 2009
@@ -318,7 +318,7 @@
             <set field="periodTypeId" value="RATE_HOUR"/>
         </actions>
         <field name="partyId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" 
title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" allow-empty="false">
                 <entity-options entity-name="RateType" 
description="${description}">
                     <entity-order-by field-name="description"/>
@@ -362,7 +362,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="rateAmountFromDate"><hidden/></field>
         <field name="rateCurrencyUomId"><hidden/></field>
-        <field name="rateTypeId" 
title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType" 
also-hidden="true"/></field>
+        <field name="rateTypeId" 
title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity 
entity-name="RateType" also-hidden="true"/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType" 
description="${description}"/></field>
         <field name="rateDefaultAmount" 
use-when="&quot;workEffort&quot;.equals(rateLevel)" tooltip="Value from 
workeffort level"><display type="currency" 
currency="${rateCurrencyUomId}"/></field>
         <field name="rateDefaultAmount" 
use-when="&quot;party&quot;.equals(rateLevel)" tooltip="Value from party 
level"><display type="currency" currency="${rateCurrencyUomId}"/></field>

Modified: 
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl 
(original)
+++ 
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl 
Sun Jan  4 14:02:30 2009
@@ -57,7 +57,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -86,7 +86,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -115,7 +115,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <td>${uiLabelMap.PartyGroupPartyId}</td>
-        <#-- <td>${uiLabelMap.PartyRoleId}</td> -->
+        <#-- <td>${uiLabelMap.PartyRole}</td> -->
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Jan  4 
14:02:30 2009
@@ -1273,6 +1273,7 @@
         <value xml:lang="es">Método de cálculo estimado</value>
         <value xml:lang="fr">Methode de calcul estimé</value>
         <value xml:lang="it">Metodo Calcolo Stimato</value>
+        <value xml:lang="nl">Estimate Calc Method</value>
         <value xml:lang="ro">Metoda de Calcul Stimat</value>
         <value xml:lang="ru">Метод оценки</value>
         <value 
xml:lang="th">วิธีประมาณการคำนวน</value>
@@ -1283,7 +1284,7 @@
         <value xml:lang="en">Estimated Cost</value>
         <value xml:lang="es">Coste estimado</value>
         <value xml:lang="fr">Coût estimé</value>
-        <value xml:lang="it">Costo Stimato</value>
+        <value xml:lang="it">Costo stimato</value>
         <value xml:lang="ro">Cost Stimat</value>
         <value xml:lang="ru">Оценка стоимости</value>
         <value 
xml:lang="th">ค่าใช้จ่ายประมาณ</value>
@@ -1294,7 +1295,7 @@
         <value xml:lang="en">Est. Deliver Date</value>
         <value xml:lang="es">Fecha de recepción estimada</value>
         <value xml:lang="fr">Date de livraison estimée</value>
-        <value xml:lang="it">Data Consegna Stimata</value>
+        <value xml:lang="it">Data consegna stimata</value>
         <value xml:lang="ro">Data Livrare Stimata</value>
         <value xml:lang="ru">Ожид. дата доставки</value>
         <value 
xml:lang="th">วันที่การส่งประมาณ</value>
@@ -1402,7 +1403,8 @@
         <value xml:lang="en">Facility Id</value>
         <value xml:lang="es">Código de almacén</value>
         <value xml:lang="fr">Réf. de lieu de stockage</value>
-        <value xml:lang="it">Codice Stabilimento</value>
+        <value xml:lang="it">Codice stabilimento</value>
+        <value xml:lang="nl">Faciliteit Id</value>
         <value xml:lang="ro">Cod Compartiment</value>
         <value xml:lang="ru">Код объекта</value>
         <value xml:lang="th">รหัสคลังสินค้า</value>

Reply via email to