OFBiz › OFBiz - Commits

svn commit: r753028 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/layout/ applications/content/widget/compdoc/ applications/manufacturing/config/ appl...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
mrisaliti
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r753028 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/layout/ applications/content/widget/compdoc/ applications/manufacturing/config/ appl...

mrisaliti
Author: mrisaliti
Date: Thu Mar 12 21:50:12 2009
New Revision: 753028

URL: http://svn.apache.org/viewvc?rev=753028&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.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/projectmgr/config/ProjectMgrUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -5451,6 +5451,10 @@
         <value xml:lang="th">ได้รับการชำระเงินแล้ว</value>
         <value xml:lang="zh">已收到支付</value>
     </property>
+    <property key="AccountingPaymentAmount">
+        <value xml:lang="en">Payment Amount</value>
+        <value xml:lang="it">Importo pagamento</value>
+    </property>
     <property key="AccountingPaymentApplRemoved">
         <value xml:lang="en">PaymentID [${paymentApplication.paymentId}] with amount ${paymentApplication.amountApplied?currency(${currencyUomId})} removed from</value>
         <value xml:lang="es">IdPago[${paymentApplication.paymentId}] con cantidad ${paymentApplication.amountApplied?currency(${currencyUomId})} suprimido de</value>
@@ -8135,6 +8139,10 @@
         <value xml:lang="th">รหัสวิธี</value>
         <value xml:lang="zh">网关代码</value>
     </property>
+    <property key="FormFieldTitle_gatewayCvResult">
+        <value xml:lang="en">Gateway Cv Result</value>
+        <value xml:lang="it">Risultato Cv gateway</value>
+    </property>
     <property key="FormFieldTitle_gatewayFlag">
         <value xml:lang="ar">علامة العبور</value>
         <value xml:lang="en">Gateway Flag</value>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Thu Mar 12 21:50:12 2009
@@ -22,7 +22,7 @@
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="BaseSummaryOptions" type="single" header-row-style="header-row" default-table-style="basic-table">
-        <field name="month" required-field="true">
+        <field name="month" title="${uiLabelMap.CommonMonth}" required-field="true">
             <drop-down allow-empty="false">
                 <option key="01" description="${uiLabelMap.CommonJanuary}"/>
                 <option key="02" description="${uiLabelMap.CommonFebruary}"/>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -1995,6 +1995,10 @@
         <value xml:lang="th">ยับยั้งสิ่งที่มีอยู่</value>
         <value xml:lang="zh">令已存在的无效</value>
     </property>
+    <property key="FormFieldTitle_decoratorContentId">
+        <value xml:lang="en">Decorator Content Id</value>
+        <value xml:lang="it">Decoratore contenuto</value>
+    </property>
     <property key="FormFieldTitle_displayFailCond">
         <value xml:lang="ar">عرض ظروف الإخفاق</value>
         <value xml:lang="de">Grund für fehlschlagen anzeigen</value>
@@ -2147,6 +2151,10 @@
         <value xml:lang="th">รหัสไฟล์ที่เพิ่ม</value>
         <value xml:lang="zh">文件扩展标识</value>
     </property>
+    <property key="FormFieldTitle_ftlContentId">
+        <value xml:lang="en">Ftl Content Id</value>
+        <value xml:lang="it">Contenuto ftl</value>
+    </property>
     <property key="FormFieldTitle_formatString">
         <value xml:lang="en">Format String</value>
         <value xml:lang="fr">Format chaîne de caractères</value>
@@ -2571,6 +2579,14 @@
         <value xml:lang="th">รหัสหมวดหมู่ผู้ปกครอง</value>
         <value xml:lang="zh">上级分类标识</value>
     </property>
+    <property key="FormFieldTitle_pathAlias">
+        <value xml:lang="en">Path Alias</value>
+        <value xml:lang="it">Path alias</value>
+    </property>
+    <property key="FormFieldTitle_pathAliasTo">
+        <value xml:lang="en">Path Alias To</value>
+        <value xml:lang="it">Path alias a</value>
+    </property>
     <property key="FormFieldTitle_pasteContent">
         <value xml:lang="de">Inhalt einfügen</value>
         <value xml:lang="en">Paste Content</value>
@@ -2610,6 +2626,10 @@
         <value xml:lang="th">วัตถุประสงค์</value>
         <value xml:lang="zh">目的</value>
     </property>
+    <property key="FormFieldTitle_queryLine">
+        <value xml:lang="en">Query Line</value>
+        <value xml:lang="it">Riga query</value>
+    </property>
     <property key="FormFieldTitle_question">
         <value xml:lang="ar">سؤال</value>
         <value xml:lang="de">Frage</value>

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Thu Mar 12 21:50:12 2009
@@ -316,7 +316,7 @@
         <field name="drDataResourceTypeId" >
             <hidden value="IMAGE_OBJECT"/>
         </field>
-        <field name="drDataResourceTypeIdDisplay" >
+        <field name="drDataResourceTypeIdDisplay" title="${uiLabelMap.FormFieldTitle_drDataResourceTypeId}">
             <display description="IMAGE_OBJECT"/>
         </field>
         <field name="drMimeTypeId" >
@@ -379,7 +379,7 @@
     <form name="EditLayoutSubContent" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="currentValue==null" target="createLayoutSubContent"/>
-        <field name="contentIdToDisplay" >
+        <field name="contentIdToDisplay" title="${uiLabelMap.ContentParent}">
            <ignored/>
         </field>
         <field name="mapKeyDisplay" >

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Thu Mar 12 21:50:12 2009
@@ -77,7 +77,7 @@
         <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}"><display/></field>
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="caThruDate"><hidden/></field>
-        <field name="editTemplate" widget-style="buttontext">
+        <field name="editTemplate" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc?rootContentId=${contentId}"/>
         </field>
         <field name="templateTree" widget-style="buttontext">

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -146,6 +146,10 @@
         <value xml:lang="it">Nome lavoro</value>
         <value xml:lang="th">ชื่องาน</value>
     </property>
+    <property key="FormFieldTitle_lotId">
+        <value xml:lang="en">Lot Id</value>
+        <value xml:lang="it">Numero lotto</value>
+    </property>
     <property key="FormFieldTitle_manufacturingTask">
         <value xml:lang="de">Arbeitsgang</value>
         <value xml:lang="en">Manufacturing Task</value>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Thu Mar 12 21:50:12 2009
@@ -35,7 +35,7 @@
             <hyperlink target="viewprofile?partyId=${partyRow.partyId}" description="${partyRow.partyId}"/>
         </field>
         <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field>
-        <field name="export">
+        <field name="export" title="${uiLabelMap.SfaVCard}">
             <hyperlink target="createVCardFromContact?partyId=${partyRow.partyId}" description="${uiLabelMap.SfaVCard}"/>
         </field>
     </form>

Modified: ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderEntityLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderEntityLabels.xml Thu Mar 12 21:50:12 2009
@@ -508,6 +508,54 @@
         <value xml:lang="th">ความต้องการงาน</value>
         <value xml:lang="zh">工作需求</value>
     </property>
+    <property key="ReturnAdjustmentType.description.RET_PROMOTION_ADJ">
+        <value xml:lang="en">Return Promotion</value>
+        <value xml:lang="it">Promozione reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_REPLACE_ADJ">
+        <value xml:lang="en">Return Replacement</value>
+        <value xml:lang="it">Reso in sostituzione</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_DISCOUNT_ADJ">
+        <value xml:lang="en">Return Discount</value>
+        <value xml:lang="it">Sconto sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_FEE_ADJ">
+        <value xml:lang="en">Return Fee</value>
+        <value xml:lang="it">Commissioni sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_MISC_ADJ">
+        <value xml:lang="en">Return Miscellaneous Charges</value>
+        <value xml:lang="it">Ricarichi vari sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_SALES_TAX_ADJ">
+        <value xml:lang="en">Return Sales Tax</value>
+        <value xml:lang="it">Tasse di vendita sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_SHIPPING_ADJ">
+        <value xml:lang="en">Return Shipping and Handling</value>
+        <value xml:lang="it">Spese di trasporto sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_SURCHARGE_ADJ">
+        <value xml:lang="en">Return Surcharge</value>
+        <value xml:lang="it">Spese supplementari sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_ADD_FEATURE_ADJ">
+        <value xml:lang="en">Return Additional Feature</value>
+        <value xml:lang="it">Caratteristiche aggiuntive sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_WARRANTY_ADJ">
+        <value xml:lang="en">Return Warranty</value>
+        <value xml:lang="it">Garanzia sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_MKTG_PKG_ADJ">
+        <value xml:lang="en">Return Marketing Package Adjustment</value>
+        <value xml:lang="it">Aggiustamento pacco di vendita sul reso</value>
+    </property>
+    <property key="ReturnAdjustmentType.description.RET_MAN_ADJ">
+        <value xml:lang="en">Return Manual Adjustment</value>
+        <value xml:lang="it">Aggiustamento manuale sul reso</value>
+    </property>
     <property key="ReturnReason.description.RTN_COD_REJECT">
         <value xml:lang="de">Vereinbarte Zahlung bei Lieferung abgeleht</value>
         <value xml:lang="en">COD Payment Rejected</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -242,6 +242,10 @@
         <value xml:lang="th">อ่านประมาณวันที่</value>
         <value xml:lang="zh">预计就绪日期</value>
     </property>
+    <property key="FormFieldTitle_expectedItemStatus">
+        <value xml:lang="en">Expected Item Status</value>
+        <value xml:lang="it">Stato riga atteso</value>
+    </property>
     <property key="FormFieldTitle_externalId">
         <value xml:lang="de">Externe ID</value>
         <value xml:lang="en">External Id</value>

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Thu Mar 12 21:50:12 2009
@@ -2315,6 +2315,7 @@
     </entity>
     <entity entity-name="ReturnAdjustmentType"
             package-name="org.ofbiz.order.return"
+            default-resource-name="OrderEntityLabels"
             title="Return Adjustment Type Entity">
       <field name="returnAdjustmentTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id-ne"></field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Thu Mar 12 21:50:12 2009
@@ -102,7 +102,7 @@
         <field name="createdBy"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+    <!-- UNUSED FORM
     <form name="ReturnItems" type="multi" list-name="orderItems" target="createReturnItem"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="createReturnItem"/>
@@ -112,7 +112,7 @@
         <field name="orderItemSeqId"><hidden/></field>
         <field name="statusId"><ignored/></field>
     </form>
-
+    -->
     <form name="FindReturns" type="single"  target="findreturn" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="returnHeaderTypeId">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Thu Mar 12 21:50:12 2009
@@ -39,7 +39,7 @@
         <td colspan="2">&nbsp;</td>
         <td><div>
            <#if (!adjEditable)>
-               ${adjReturnType.description?default("${uiLabelMap.CommonNA}")}
+               ${adjReturnType.get("description", locale)?default("${uiLabelMap.CommonNA}")}
            <#else>
                <select name="returnTypeId_o_${rowCount}">
                   <#if (adjReturnType?has_content)>
@@ -181,9 +181,9 @@
                         <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right">
                     </#if>
                     <#if item.receivedQuantity?exists>
-                    <br/>Received: ${item.receivedQuantity}
+                    <br/>${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity}
                         <#list shipmentReceipts?if_exists as shipmentReceipt>
-                            <br/>Qty: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a>
+                            <br/>${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a>
                         </#list>
                     </#if>
                     </div></td>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -966,6 +966,10 @@
         <value xml:lang="th">กำหนดรหัสกลุ่มผู้ใช้อย่างรวดเร็ว</value>
         <value xml:lang="zh">快速指派会员标识</value>
     </property>
+    <property key="FormFieldTitle_rateDefaultAmount">
+        <value xml:lang="en">Rate Default Amount</value>
+        <value xml:lang="it">Importo percentuale di default</value>
+    </property>
     <property key="FormFieldTitle_residenceStatusEnumId">
         <value xml:lang="de">Wohnsitzstatus Aufzählung ID</value>
         <value xml:lang="en">Residence Status Enum Id</value>

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=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Mar 12 21:50:12 2009
@@ -684,7 +684,7 @@
         </field>
         <field name="custRequestName" entry-name="subject"><text size="60"/></field>
         <field name="contentMimeTypeId"><hidden/></field>
-        <field name="content"><textarea cols="70" rows="20"/></field>
+        <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="70" rows="20"/></field>
         <field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListRequests" extends="ListRequests" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">

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=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu Mar 12 21:50:12 2009
@@ -821,9 +821,9 @@
                 <sub-hyperlink target="/accounting/control/paymentOverview?paymentId=${paymentId}" description="[${paymentId}]" target-type="inter-app"/>
             </display-entity>
         </field>
-        <field name="pmEffectiveDate"><display type="date"/></field>
-        <field name="pmAmount" use-when="actualCurrency==false"><display type="currency" currency="${actualCurrencyUomId}"/></field>
-        <field name="pmAmount" entry-name="pmActualCurrencyAmount" use-when="actualCurrency==true"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+        <field name="pmEffectiveDate" title="${uiLabelMap.AccountingEffectiveDate}"><display type="date"/></field>
+        <field name="pmAmount" title="${uiLabelMap.AccountingPaymentAmount}" use-when="actualCurrency==false"><display type="currency" currency="${actualCurrencyUomId}"/></field>
+        <field name="pmAmount" title="${uiLabelMap.AccountingPaymentAmount}" entry-name="pmActualCurrencyAmount" use-when="actualCurrency==true"><display type="currency" currency="${actualCurrencyUomId}"/></field>
     </form>
     <form name="ListUnAppliedInvoices" type="list" list-name="ListUnAppliedInvoices"
         default-title-style="tableheadtext" default-widget-style="tabletext" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -1585,13 +1585,9 @@
         <value xml:lang="it">Tipo Etichetta Riga</value>
         <value xml:lang="th">รหัสประเภทฉลากสินค้าคงเหลือ</value>
     </property>
-    <property key="FormFieldTitle_inventoryTransferId">
-        <value xml:lang="de">Bestandstransfer ID</value>
-        <value xml:lang="en">Inventory Transfer Id</value>
-        <value xml:lang="es">Código Transferencia de inventario</value>
-        <value xml:lang="fr">Réf. de transfert d'inventaire</value>
-        <value xml:lang="it">Numero Trasferimento Inventario</value>
-        <value xml:lang="th">รหัสการเปลี่ยนสินค้าคงเหลือ</value>
+    <property key="FormFieldTitle_inventoryItemTypeId">
+        <value xml:lang="en">Inventory Item Type Id</value>
+        <value xml:lang="it">Tipo riga inventario</value>
     </property>
     <property key="FormFieldTitle_isDemoStore">
         <value xml:lang="de">Ist ein Demo-Laden</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Thu Mar 12 21:50:12 2009
@@ -32,7 +32,7 @@
         <row-actions>
             <set field="typeDescription" value="${bsh: return &quot;SINGLE&quot;.equals(configItemTypeId) ? uiLabelMap.get(&quot;ProductSingleChoice&quot;) : uiLabelMap.get(&quot;ProductMultiChoice&quot;)}"/>
         </row-actions>
-        <field name="configItemId" title="${uiLabelMap.CommonId}" widget-style="buttontext"><hyperlink target="EditProductConfigItem?configItemId=${configItemId}" description="${configItemId}"/></field>
+        <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext"><hyperlink target="EditProductConfigItem?configItemId=${configItemId}" description="${configItemId}"/></field>
         <field name="configItemName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="typeDescription" title="${uiLabelMap.CommonType}">
             <display description="${typeDescription}"/>
@@ -42,7 +42,7 @@
     <form name="FindProductConfigItemsFrom" type="single" target="FindProductConfigItems"
         default-map-name="productconfigitems"  header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="ProductConfigItem" default-field-type="find"/>
-        <field name="configItemId"/>
+        <field name="configItemId" title="${uiLabelMap.ProductConfigItem}"/>
         <field name="configItemTypeId"><hidden/></field>
         <field name="configItemName"/>
         <field name="description"/>
@@ -75,7 +75,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table">
         
         <auto-fields-service service-name="updateProductConfigOption" map-name="configOption"/>
-
+        <field use-when="configOption!=null" name="configOptionId"><hidden/></field>
         <field name="configItemId"><hidden/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -203,10 +203,10 @@
         default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems"
         target="" header-row-style="header-row-2" paginate="true">
         <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display" />
-        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.CommonName}" ><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${configOptionId} - ${configOptionName}"/></field>
+        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}"><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${configOptionId} - ${configOptionName}"/></field>
         <field name="configOptionId" ><hidden/></field>
         <field name="configOptionName" ><hidden/></field>
-        <field name="remove" widget-style="buttontext" ><hyperlink target="deleteProductConfigOption?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" ><hyperlink target="deleteProductConfigOption?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${uiLabelMap.CommonRemove}"/></field>
     </form>
     
     <form name="ProductConfigList" type="list" list-name="configProducts"

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Thu Mar 12 21:50:12 2009
@@ -653,7 +653,7 @@
             </entity-one>
         </row-actions>
 
-        <field name="inventoryTransferId" widget-style="buttontext">
+        <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
             <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
@@ -689,7 +689,7 @@
                 <field-map field-name="productId" from-field="inventoryItem.productId"/>
             </entity-one>
         </row-actions>
-        <field name="inventoryTransferId" widget-style="buttontext">
+        <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
             <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">
@@ -726,7 +726,7 @@
                 <field-map field-name="productId" from-field="inventoryItem.productId"/>
             </entity-one>
         </row-actions>
-        <field name="inventoryTransferId" widget-style="buttontext">
+        <field name="inventoryTransferId" title="${uiLabelMap.ProductInventoryTransfer}" widget-style="buttontext">
             <hyperlink target="TransferInventoryItem?inventoryTransferId=${inventoryTransferId}" description="${inventoryTransferId}"/>
         </field>
         <field name="inventoryItemId" widget-style="buttontext">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Thu Mar 12 21:50:12 2009
@@ -585,7 +585,7 @@
     <form name="FindWorkEffortCommEvents" default-map-name="workEffortCommEvent" target="ListWorkEffortCommEvents" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortId"><hidden/></field>
-        <field name="commEventId"><lookup target-form-name="LookupCommEvent"/></field>
+        <field name="commEventId" title="${uiLabelMap.FormFieldTitle_communicationEventId}"><lookup target-form-name="LookupCommEvent"/></field>
         <field name="fromDate"><date-find/></field>
         <field name="thruDate"><date-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>

Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml Thu Mar 12 21:50:12 2009
@@ -53,7 +53,7 @@
         <field name="productId"><hidden/></field>
         <field name="productId" entry-name="product.productId" ><display/></field>
         <field name="productName" title="${uiLabelMap.CommonEmptyHeader}" entry-name="product.productName" ><display/></field>
-        <field name="productLocation" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
+        <field name="productLocation" title="${uiLabelMap.FormFieldTitle_locationSeqId}" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
         <field name="productQty" required-field="true" title="${uiLabelMap.CommonQty}" ><text default-value="1" size="5"/></field>
         <field name="submitButton" title="${uiLabelMap.ProductReceiveProduct}" widget-style="standardSubmit"><submit button-type="button"/></field>
     </form>
@@ -83,7 +83,7 @@
         <field name="facilityId"><hidden/></field>
         <field name="atp_qoh" title="${uiLabelMap.ProductAtpQoh}" entry-name="atp_qoh"><display/></field>
         <field name="locationSeqId"><hidden/></field>
-        <field name="locationSeqIdNew" entry-name="locationSeqId"><text size="10" default-value=""/></field>
+        <field name="locationSeqIdNew" title="${uiLabelMap.FormFieldTitle_locationSeqId}" entry-name="locationSeqId"><text size="10" default-value=""/></field>
         <field name="quantity" required-field="true" entry-name="totalQuantityOnHand"><text size="6" default-value=""/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -89,6 +89,10 @@
         <value xml:lang="en">Draft Emails</value>
         <value xml:lang="it">Bozze emails</value>
     </property>
+    <property key="MyPageFileAttach">
+        <value xml:lang="en">File Attach</value>
+        <value xml:lang="it">Allega file</value>
+    </property>
     <property key="MyPageEmailsFromKnownOrigin">
         <value xml:lang="en">Emails from known origin</value>
         <value xml:lang="fr">Courriel issue d'une origine connue</value>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Thu Mar 12 21:50:12 2009
@@ -260,7 +260,8 @@
         </field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
         <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
-        <field name="fileAttach"><display/></field><field name="fileAttach">
+        <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}"><display/></field>
+        <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}">
             <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
         </field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Mar 12 21:50:12 2009
@@ -282,7 +282,8 @@
         </field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
         <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
-        <field name="fileAttach"><display/></field><field name="fileAttach">
+        <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}"><display/></field>
+        <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}">
             <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
         </field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=753028&r1=753027&r2=753028&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Mar 12 21:50:12 2009
@@ -58,6 +58,10 @@
         <value xml:lang="fr">Heures non facturées</value>
         <value xml:lang="it">Ore non fatturate</value>
     </property>
+    <property key="FormFieldTitle_originalActualHours">
+        <value xml:lang="en">Original Actual Hours</value>
+        <value xml:lang="it">Ore attuali originali</value>
+    </property>
     <property key="FormFieldTitle_parentProjectName">
         <value xml:lang="en">Parent Project Name</value>
         <value xml:lang="fr">Nom du projet parent</value>


Free forum by Nabble Edit this page