svn commit: r731303 - in /ofbiz/trunk/applications: accounting/config/ manufacturing/config/ manufacturing/webapp/manufacturing/reports/ marketing/config/ order/config/ order/src/org/ofbiz/order/shoppingcart/ party/config/ workeffort/script/org/ofbiz/w...

Sun, 04 Jan 2009 09:58:34 -0800 

Author: mrisaliti
Date: Sun Jan  4 09:58:06 2009
New Revision: 731303

URL: http://svn.apache.org/viewvc?rev=731303&view=rev
Log:
A lot of Marketing/Manufacturing/Workeffort labels cleaning (Part of OFBIZ-1780)

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
    
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
    
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
    ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml 
(original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Sun 
Jan  4 09:58:06 2009
@@ -2350,17 +2350,21 @@
         <value xml:lang="zh">所得税</value>
     </property>
     <property key="TaxAuthorityRateType.description.SALES_TAX">
+        <value xml:lang="de">Verkaufssteuer</value>
         <value xml:lang="en">Sales Tax</value>
-        <value xml:lang="fr">Taxes sur les ventes</value>
-        <value xml:lang="it">Tasse Vendita</value>
+        <value xml:lang="es">Impuesto de ventas</value>
+        <value xml:lang="fr">TVA</value>
+        <value xml:lang="it">Tasse vendita</value>
         <value xml:lang="ro">Taxe Vanzare</value>
         <value xml:lang="ru">Налог на продажи</value>
         <value xml:lang="th">ภาษีขาย</value>
         <value xml:lang="zh">营业税</value>
     </property>
     <property key="TaxAuthorityRateType.description.USE_TAX">
+        <value xml:lang="de">Gebrauchssteuer</value>
         <value xml:lang="en">Use Tax</value>
-        <value xml:lang="fr">Taxes à l'utilisation</value>
+        <value xml:lang="es">Impuesto de uso</value>
+        <value xml:lang="fr">Taxe d'utilisation (pas en France)</value>
         <value xml:lang="it">Tassa sull'utilizzo</value>
         <value xml:lang="ro">Foloseste Taxe</value>
         <value xml:lang="ru">Налог на использование</value>

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml 
Sun Jan  4 09:58:06 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="MrpEventType.description.MANUF_ORDER_RECP">
         <value xml:lang="en">Manufacturing Order receipt</value>
         <value xml:lang="es">Recibo de Orden de Producción</value>

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml 
Sun Jan  4 09:58:06 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="CommonCompletionDate">
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de Términación</value>
@@ -189,15 +190,6 @@
         <value 
xml:lang="th">จำนวนที่ต้องการ</value>
         <value xml:lang="zh">需要数量</value>
     </property>
-    <property key="ManufacturingNoDataAvailable">
-        <value xml:lang="en">No Data Available</value>
-        <value xml:lang="es">No hay datos disponibles</value>
-        <value xml:lang="fr">Aucune date disponible</value>
-        <value xml:lang="it">Nessun Dato Disponibile</value>
-        <value xml:lang="ro">Nici-o Data Disponibila</value>
-        <value 
xml:lang="th">ไม่มีข้อมูลที่สามารถใช้ได้</value>
-        <value xml:lang="zh">没有可用的数据</value>
-    </property>
     <property key="ManufacturingOnHandQuantity">
         <value xml:lang="en">On Hand Quantity</value>
         <value xml:lang="es">Cantidad disponible (QOH)</value>
@@ -225,6 +217,15 @@
         <value 
xml:lang="th">การดำเนินการสำหรับการขนส่ง</value>
         <value xml:lang="zh">运输操作运行</value>
     </property>
+    <property key="ManufacturingPlan">
+        <value xml:lang="en">Manufacturing Plan</value>
+        <value xml:lang="es">Plan de producción</value>
+        <value xml:lang="fr">Plan de fabrication</value>
+        <value xml:lang="it">Piano di produzione</value>
+        <value xml:lang="ro">Plan de productie</value>
+        <value xml:lang="th">แผนการผลิต</value>
+        <value xml:lang="zh">制造计划</value>
+    </property>
     <property key="ManufacturingPackage">
         <value xml:lang="en">Package</value>
         <value xml:lang="es">Paquete</value>
@@ -234,24 +235,6 @@
         <value xml:lang="th">หีบห่อ</value>
         <value xml:lang="zh">包装</value>
     </property>
-    <property key="ManufacturingProductionRun">
-        <value xml:lang="en">Production Run</value>
-        <value xml:lang="es">Orden de Producción</value>
-        <value xml:lang="fr">Cadence de production</value>
-        <value xml:lang="it">Ordine di Produzione</value>
-        <value xml:lang="ro">Comanda de Productie</value>
-        <value xml:lang="th">การผลิตสินค้า</value>
-        <value xml:lang="zh">生产运行</value>
-    </property>
-    <property key="ManufacturingProductionRunId">
-        <value xml:lang="en">Production Run ID</value>
-        <value xml:lang="es">Código de Orden de Producción</value>
-        <value xml:lang="fr">Réf. de cadence de production</value>
-        <value xml:lang="it">N.Ord.Prod.</value>
-        <value xml:lang="ro">N.Com.Productie</value>
-        <value 
xml:lang="th">รหัสการผลิตสินค้า</value>
-        <value xml:lang="zh">生产运行标识</value>
-    </property>
     <property key="ManufacturingProductionRuns">
         <value xml:lang="en">Production Runs</value>
         <value xml:lang="es">Orden de Producción</value>
@@ -324,15 +307,6 @@
         <value 
xml:lang="th">ศูนย์กลางการทำงาน</value>
         <value xml:lang="zh">工作中心</value>
     </property>
-    <property key="OrderOrderId">
-        <value xml:lang="en">Order Id</value>
-        <value xml:lang="es">Código de pedido</value>
-        <value xml:lang="fr">Réf. de commande</value>
-        <value xml:lang="it">Numero Ordine</value>
-        <value xml:lang="ro">Numar comanda</value>
-        <value 
xml:lang="th">รหัสการสั่งซื้อ</value>
-        <value xml:lang="zh">订单标识</value>
-    </property>
     <property key="PanelNumber">
         <value xml:lang="en">Panel number</value>
         <value xml:lang="es">Número de panneau</value>
@@ -369,15 +343,6 @@
         <value xml:lang="th">เลือกระยะเวลา</value>
         <value xml:lang="zh">分拣阶段</value>
     </property>
-    <property key="ProductFacilityLocation">
-        <value xml:lang="en">Location</value>
-        <value xml:lang="es">Ubicación</value>
-        <value xml:lang="fr">Emplacement</value>
-        <value xml:lang="it">Ubicazione</value>
-        <value xml:lang="ro">Locatie</value>
-        <value xml:lang="th">ที่ตั้ง</value>
-        <value xml:lang="zh">地点</value>
-    </property>
     <property key="ProductProductBrandName">
         <value xml:lang="en">Draw no</value>
         <value xml:lang="es">Marca</value>
@@ -387,61 +352,6 @@
         <value xml:lang="th">หมายเลขการวาด</value>
         <value xml:lang="zh">设计编号</value>
     </property>
-    <property key="ProductProductCategory">
-        <value xml:lang="de">Kategorie</value>
-        <value xml:lang="en">Category</value>
-        <value xml:lang="es">Categoría</value>
-        <value xml:lang="fr">Catégorie</value>
-        <value xml:lang="it">Categoria</value>
-        <value xml:lang="ro">Categorie</value>
-        <value xml:lang="th">หมวดหมู่</value>
-        <value xml:lang="zh">分类</value>
-    </property>
-    <property key="ProductProductHeight">
-        <value xml:lang="en">Height</value>
-        <value xml:lang="es">Altura</value>
-        <value xml:lang="fr">Taille</value>
-        <value xml:lang="it">altezza</value>
-        <value xml:lang="ro">Inaltime</value>
-        <value xml:lang="th">สูง</value>
-        <value xml:lang="zh">高度</value>
-    </property>
-    <property key="ProductProductId">
-        <value xml:lang="en">Product ID</value>
-        <value xml:lang="es">Código de Producto</value>
-        <value xml:lang="fr">Réf. d'article</value>
-        <value xml:lang="it">Codice Prodotto</value>
-        <value xml:lang="ro">Cod Produs</value>
-        <value xml:lang="th">รหัสสินค้า</value>
-        <value xml:lang="zh">产品标识</value>
-    </property>
-    <property key="ProductProductWidth">
-        <value xml:lang="en">Width</value>
-        <value xml:lang="es">Anchura</value>
-        <value xml:lang="fr">Largeur</value>
-        <value xml:lang="it">larghezza</value>
-        <value xml:lang="ro">latime</value>
-        <value xml:lang="th">กว้าง</value>
-        <value xml:lang="zh">宽度</value>
-    </property>
-    <property key="ProductShipmentPlan">
-        <value xml:lang="en">Shipment Plan</value>
-        <value xml:lang="es">Plan de envío</value>
-        <value xml:lang="fr">Plan d'expédition</value>
-        <value xml:lang="it">Piano di Spedizione</value>
-        <value xml:lang="ro">Plan de Expediere</value>
-        <value xml:lang="th">แผนการขนส่ง</value>
-        <value xml:lang="zh">运输计划</value>
-    </property>
-    <property key="WorkEffortName">
-        <value xml:lang="en">Manufacturing Plan</value>
-        <value xml:lang="es">Plan de producción</value>
-        <value xml:lang="fr">Plan de fabrication</value>
-        <value xml:lang="it">Piano di produzione</value>
-        <value xml:lang="ro">Plan de productie</value>
-        <value xml:lang="th">แผนการผลิต</value>
-        <value xml:lang="zh">制造计划</value>
-    </property>
     <property key="estimatedCompletionDate">
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha estimada de términación</value>

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
 Sun Jan  4 09:58:06 2009
@@ -69,7 +69,7 @@
                         <fo:table-cell>
                             <fo:block line-height="13pt" 
space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" 
text-align="start">
                               <#if mrpName?exists>                
-                                <fo:inline 
font-size="10pt">${uiLabelMap.WorkEffortName}:</fo:inline>
+                                <fo:inline 
font-size="10pt">${uiLabelMap.ManufacturingPlan}:</fo:inline>
                                 <fo:inline font-weight="bold" 
font-size="10pt">${mrpName}</fo:inline>
                               <#else>
                                 <fo:inline 
font-size="10pt">${uiLabelMap.ProductShipmentPlan}:</fo:inline>

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=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
 Sun Jan  4 09:58:06 2009
@@ -66,7 +66,7 @@
                                 <fo:inline 
font-size="10pt">${uiLabelMap.ProductShipmentPlan}:</fo:inline>
                                 <fo:inline font-weight="bold" 
font-size="10pt">${shipment.shipmentId}</fo:inline>
                                 <#else>
-                                <fo:inline 
font-size="10pt">${uiLabelMap.WorkEffortName}:</fo:inline>
+                                <fo:inline 
font-size="10pt">${uiLabelMap.ManufacturingPlan}:</fo:inline>
                                 <fo:inline font-weight="bold" 
font-size="10pt">${planName}</fo:inline>
                                 </#if>
                             </fo:block>

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
 Sun Jan  4 09:58:06 2009
@@ -65,7 +65,7 @@
                         </fo:table-cell>
                         <fo:table-cell>     
                             <fo:block line-height="6pt" 
space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always">
-                                <fo:inline 
font-size="6pt">${uiLabelMap.WorkEffortName}:</fo:inline>
+                                <fo:inline 
font-size="6pt">${uiLabelMap.ManufacturingPlan}:</fo:inline>
                             </fo:block>
                         </fo:table-cell>
                         <fo:table-cell>     

Modified: ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml 
(original)
+++ ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml Sun Jan 
 4 09:58:06 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="ContactListType.description.ANNOUNCEMENT">
         <value xml:lang="en">Announcement</value>
         <value xml:lang="es">Anuncio</value>

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Jan  4 
09:58:06 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="AccountAnnualRevenue">
         <value xml:lang="de">Jahreseinkommen</value>
         <value xml:lang="en">Annual Revenue</value>

Modified: ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderEntityLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderEntityLabels.xml Sun Jan  4 
09:58:06 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="CustRequestResolution.description.DUPLICATE">
         <value xml:lang="de">Duplikat</value>
         <value xml:lang="en">Duplicate</value>
@@ -653,20 +654,6 @@
         <value 
xml:lang="th">รายการความต้องการ</value>
         <value xml:lang="zh">期望列表</value>
     </property>
-    <property key="TaxAuthorityRateType.description.SALES_TAX">
-        <value xml:lang="de">Verkaufssteuer</value>
-        <value xml:lang="en">SALES_TAX</value>
-        <value xml:lang="es">Impuesto de ventas</value>
-        <value xml:lang="fr">TVA</value>
-        <value xml:lang="th">ภาษีการขาย</value>
-    </property>
-    <property key="TaxAuthorityRateType.description.USE_TAX">
-        <value xml:lang="de">Gebrauchssteuer</value>
-        <value xml:lang="en">USE_TAX</value>
-        <value xml:lang="es">Impuesto de uso</value>
-        <value xml:lang="fr">Taxe d'utilisation (pas en France)</value>
-        <value xml:lang="th">ภาษีการใช้</value>
-    </property>
     <property key="WorkReqFulfType.description.WRF_DELIVERS">
         <value xml:lang="de">Liefert</value>
         <value xml:lang="en">Delivers</value>

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sun Jan  4 
09:58:06 2009
@@ -938,12 +938,6 @@
         <value 
xml:lang="th">ประเภทรายการการคืนค่าไม่ถูกต้อง
 : ถ้าไม่ใบคำสั่งซื้อ ${orderId} 
รายการ ${orderItemSeqId} 
มีการคืนค่าครบถ้วน, 
ก็รายการการคืนค่าอื่นกว่าการปรับเปลี่ยนวิธีใช้หรือการขนส่งเพิ่มไปยังการคืนค่า</value>
         <value xml:lang="zh">非法的退货明细类型：或者订单 
${orderId} 明细 ${orderItemSeqId} 
返回的是null，或者是一个退货明细而不是人工调整或送货被添加到了退货中
 </value>
     </property>
-    <property key="OrderInputQuickPurchaseOrder">
-        <value xml:lang="en">Input  Quick  Purchase  Order</value>
-        <value xml:lang="es">Entrada rápida de un pedido de compra</value>
-        <value xml:lang="fr">Entrer rapidement une commande d'achat</value>
-        <value 
xml:lang="th">การกรอกข้อมูลรายการสั่งซื้อย่างรวดเร็ว</value>
-    </property>
     <property key="OrderInvalidAmountSetForBillingAccount">
         <value xml:lang="en">Invalid amount set for Billing Account # 
${billingAccountId}</value>
         <value xml:lang="es">Monto inválido para cuenta de facturación # 
${billingAccountId}</value>
@@ -1226,7 +1220,7 @@
         <value 
xml:lang="th">ประเภทรายการใบคำสั่งซื้อไม่มีอยู่</value>
         <value xml:lang="zh">不存在订单明细类型</value>
     </property>
-    <property key="OrderOrderTermDays">
+    <property key="OrderOrderTermDaysError">
         <value xml:lang="en">Order Term Days : ${orderTermDays}</value>
         <value xml:lang="es">Días de los términos del pedido : 
${orderTermDays}</value>
         <value xml:lang="fr">Jours des termes de la commande : 
${orderTermDays}</value>
@@ -1246,7 +1240,7 @@
         <value 
xml:lang="th">ต้องการประเภทช่วงระยะเวลารายการสั่งซื้อ.
 </value>
         <value xml:lang="zh">需要订单条件类型。 </value>
     </property>
-    <property key="OrderOrderTermValue">
+    <property key="OrderOrderTermValueError">
         <value xml:lang="en">Order Term Value : ${orderTermValue}</value>
         <value xml:lang="es">Valor de los términos del pedido : 
${orderTermValue}</value>
         <value xml:lang="fr">Valeur des termes de la commande : 
${orderTermValue}</value>
@@ -1649,7 +1643,7 @@
         <value 
xml:lang="th">คลังสินค้าไม่มีอยู่</value>
         <value xml:lang="zh">产品店铺不存在</value>
     </property>
-    <property key="OrderQuickAddOrderItem">
+    <property key="OrderQuickAddOrderItemError">
         <value xml:lang="en">Quick  Add  Order  Item</value>
         <value xml:lang="es">Agregar rápidamente ítems a el pedido</value>
         <value xml:lang="fr">Ajout rapide d'une ligne de commande</value>
@@ -2202,13 +2196,13 @@
         <value 
xml:lang="th">รหัสสถานนะไม่มีอยู่</value>
         <value xml:lang="zh">状态标识不存在</value>
     </property>
-    <property key="OrderSupplierData">
+    <property key="OrderSupplierDataError">
         <value xml:lang="en">SupplierData</value>
         <value xml:lang="es">Datos de provedor</value>
         <value xml:lang="fr">Donnée fournisseur</value>
         <value 
xml:lang="th">ข้อมูลผู้จัดหาสิ่งของ</value>
     </property>
-    <property key="OrderSupplierFinancialData">
+    <property key="OrderSupplierFinancialDataError">
         <value xml:lang="en">SupplierFinancialData</value>
         <value xml:lang="fr">Donnée financière du fournisseur</value>
         <value xml:lang="es">Datos financieros de proveedor</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sun Jan  4 09:58:06 
2009
@@ -8835,7 +8835,7 @@
         <value xml:lang="en">Supplier Data</value>
         <value xml:lang="es">Datos del proveedor</value>
         <value xml:lang="fr">Données fournisseur</value>
-        <value xml:lang="it">Data Fornito</value>
+        <value xml:lang="it">Dati fornitore</value>
         <value xml:lang="nl">Supplier Data</value>
         <value xml:lang="ro">Data Furnizata</value>
         <value xml:lang="ru">Данные поставщика</value>
@@ -8848,7 +8848,7 @@
         <value xml:lang="en">Supplier Financial Data</value>
         <value xml:lang="es">Datos financieros del proveedor</value>
         <value xml:lang="fr">Données financières du fournisseur</value>
-        <value xml:lang="it">Data Finanziaria Fornitore</value>
+        <value xml:lang="it">Dati finanziari fornitore</value>
         <value xml:lang="nl">Supplier Financial Data</value>
         <value xml:lang="ro">Data Finantiara Furnizor</value>
         <value xml:lang="ru">Финансовые данные 
поставщика</value>

Modified: 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
 (original)
+++ 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
 Sun Jan  4 09:58:06 2009
@@ -1170,14 +1170,14 @@
             return "error";
         }
         if (!UtilValidate.isSignedDouble(termValue)) {
-            request.setAttribute("_ERROR_MESSAGE_", 
UtilProperties.getMessage(resource_error,"OrderOrderTermValue", 
UtilMisc.toMap("orderTermValue",UtilValidate.isSignedFloatMsg), locale));
+            request.setAttribute("_ERROR_MESSAGE_", 
UtilProperties.getMessage(resource_error,"OrderOrderTermValueError", 
UtilMisc.toMap("orderTermValue",UtilValidate.isSignedFloatMsg), locale));
             return "error";
         }
         if (termValue != null) {
             dTermValue =new Double(termValue);
         }
         if (!UtilValidate.isInteger(termDays)) {
-            request.setAttribute("_ERROR_MESSAGE_", 
UtilProperties.getMessage(resource_error,"OrderOrderTermDays", 
UtilMisc.toMap("orderTermDays",UtilValidate.isLongMsg), locale));
+            request.setAttribute("_ERROR_MESSAGE_", 
UtilProperties.getMessage(resource_error,"OrderOrderTermDaysError", 
UtilMisc.toMap("orderTermDays",UtilValidate.isLongMsg), locale));
             return "error";
         }
         if (termDays != null) {

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Jan  4 09:58:06 
2009
@@ -2105,7 +2105,7 @@
     <property key="PartyAddProtectedViewToSecurityGroup">
         <value xml:lang="en">Add a Protected View to SecurityGroup</value>
         <value xml:lang="fr">Ajouter une vue protégée à ce groupe de 
sécurité</value>
-    </property>    
+    </property>
     <property key="PartyAddPurpose">
         <value xml:lang="cs">Přidat účel</value>
         <value xml:lang="de">Zweck hinzufügen</value>
@@ -3661,7 +3661,7 @@
         <value xml:lang="en">Create New Contact Information</value>
         <value xml:lang="es">Crear nuevo contacto</value>
         <value xml:lang="fr">Créer de nouvelles coordonnées</value>
-        <value xml:lang="it">Creare Nuovo Informazione Contatto</value>
+        <value xml:lang="it">Creare nuovo informazione contatto</value>
         <value xml:lang="nl">Nieuwe contactinformatie</value>
         <value xml:lang="pt_PT">Criar Nova Informação de Contacto</value>
         <value xml:lang="ro">Creare o Noua Informatie Contact</value>
@@ -4148,7 +4148,7 @@
         <value xml:lang="en">Edit Contact Information</value>
         <value xml:lang="es">Editar información de contacto</value>
         <value xml:lang="fr">Modifier les coordonnées</value>
-        <value xml:lang="it">Aggiorna Informazioni Contatto</value>
+        <value xml:lang="it">Aggiorna informazioni contatto</value>
         <value xml:lang="nl">Contactinfo wijzigen</value>
         <value xml:lang="pt_PT">Editar Informação de Contacto</value>
         <value xml:lang="ro">Actualizare Informatii Contact</value>
@@ -4210,7 +4210,8 @@
         <value xml:lang="en">E-Mail Address</value>
         <value xml:lang="es">Dirección de E-Mail</value>
         <value xml:lang="fr">Adresse courriel</value>
-        <value xml:lang="it">Indirizzo E-Mail</value>
+        <value xml:lang="it">Indirizzo email</value>
+        <value xml:lang="nl">Emailadres</value>
         <value xml:lang="ro">Adresa E-Mail</value>
         <value xml:lang="ru">Адрес эл. почты</value>
         <value xml:lang="th">ที่อยู่อีเมล</value>
@@ -4655,6 +4656,17 @@
         <value xml:lang="fr">Le nombre d'employés n'est pas valable</value>
         <value xml:lang="nl">Aantal medewerkers is fout opgegeven</value>
     </property>
+    <property key="PartyGroupPartyId">
+        <value xml:lang="en">Group Party ID</value>
+        <value xml:lang="es">Código de grupo de participante</value>
+        <value xml:lang="fr">Réf. de groupe d'acteur</value>
+        <value xml:lang="it">Codice gruppo soggetto</value>
+        <value xml:lang="nl">Group Party ID</value>
+        <value xml:lang="ro">Cod Grup Subiect</value>
+        <value xml:lang="ru">ID группы участника</value>
+        <value 
xml:lang="th">รหัสกลุ่มผู้ใช้</value>
+        <value xml:lang="zh">组会员标识</value>
+    </property>
     <property key="PartyHeight">
         <value xml:lang="cs">Velikost</value>
         <value xml:lang="de">Größe</value>
@@ -6472,7 +6484,7 @@
         <value xml:lang="en">Party ID</value>
         <value xml:lang="es">Código de participante</value>
         <value xml:lang="fr">Réf. de l'acteur</value>
-        <value xml:lang="it">Codice Soggetto</value>
+        <value xml:lang="it">Codice soggetto</value>
         <value xml:lang="nl">Relatie-ID</value>
         <value xml:lang="pt_PT">ID da Secção</value>
         <value xml:lang="ro">Cod Subiect</value>
@@ -7487,7 +7499,7 @@
         <value xml:lang="en">RoleType ID</value>
         <value xml:lang="es">Tipo de rol</value>
         <value xml:lang="fr">Référence Type de rôle</value>
-        <value xml:lang="it">Tipo Ruolo</value>
+        <value xml:lang="it">Tipo ruolo</value>
         <value xml:lang="nl">ID soort rol</value>
         <value xml:lang="pt_PT">ID de Tipo de Função</value>
         <value xml:lang="ro">Tip Rol</value>
@@ -7730,7 +7742,7 @@
         <value xml:lang="es">Enviar Email</value>
         <value xml:lang="fr">Envoyer un courriel</value>
         <value xml:lang="hi_IN">ईमेल दिजीये</value>
-        <value xml:lang="it">Invia Email</value>
+        <value xml:lang="it">Invia email</value>
         <value xml:lang="ja">Send Email</value>
         <value xml:lang="nl">Stuur een Email</value>
         <value xml:lang="pt_PT">Enviar E-mail</value>
@@ -8314,7 +8326,7 @@
         <value xml:lang="es">Nombre</value>
         <value xml:lang="fr">Nom dest.</value>
         <value xml:lang="hi_IN">नाम को</value>
-        <value xml:lang="it">Nome</value>
+        <value xml:lang="it">al nome</value>
         <value xml:lang="ja">To Name</value>
         <value xml:lang="nl">Aan Naam</value>
         <value xml:lang="pt_PT">Para O Nome De</value>

Modified: 
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml?rev=731303&r1=731302&r2=731303&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
 (original)
+++ 
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
 Sun Jan  4 09:58:06 2009
@@ -22,7 +22,7 @@
         
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>
   <simple-map-processor name="assignmentMap">
     <process field="workEffortId"><copy/><not-empty><fail-property 
resource="WorkEffortUiLabels" 
property="WorkEffortIdMissing"/></not-empty></process>
-    <process field="partyId"><copy/><not-empty><fail-property 
resource="WorkEffortUiLabels" property="PartyIdMissing"/></not-empty></process>
+    <process field="partyId"><copy/><not-empty><fail-property 
resource="PartyUiLabels" property="PartyPartyIdMissing"/></not-empty></process>
     <process field="roleTypeId"><copy/><not-empty><fail-property 
resource="WorkEffortUiLabels" 
property="PartyRoleTypeIdMissing"/></not-empty></process>
     <process field="fromDate">
         <convert type="Timestamp"><fail-property resource="WorkEffortUiLabels" 
property="WorkEffortFromDateIsNotValid"/></convert></process>

Reply via email to