svn commit: r745286 [2/2] - in /ofbiz/trunk: applications/content/config/ applications/content/webapp/content/cms/ applications/content/webapp/content/layout/ applications/content/widget/ applications/content/widget/compdoc/ applications/content/widget...

[mrisaliti]

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=745286&r1=745285&r2=745286&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Feb 17 22:57:14 2009
@@ -1532,6 +1532,10 @@
         <value xml:lang="th">แสดงปฏิทินรายสัปดาห์</value>
         <value xml:lang="zh">浏览日历周</value>
     </property>
+    <property key="WorkEffortCommEventId">
+        <value xml:lang="en">Comm Event Id</value>
+        <value xml:lang="it">Evento comunicazioni</value>
+    </property>
     <property key="WorkEffortCommEvents">
         <value xml:lang="en">Communications</value>
         <value xml:lang="es">Comunicaciones</value>
@@ -1650,6 +1654,10 @@
         <value xml:lang="th">สร้าง</value>
         <value xml:lang="zh">已创建</value>
     </property>
+    <property key="WorkEffortCustomerRating">
+        <value xml:lang="en">Customer Rating</value>
+        <value xml:lang="it">Posizione cliente</value>
+    </property>
     <property key="WorkEffortDayView">
         <value xml:lang="en">Day View</value>
         <value xml:lang="es">Vista por días</value>
@@ -1870,6 +1878,10 @@
         <value xml:lang="th">ผิดพลาดถึงการดึงค่าการกรอกข้อมูลปฏิทิน</value>
         <value xml:lang="zh">获取日历记录时失败</value>
     </property>
+    <property key="WorkEffortFixedAssetAlreadyExist">
+        <value xml:lang="en">Fixed Asset Already Exist</value>
+        <value xml:lang="it">Cespite già esistente</value>
+    </property>
     <property key="WorkEffortForRequirement">
         <value xml:lang="en">For Requirement</value>
         <value xml:lang="es">Para requerimieto</value>
@@ -1983,7 +1995,7 @@
     <property key="WorkEffortKeywordAlreadyExist">
         <value xml:lang="en">WorkEffort - Keyword already exist</value>
         <value xml:lang="fr">Tâche - Mot-clé existant déjà</value>
-        <value xml:lang="it">Impegno di Lavor - Chiave già esistente</value>
+        <value xml:lang="it">Impegno di lavoro - chiave già esistente</value>
         <value xml:lang="th">งาน - ยังคงมีคีย์เวิร์ดอยู่แล้ว</value>
         <value xml:lang="zh">人工服务 - 关键字已经存在了</value>
     </property>
@@ -2534,6 +2546,14 @@
         <value xml:lang="th">ภารกิจขั้นตอนการทำงาน</value>
         <value xml:lang="zh">阶段任务</value>
     </property>
+    <property key="WorkEffortPopularityByOrders">
+        <value xml:lang="en">Popularity By Orders</value>
+        <value xml:lang="it">Popularità per ordini</value>
+    </property>
+    <property key="WorkEffortPopularityByViews">
+        <value xml:lang="en">Popularity By Views</value>
+        <value xml:lang="it">Popularità per visti</value>
+    </property>
     <property key="WorkEffortPreviousDay">
         <value xml:lang="en">Previous Day</value>
         <value xml:lang="es">Día anterior</value>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=745286&r1=745285&r2=745286&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Feb 17 22:57:14 2009
@@ -861,7 +861,7 @@
         <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
         <if-not-empty field="lookedUpValue">
             <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAlreadyExist"/>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortFixedAssetAlreadyExist"/>
             </add-error>
             <check-errors />
         <else>
@@ -875,7 +875,7 @@
     <simple-method method-name="updateWorkEffortFixedAssetStd"
             short-description="Update an existing WorkEffort FixedAsset Standard">
         <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionERror"/>
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
         </check-permission>
         <check-errors />
         <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" />
@@ -900,7 +900,7 @@
         <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" />
         <if-not-empty field="lookedUpValue">
             <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAsgAlreadyExist"/>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortFixedAssetAlreadyExist"/>
             </add-error>
         <else>
             <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newWEFixedAssetAssign" />
@@ -964,7 +964,7 @@
     <simple-method method-name="updateWorkEffortContent" short-description="Update Work Effort Content">
         <!-- need a better way to handle permissions
         <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionERror"/>
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
         </check-permission>
         <check-errors />
         -->
@@ -1049,7 +1049,7 @@
         <check-errors />
         <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue"/>
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortKeywordAlreadyExist"/></add-error>
+            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortKeywordAlreadyExist"/></add-error>
         <else>
         <make-value value-field="newEntity" entity-name="WorkEffortKeyword"/>
         <if-empty field="parameters.workEffortId">

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=745286&r1=745285&r2=745286&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Tue Feb 17 22:57:14 2009
@@ -1110,7 +1110,7 @@
         }
 
         public String prettyPrintSortOrder(boolean detailed, Locale locale) {
-            return UtilProperties.getMessage(resource, "WorkEffortKeywordRelevency", locale);
+            return UtilProperties.getMessage(resource, "WorkEffortKeywordRelevancy", locale);
         }
 
         public boolean isAscending() {
@@ -1152,7 +1152,7 @@
 
         public String prettyPrintSortOrder(boolean detailed, Locale locale) {
             if ("workEffortName".equals(this.fieldName)) {
-                return UtilProperties.getMessage(resource, "WorkEffortWorkEffortName", locale);
+                return UtilProperties.getMessage(resource, "WorkEffortName", locale);
             } else if ("totalQuantityOrdered".equals(this.fieldName)) {
                 return UtilProperties.getMessage(resource, "WorkEffortPopularityByOrders", locale);
             } else if ("totalTimesViewed".equals(this.fieldName)) {

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=745286&r1=745285&r2=745286&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Tue Feb 17 22:57:14 2009
@@ -176,7 +176,7 @@
                     input.clearLastFunction();
                     input.setFunction("SECURITYCODE");
                     input.setFunction("POSTALCODE");
-                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosPostalCodePosProcessing",Locale.getDefault()));
+                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosPostalCode",Locale.getDefault()));
                 } else {
                     clearInputPaymentFunctions(pos);
                     input.clearInput();

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=745286&r1=745285&r2=745286&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Tue Feb 17 22:57:14 2009
@@ -29,7 +29,7 @@
         <label for="searchBy"><b>&nbsp;${uiLabelMap.WebPosSearchBy}</b></label>
         <select id="searchBy" name="searchBy">
           <option value="productName" selected>${uiLabelMap.ProductProductName}</option>
-          <option value="productDescription">${uiLabelMap.ProductDescription}</option>
+          <option value="productDescription">${uiLabelMap.ProductProductDescription}</option>
         </select>
         <input type="text" id="productToSearch" name="productToSearch" size="40" maxlength="100">
         <div id="products" class="autocomplete" style="display:none"></div>