OFBiz › OFBiz - Commits

svn commit: r677012 - in /ofbiz/trunk/specialpurpose/assetmaint: config/ webapp/assetmaint/WEB-INF/actions/workeffort/ webapp/assetmaint/includes/ widget/ widget/forms/

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

svn commit: r677012 - in /ofbiz/trunk/specialpurpose/assetmaint: config/ webapp/assetmaint/WEB-INF/actions/workeffort/ webapp/assetmaint/includes/ widget/ widget/forms/

adrianc
Author: adrianc
Date: Tue Jul 15 12:20:15 2008
New Revision: 677012

URL: http://svn.apache.org/viewvc?rev=677012&view=rev
Log:
More work in the Asset Maintenance component:

1. Eliminated UI label redefinitions.
2. Fixed a bug I introduced in a previous commit.

Modified:
    ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
    ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml

Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Tue Jul 15 12:20:15 2008
@@ -18,146 +18,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="AccountingEditFixedAsset">
-        <value xml:lang="en">Edit Equipment</value>
-        <value xml:lang="fr">Editer l'équipement</value>
-        <value xml:lang="it">Aggiorna Cespite</value>
-        <value xml:lang="th">แก้ไขเครื่องมือ</value>
-    </property>
-    <property key="AccountingFacilityId">
-        <value xml:lang="en">Located at</value>
-        <value xml:lang="fr">Situé à</value>
-        <value xml:lang="it">Posizione</value>
-        <value xml:lang="th">ที่ตั้ง</value>
-    </property>
-    <property key="AccountingFixedAssetChildren">
-        <value xml:lang="en">Children</value>
-        <value xml:lang="fr">Descendant</value>
-        <value xml:lang="it">Figlio</value>
-        <value xml:lang="th">เด็ก</value>
-    </property>
-    <property key="AccountingFixedAssetClassEnumId">
-        <value xml:lang="en">Equipment Class</value>
-        <value xml:lang="fr">Classe d'équipement</value>
-        <value xml:lang="it">Classe Cespite</value>
-        <value xml:lang="th">ห้องเครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAssetEdit">
-        <value xml:lang="en">Create/Update Equipment</value>
-        <value xml:lang="fr">Créer/Mettre à jour l'équipement</value>
-        <value xml:lang="it">Crea/Aggiorna Cespite</value>
-        <value xml:lang="th">สร้าง/เปลี่ยนแปลง เครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAssetId">
-        <value xml:lang="en">Equipment Id</value>
-        <value xml:lang="fr">Réf. d'équipement</value>
-        <value xml:lang="it">Codice Cespite</value>
-        <value xml:lang="th">รหัสเครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAssetIdInvalidError">
-        <value xml:lang="en">Equipment Id is invalid. Please use Equipment lookup tool to find valid Equipment Id</value>
-        <value xml:lang="fr">Cette réf. d'équipement n'existe pas. SVP, utiliser l'outil de recherche d'équipement pour trouver une réf. d'équipement</value>
-        <value xml:lang="it">Codice Cespite non è valido. Perfavore usare la ricerca dei Cespiti per trovare un cespite valido</value>
-        <value xml:lang="th">รหัสเครื่องมือไม่ถูกต้อง กรุณาใช้การค้นหาเครื่องมือเพื่อค้นหารหัสเครื่องมือที่ถูกต้อง</value>
-    </property>
-    <property key="AccountingFixedAssetIdRequiredError">
-        <value xml:lang="en">Equipment Id is required field, Please enter and try again.</value>
-        <value xml:lang="fr">La réf. d'équipement est requise. SVP, recommencez</value>
-        <value xml:lang="it">Codice Cespite è un campo richiesto, Perfavore inserire e provare nuovamente.</value>
-        <value xml:lang="th">ช่องกรอกรหัสเครื่อมือที่ต้องการ กรุณากรองและลองอีกครั้ง</value>
-    </property>
-    <property key="AccountingFixedAssetIdent">
-        <value xml:lang="en">Identification</value>
-        <value xml:lang="it">Identificazione</value>
-        <value xml:lang="th">เลขประจำตัว</value>
-    </property>
-    <property key="AccountingFixedAssetIdentIdValue">
-        <value xml:lang="en">Value</value>
-        <value xml:lang="fr">Valeur</value>
-        <value xml:lang="it">Valore</value>
-        <value xml:lang="th">ค่า</value>
-    </property>
-    <property key="AccountingFixedAssetIdentTypeId">
-        <value xml:lang="en">Equipment Identification Type Id</value>
-        <value xml:lang="fr">Réf. de type d'identification d'équipement</value>
-        <value xml:lang="it">Codice Tipo Identificazione Cespite</value>
-        <value xml:lang="th">แสดงรหัสประเภทเครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAssetIdents">
-        <value xml:lang="en">Identifications</value>
-        <value xml:lang="it">Identificazioni</value>
-        <value xml:lang="th">เลขประจำตัว</value>
-    </property>
-    <property key="AccountingFixedAssetMaintIntervalMeterType">
-        <value xml:lang="en">Meter Type</value>
-        <value xml:lang="fr">Type de compteur</value>
-        <value xml:lang="it">Tipo Contachilometri</value>
-        <value xml:lang="th">ประเภทเครื่องวัด</value>
-    </property>
-    <property key="AccountingFixedAssetMaintIntervalQuantity">
-        <value xml:lang="en">Meter Reading</value>
-        <value xml:lang="fr">Lecture de compteur</value>
-        <value xml:lang="it">Lettura Contachilometri</value>
-        <value xml:lang="th">กำลังอ่านเครื่องวัด</value>
-    </property>
-    <property key="AccountingFixedAssetMaintIntervalUom">
-        <value xml:lang="en">Meter Uom</value>
-        <value xml:lang="fr">Unité de mesure de compteur</value>
-        <value xml:lang="it">Udm Contachilometri</value>
-        <value xml:lang="th">หน่วยวัด Uom</value>
-    </property>
-    <property key="AccountingFixedAssetMaintSeqId">
-        <value xml:lang="en">Maint Seq Id</value>
-        <value xml:lang="fr">Réf. seq. de maintenance</value>
-        <value xml:lang="it">Sequenza Manutenzione</value>
-        <value xml:lang="th">รหัสลำดับการดูแลรักษา</value>
-    </property>
-    <property key="AccountingFixedAssetName">
-        <value xml:lang="en">Description</value>
-        <value xml:lang="it">Descrizione</value>
-        <value xml:lang="th">รายละเอียด</value>
-    </property>
-    <property key="AccountingFixedAssetParent">
-        <value xml:lang="en">Equipment Group</value>
-        <value xml:lang="fr">Groupe d'équipement</value>
-        <value xml:lang="it">Gruppo Cespite</value>
-        <value xml:lang="th">กลุ่มเครื่องมือ</value>
-    </property>
-    <property key="AccountingFixedAssetStdCosts">
-        <value xml:lang="en">Standard Costs</value>
-        <value xml:lang="fr">Coûts standards</value>
-        <value xml:lang="it">Costi Standard</value>
-        <value xml:lang="th">ราคามาตรฐาน</value>
-    </property>
-    <property key="AccountingInstanceOfProductId">
-        <value xml:lang="en">Manufacturer Product Id</value>
-        <value xml:lang="fr">Réf. fournisseur de l'article</value>
-        <value xml:lang="it">Codice Prodotto Produttore</value>
-        <value xml:lang="th">รหัสผู้ผลิตสินค้า</value>
-    </property>
-    <property key="AccountingNewFixedAsset">
-        <value xml:lang="en">New Equipment</value>
-        <value xml:lang="fr">Nouvel équipement</value>
-        <value xml:lang="it">Nuova Cespite</value>
-        <value xml:lang="th">เครื่องมือใหม่</value>
-    </property>
-    <property key="AccountingNewFixedAssetIdent">
-        <value xml:lang="en">Create Identification</value>
-        <value xml:lang="fr">Créer une identification</value>
-        <value xml:lang="it">Crea Identificazione</value>
-        <value xml:lang="th">สร้างเลขประจำตัว</value>
-    </property>
-    <property key="AccountingNewFixedAssetIdentsType">
-        <value xml:lang="en">Create Equipment Identification Type</value>
-        <value xml:lang="fr">Créer un type d'identification d'équipement</value>
-        <value xml:lang="it">Crea Tipo Identificazione Cespite</value>
-        <value xml:lang="th">สร้างประเภทเลขประจำตัวเครื่องมือ</value>
-    </property>
-    <property key="AssetEquipmentStdCosts">
-        <value xml:lang="en">Standard Cost</value>
-        <value xml:lang="it">Costo Standard</value>
-        <value xml:lang="th">ราคามาตรฐาน</value>
-    </property>
     <property key="AssetMaintApplication">
         <value xml:lang="en">Asset Maintenance Application</value>
         <value xml:lang="fr">Application de maintenance des biens</value>
@@ -176,6 +36,12 @@
         <value xml:lang="it">Manutenzione Dipartimento</value>
         <value xml:lang="th">แผนกการดูแลรักษา</value>
     </property>
+    <property key="AssetMaintItemIssuance">
+        <value xml:lang="en">Parts</value>
+        <value xml:lang="fr">Pièces</value>
+        <value xml:lang="it">Parti</value>
+        <value xml:lang="th">ส่วนหนึ่ง</value>
+    </property>
     <property key="AssetMaintInvalidPartProductIdError">
         <value xml:lang="en">"Part Id ${productId} provided is invalid please check and try again"</value>
         <value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
@@ -201,36 +67,6 @@
         <value xml:lang="fr">Afficher l'erreur d'autorisation</value>
         <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>
     </property>
-    <property key="FixedAssetMaintItemIssuance">
-        <value xml:lang="en">Parts</value>
-        <value xml:lang="fr">Pièces</value>
-        <value xml:lang="it">Parti</value>
-        <value xml:lang="th">ส่วนหนึ่ง</value>
-    </property>
-    <property key="FixedAssetMaintWorkEffortName">
-        <value xml:lang="en">Maintenance of Equipment</value>
-        <value xml:lang="fr">Maintenance de l'équipement</value>
-        <value xml:lang="it">Manutenzione di un Cespite</value>
-        <value xml:lang="th">การบำรุงรักษาเครื่องมือ</value>
-    </property>
-    <property key="LabelTitleEditFixedAsset">
-        <value xml:lang="en">Edit Equipment</value>
-        <value xml:lang="fr">Editer l'équipement</value>
-        <value xml:lang="it">Aggiorna Cespite</value>
-        <value xml:lang="th">แก้ไขเครื่องมือ</value>
-    </property>
-    <property key="LabelTitleFindFixedAssets">
-        <value xml:lang="en">Find Equipments</value>
-        <value xml:lang="fr">Chercher des équipements</value>
-        <value xml:lang="it">Ricerca Cespite</value>
-        <value xml:lang="th">ค้นหาเรื่องมือ</value>
-    </property>
-    <property key="LabelTitleFixedAssetChildren">
-        <value xml:lang="en">Children Equipments</value>
-        <value xml:lang="fr">Equipements descendants</value>
-        <value xml:lang="it">Figli Cespite</value>
-        <value xml:lang="th">เครื่องมือเด็ก</value>
-    </property>
     <property key="PageTitleAddItemIssuance">
         <value xml:lang="en">Add Item Issuance</value>
         <value xml:lang="fr">Ajouter une émission d'article</value>
@@ -273,46 +109,4 @@
         <value xml:lang="it">Lista Soggetti</value>
         <value xml:lang="th">ส่วนหนึ่งของรายการ</value>
     </property>
-    <property key="ProductWarehouse">
-        <value xml:lang="en">Warehouse</value>
-        <value xml:lang="fr">Entrepôt</value>
-        <value xml:lang="it">Magazzino</value>
-        <value xml:lang="th">คลังสินค้า</value>
-    </property>
-    <property key="WorkEffortActualCompletionDate">
-        <value xml:lang="en">Completion Date</value>
-        <value xml:lang="fr">Date de fin</value>
-        <value xml:lang="it">Data Termine</value>
-        <value xml:lang="th">วันที่เสร็จสิ้น</value>
-    </property>
-    <property key="WorkEffortActualStartDate">
-        <value xml:lang="en">Start Date</value>
-        <value xml:lang="fr">Date de début</value>
-        <value xml:lang="it">Data Inizio</value>
-        <value xml:lang="th">วันที่เริ่มต้น</value>
-    </property>
-    <property key="WorkEffortAllTasks">
-        <value xml:lang="en">Tasks</value>
-        <value xml:lang="fr">Tâches</value>
-        <value xml:lang="it">Compiti</value>
-        <value xml:lang="th">งาน</value>
-    </property>
-    <property key="WorkEffortSummary">
-        <value xml:lang="en">Schedule Summary</value>
-        <value xml:lang="fr">Résumé du programme</value>
-        <value xml:lang="it">Sommario Schedulazione</value>
-        <value xml:lang="th">สรุปกำหนดการ</value>
-    </property>
-    <property key="WorkEffortWorkEffortAssocTypeId">
-        <value xml:lang="en">Association Type</value>
-        <value xml:lang="fr">Type d'association</value>
-        <value xml:lang="it">Tipo Associazione</value>
-        <value xml:lang="th">ประเภทกลุ่ม</value>
-    </property>
-    <property key="WorkEffortWorkEffortPurposeTypeId">
-        <value xml:lang="en">Purpose</value>
-        <value xml:lang="fr">But</value>
-        <value xml:lang="it">Funzione</value>
-        <value xml:lang="th">วัตถุประสงค์</value>
-    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh Tue Jul 15 12:20:15 2008
@@ -30,21 +30,21 @@
 
 if (maintHistSeqId == null) {
     maintHistSeqId = parameters.get("maintHistSeqId");
-}
-if (maintHistSeqId == null) {
-    maintHistSeqId = request.getParameter("maintHistSeqId");
+    if (maintHistSeqId == null) {
+        maintHistSeqId = request.getParameter("maintHistSeqId");
+    }
 }
 if (fixedAssetId == null) {
     fixedAssetId = parameters.get("fixedAssetId");
-}
-if (fixedAssetId == null) {
-    fixedAssetId = request.getParameter("fixedAssetId");
+    if (fixedAssetId == null) {
+        fixedAssetId = request.getParameter("fixedAssetId");
+    }
 }
 if (workEffortId == null) {
     workEffortId = parameters.get("workEffortId");
-}
-if (workEffortId == null) {
-    workEffortId = request.getParameter("workEffortId");
+    if (workEffortId == null) {
+        workEffortId = request.getParameter("workEffortId");
+    }
 }
 
 fixedAssetMaint = null;
@@ -55,7 +55,9 @@
 if (workEffortId != null) {
     workEffort = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
     if (workEffort != null) {
-        fixedAssetId = workEffort.get("fixedAssetId");
+        if (fixedAssetId == null) {
+            fixedAssetId = workEffort.get("fixedAssetId");
+        }
         // If this is a child workeffort, locate the "root" workeffort
         parentWorkEffort = EntityUtil.getFirst(delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdTo", workEffortId)));
         while (parentWorkEffort != null) {

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/includes/appbar.ftl Tue Jul 15 12:20:15 2008
@@ -32,9 +32,3 @@
     </ul>
     <br class="clear"/>
 </div>
-
-
-
-
-
-

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Tue Jul 15 12:20:15 2008
@@ -177,7 +177,7 @@
                                     </widgets>
                                     <fail-widgets>
                                         <container style="button-bar">
-                                            <link target="EditWorkEfforts?workEffortId=${workEffortId}&amp;mode=addAssignment" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+                                            <link target="EditWorkEfforts?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${workEffortId}&amp;mode=addAssignment" text="${uiLabelMap.CommonNew}" style="buttontext"/>
                                         </container>
                                     </fail-widgets>
                                 </section>
@@ -196,7 +196,7 @@
                                     </widgets>
                                     <fail-widgets>
                                         <container style="button-bar">
-                                            <link target="EditWorkEfforts?workEffortId=${workEffortId}&amp;mode=addChildTask" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+                                            <link target="EditWorkEfforts?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${workEffortId}&amp;mode=addChildTask" text="${uiLabelMap.CommonNew}" style="buttontext"/>
                                         </container>
                                     </fail-widgets>
                                 </section>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Tue Jul 15 12:20:15 2008
@@ -38,7 +38,7 @@
         <menu-item name="EditWorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}">
             <link target="EditWorkEffortNotes?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}&amp;workEffortId=${fixedAssetMaint.scheduleWorkEffortId}"/>
         </menu-item>
-        <menu-item name="EditItemIssuances" title="${uiLabelMap.FixedAssetMaintItemIssuance}">
+        <menu-item name="EditItemIssuances" title="${uiLabelMap.AssetMaintItemIssuance}">
             <link target="EditItemIssuances?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
     </menu>  

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Tue Jul 15 12:20:15 2008
@@ -92,10 +92,10 @@
         <field name="fixedAssetId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupFixedAsset"/></field>        
         <field name="scheduleWorkEffortId"><hidden/></field>
         <field name="submitButton" ><ignored/></field>
-        <field map-name="workEffort" title="${uiLabelMap.WorkEffortEstimatedStartDate}" position="1"  name="estimatedStartDate"><date-time/></field>
-        <field map-name="workEffort" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" position="2"  name="estimatedCompletionDate"><date-time/></field>
-        <field map-name="workEffort" title="${uiLabelMap.WorkEffortActualStartDate}" position="1"  name="actualStartDate"><date-time/></field>
-        <field map-name="workEffort" title="${uiLabelMap.WorkEffortActualCompletionDate}" position="2"  name="actualCompletionDate"><date-time/></field>
+        <field map-name="workEffort" position="1"  name="estimatedStartDate"><date-time/></field>
+        <field map-name="workEffort" position="2"  name="estimatedCompletionDate"><date-time/></field>
+        <field map-name="workEffort" position="1" name="actualStartDate"><date-time/></field>
+        <field map-name="workEffort" position="2" name="actualCompletionDate"><date-time/></field>
         <field name="quickAssignPartyId" title="${uiLabelMap.PartyPartyId}" use-when="fixedAssetMaint == null" field-name="partyId">
             <lookup target-form-name="LookupPerson"/>
         </field>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=677012&r1=677011&r2=677012&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Tue Jul 15 12:20:15 2008
@@ -68,7 +68,7 @@
         <field map-name="workEffort" name="estimatedCompletionDate" position="2"><date-time/></field>
         <field map-name="workEffort" name="actualStartDate" position="1"><date-time/></field>
         <field map-name="workEffort" name="actualCompletionDate" position="2"><date-time/></field>
-        <field map-name="workEffort" name="facilityId" title="${uiLabelMap.AccountingFacilityId}"><lookup target-form-name="LookupFacility"/></field>
+        <field map-name="workEffort" name="facilityId"><lookup target-form-name="LookupFacility"/></field>
         <field map-name="fixedAssetMaint" name="fixedAssetId"><hidden/></field>
         <field map-name="workEffort" name="moneyUomId" title="${uiLabelMap.CommonCurrency}"><ignored/></field>
         <field map-name="workEffort" name="workEffortTypeId"><hidden value="TASK"/></field>
@@ -121,7 +121,7 @@
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="description"><hidden value="${workEffort.description}"/></field>
 
-        <field name="workEffortAssocTypeId" title="${uiLabelMap.WorkEffortWorkEffortAssocTypeId}">
+        <field name="workEffortAssocTypeId">
             <drop-down>
                 <entity-options entity-name="WorkEffortAssocType" description="${description}">
                     <entity-order-by field-name="description"/>


Free forum by Nabble Edit this page