svn commit: r1050830 - in /ofbiz/trunk/applications/workeffort: config/WorkEffortUiLabels.xml script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml widget/WorkEffortRequestForms.xml

[mrisaliti]

Author: mrisaliti
Date: Sun Dec 19 12:21:35 2010
New Revision: 1050830

URL: http://svn.apache.org/viewvc?rev=1050830&view=rev
Log:
Replace some fail-message to fail-property tag in workeffort component (OFBIZ-1874)

Modified:
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1050830&r1=1050829&r2=1050830&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sun Dec 19 12:21:35 2010
@@ -1858,6 +1858,14 @@
         <value xml:lang="fr">Annuler un évènement</value>
         <value xml:lang="it">Annulla evento calendario</value>
     </property>
+    <property key="WorkEffortCannotDeleteContactInfo">
+        <value xml:lang="en">ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort</value>
+        <value xml:lang="it">ERRORE: Non è possibile cancellare il contatto perchè non corrisponde all'impegno di lavoro specificato</value>
+    </property>
+    <property key="WorkEffortCannotUpdateContactInfo">
+        <value xml:lang="en">ERROR: Cannot update specified contact info because it does not correspond to the specified work effort</value>
+        <value xml:lang="it">ERRORE: Non è possibile aggiornare il contatto perchè non corrisponde all'impegno di lavoro specificato</value>
+    </property>
     <property key="WorkEffortCommEventId">
         <value xml:lang="en">Comm Event Id</value>
         <value xml:lang="it">Evento comunicazioni</value>
@@ -1981,12 +1989,12 @@
         <value xml:lang="zh_TW">新建工項</value>
     </property>
     <property key="WorkEffortCreatePermissionError">
-        <value xml:lang="en">Security Error: to run this operation you must have the WORKEFFORTMGR_CREATE or WORKEFFORTMGR_ADMIN permission</value>
-        <value xml:lang="fr">Erreur de sécurité: pour exécuter cette opération vous devez avoir l'autorisation WORKEFFORTMGR_CREATE or WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="it">Errore sicurezza: per eseguire questa operazione devi avere il permesso WORKEFFORTMGR_CREATE o WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="th">Security Error: ความปลอดภัยผิดพลาด ! ถึงการดำเนินการกิจการนี้คุณต้องมี WORKEFFORTMGR_CREATE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
-        <value xml:lang="zh">安全错误：要运行这个操作你必须具有 WORKEFFORTMGR_CREATE 或 WORKEFFORTMGR_ADMIN 权限</value>
-        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有 WORKEFFORTMGR_CREATE 或 WORKEFFORTMGR_ADMIN 權限</value>
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the WORKEFFORTMGR_CREATE or WORKEFFORTMGR_ADMIN permission</value>
+        <value xml:lang="fr">Erreur de sécurité: pour exécuter ${resourceDescription} vous devez avoir l'autorisation WORKEFFORTMGR_CREATE or WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="it">Errore sicurezza: per eseguire ${resourceDescription} devi avere il permesso WORKEFFORTMGR_CREATE o WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="th">Security Error: ${resourceDescription} ความปลอดภัยผิดพลาด ! ถึงการดำเนินการกิจการนี้คุณต้องมี WORKEFFORTMGR_CREATE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
+        <value xml:lang="zh">安全错误：要运行这个操作你必须具有 ${resourceDescription} WORKEFFORTMGR_CREATE 或 WORKEFFORTMGR_ADMIN 权限</value>
+        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有 ${resourceDescription} WORKEFFORTMGR_CREATE 或 WORKEFFORTMGR_ADMIN 權限</value>
     </property>
     <property key="WorkEffortCreated">
         <value xml:lang="de">Erstellt</value>
@@ -2008,6 +2016,22 @@
         <value xml:lang="zh">客户评价</value>
         <value xml:lang="zh_TW">客戶評價</value>
     </property>
+    <property key="WorkEffortCustRequestAlreadyExists">
+        <value xml:lang="en">ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] already exists</value>
+        <value xml:lang="it">ERRORE: Richiesta impegno di lavoro [${parameters.custRequestId}][${parameters.workEffortId}] esiste già</value>
+    </property>
+    <property key="WorkEffortCustRequestDoesNotExists">
+        <value xml:lang="en">ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] does not exist</value>
+        <value xml:lang="it">ERRORE: Richiesta impegno di lavoro [${parameters.custRequestId}][${parameters.workEffortId}] non esiste</value>
+    </property>
+    <property key="WorkEffortCustRequestItemAlreadyExists">
+        <value xml:lang="en">ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] already exists.</value>
+        <value xml:lang="it">ERRORE: Riga richiesta impegno di lavoro [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] esiste già</value>
+    </property>
+    <property key="WorkEffortCustRequestItemDoesNotExists">
+        <value xml:lang="en">ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] does not exists.</value>
+        <value xml:lang="it">ERRORE: Riga richiesta impegno di lavoro [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] non esiste</value>
+    </property>
     <property key="WorkEffortDayView">
         <value xml:lang="de">Tagesansicht</value>
         <value xml:lang="en">Day View</value>
@@ -2029,13 +2053,13 @@
         <value xml:lang="zh_TW">委托原因</value>
     </property>
     <property key="WorkEffortDeletePermissionError">
-        <value xml:lang="de">Sicherheitsfehler: Um diese Aktion auszuführen müssen sie WORKEFFORTMGR_DELETE oder WORKEFFORTMGR_ADMIN Rechte besitzen</value>
-        <value xml:lang="en">Security Error: to run this operation you must have the WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN permission</value>
-        <value xml:lang="fr">Erreur de sécurité: pour exécuter cette opération vous devez avoir l'autorisation WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="it">Errore sicurezza: per eseguire questa operazione devi avere il permesso WORKEFFORTMGR_DELETE o WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="th">Security Error: ความปลอดภัยผิดพลาด ! ถึงการดำเนินการกิจการนี้คุณต้องมี WORKEFFORTMGR_DELETE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
-        <value xml:lang="zh">安全错误：要运行这个操作你必须具有WORKEFFORTMGR_DELETE 或 WORKEFFORTMGR_ADMIN 权限</value>
-        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有WORKEFFORTMGR_DELETE 或 WORKEFFORTMGR_ADMIN 權限</value>
+        <value xml:lang="de">Sicherheitsfehler: Um diese Aktion ${resourceDescription} auszuführen müssen sie WORKEFFORTMGR_DELETE oder WORKEFFORTMGR_ADMIN Rechte besitzen</value>
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN permission</value>
+        <value xml:lang="fr">Erreur de sécurité: pour exécuter ${resourceDescription} vous devez avoir l'autorisation WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="it">Errore sicurezza: per eseguire ${resourceDescription} devi avere il permesso WORKEFFORTMGR_DELETE o WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="th">Security Error: ${resourceDescription} ความปลอดภัยผิดพลาด ! ถึงการดำเนินการกิจการนี้คุณต้องมี WORKEFFORTMGR_DELETE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
+        <value xml:lang="zh">安全错误：要运行这个操作你必须具有 ${resourceDescription} WORKEFFORTMGR_DELETE 或 WORKEFFORTMGR_ADMIN 权限</value>
+        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有 ${resourceDescription} WORKEFFORTMGR_DELETE 或 WORKEFFORTMGR_ADMIN 權限</value>
     </property>
     <property key="WorkEffortDuplicateWorkEffort">
         <value xml:lang="de">Dupliziere Arbeitseinsatz</value>
@@ -3029,6 +3053,14 @@
         <value xml:lang="zh">在新窗口中打开页面</value>
         <value xml:lang="zh_TW">在新視窗中打開頁面</value>
     </property>
+    <property key="WorkEffortOrderHeaderAlreadyExists">
+        <value xml:lang="en">ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] already exists.</value>
+        <value xml:lang="it">ERRORE: Testata ordine impegno di lavoro [${parameters.orderId}][${parameters.workEffortId}] esiste già.</value>
+    </property>
+    <property key="WorkEffortOrderHeaderDoesNotExists">
+        <value xml:lang="en">ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] does not exist.</value>
+        <value xml:lang="it">ERRORE: Testata ordine impegno di lavoro [${parameters.orderId}][${parameters.workEffortId}] non esiste.</value>
+    </property>
     <property key="WorkEffortOrderHeaders">
         <value xml:lang="de">Aufträge</value>
         <value xml:lang="en">Orders</value>
@@ -3407,6 +3439,22 @@
         <value xml:lang="zh">项目</value>
         <value xml:lang="zh_TW">專案</value>
     </property>
+    <property key="WorkEffortRequirementFulfillmentAlreadyExists">
+        <value xml:lang="en">ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] already exists.</value>
+        <value xml:lang="it">ERRORE: Richiesta impegno di lavoro [${parameters.quoteId}][${parameters.workEffortId}] esiste già.</value>
+    </property>
+    <property key="WorkEffortRequirementFulfillmentDoesNotExists">
+        <value xml:lang="en">ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] does not exists.</value>
+        <value xml:lang="it">ERRORE: Richiesta impegno di lavoro [${parameters.quoteId}][${parameters.workEffortId}] non esiste.</value>
+    </property>
+    <property key="WorkEffortShoppingListAlreadyExists">
+        <value xml:lang="en">ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] already exists.</value>
+        <value xml:lang="it">ERRORE: Lista d'acquisto impegno di lavoro [${parameters.shoppingListId}][${parameters.workEffortId}] esiste già.</value>
+    </property>
+    <property key="WorkEffortShoppingListDoesNotExists">
+        <value xml:lang="en">ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] does not exists.</value>
+        <value xml:lang="it">ERRORE: Lista d'acquisto impegno di lavoro [${parameters.shoppingListId}][${parameters.workEffortId}] non esiste.</value>
+    </property>
     <property key="WorkEffortQuantity">
         <value xml:lang="de">Anzahl</value>
         <value xml:lang="en">Quantity</value>
@@ -3420,6 +3468,14 @@
         <value xml:lang="zh">数量</value>
         <value xml:lang="zh_TW">數量</value>
     </property>
+    <property key="WorkEffortQuoteAlreadyExists">
+        <value xml:lang="en">ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists.</value>
+        <value xml:lang="it">ERRORE: Preventivo impegno di lavoro [${parameters.quoteId}][${parameters.workEffortId}] esiste già.</value>
+    </property>
+    <property key="WorkEffortQuoteDoesNotExists">
+        <value xml:lang="en">ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exists.</value>
+        <value xml:lang="it">ERRORE: Preventivo impegno di lavoro [${parameters.quoteId}][${parameters.workEffortId}] non esiste.</value>
+    </property>
     <property key="WorkEffortQuoteItems">
         <value xml:lang="en">Quote Items</value>
         <value xml:lang="es">Items de cotización</value>
@@ -3833,6 +3889,10 @@
         <value xml:lang="zh">状态</value>
         <value xml:lang="zh_TW">狀態</value>
     </property>
+    <property key="WorkEffortStatusChangeNotValid">
+        <value xml:lang="en">The status change from ${lookedUpValue.currentStatusId} to ${parameters.currentStatusId} is not a valid change</value>
+        <value xml:lang="it">Il cambio di stato da ${lookedUpValue.currentStatusId} a ${parameters.currentStatusId} non è consentito</value>
+    </property>
     <property key="WorkEffortStatusIdMissing">
         <value xml:lang="en">Current Status ID is missing.</value>
         <value xml:lang="fr">La réf. de statut courant est manquante</value>
@@ -4001,6 +4061,18 @@
         <value xml:lang="zh">工单</value>
         <value xml:lang="zh_TW">工單</value>
     </property>
+    <property key="WorkEffortTimesheetAlreadyExists">
+        <value xml:lang="en">Time sheet already exist, not created an other one.</value>
+        <value xml:lang="it">Timbratura già esistente, non crearne un'altra.</value>
+    </property>
+    <property key="WorkEffortTimesheetCannotFindInvoice">
+        <value xml:lang="en">Could not find invoice with ID [${invoiceId}], not adding Timesheet Entries to it.</value>
+        <value xml:lang="it">Non trovata fattura [${invoiceId}], non verrà aggiunta alla riga di timbratura.</value>
+    </property>
+    <property key="WorkEffortTimesheetCouldNotBeFound">
+        <value xml:lang="en">Timesheet could not be found, timesheetId: ${parameters.timesheetId}</value>
+        <value xml:lang="it">Timbratura ${parameters.timesheetId} non trovata</value>
+    </property>
     <property key="WorkEffortTimesheetCreate">
         <value xml:lang="de">Erstelle Zeiterfassung</value>
         <value xml:lang="en">Create Timesheet</value>
@@ -4036,6 +4108,14 @@
         <value xml:lang="zh">我的时间</value>
         <value xml:lang="zh_TW">我的時間</value>
     </property>
+    <property key="WorkEffortTimesheetInvoiceShuoldBeInProgressStatus">
+        <value xml:lang="en">Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}</value>
+        <value xml:lang="it">La fattura ${invoiceId} dovrebbe avere lo stato 'in corso', lo stato invece è: ${invoice.statusId}</value>
+    </property>
+    <property key="WorkEffortTimesheetNotInProcessStatus">
+        <value xml:lang="en">Can only update Timesheet, when status is in-process...current status: ${statusItem.description}</value>
+        <value xml:lang="it">La timbratura può essere aggiornata solo quanto lo stato è "in-corso"... stato corrente: ${statusItem.description}</value>
+    </property>
     <property key="WorkEffortTimesheetNotInRolePermissionError">
         <value xml:lang="en">Security Error: to run ${resourceDescription} you must be in ${roleTypeId} role with WorkEffort: ${workEffortId}</value>
         <value xml:lang="fr">Erreur de sécurité: pour exécuter ${resourceDescription} vous devez être dans le rôle ${roleTypeId} avec la tâche ${workEffortId}</value>
@@ -4138,12 +4218,12 @@
         <value xml:lang="zh_TW">即將發生的事件</value>
     </property>
     <property key="WorkEffortUpdatePermissionError">
-        <value xml:lang="en">Security Error: to run this operation you must have the WORKEFFORTMGR_UPDATE or WORKEFFORTMGR_ADMIN permission</value>
-        <value xml:lang="fr">Erreur de sécurité: pour exécuter cette opération vous devez avoir l'autorisation WORKEFFORTMGR_UPDATE ou WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="it">Errore sicurezza: per eseguire questa operazione devi avere il permesso WORKEFFORTMGR_UPDATE o WORKEFFORTMGR_ADMIN</value>
-        <value xml:lang="th">Security Error: ความปลอดภัยผิดพลาด ! ในการดำเนินการเชื่อมต่อนี้คุณต้องมี WORKEFFORTMGR_UPDATE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
-        <value xml:lang="zh">安全错误：要运行这个操作你必须具有WORKEFFORTMGR_UPDATE 或 WORKEFFORTMGR_ADMIN 权限</value>
-        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有WORKEFFORTMGR_UPDATE 或 WORKEFFORTMGR_ADMIN 權限</value>
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the WORKEFFORTMGR_UPDATE or WORKEFFORTMGR_ADMIN permission</value>
+        <value xml:lang="fr">Erreur de sécurité: pour exécuter ${resourceDescription} vous devez avoir l'autorisation WORKEFFORTMGR_UPDATE ou WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="it">Errore sicurezza: per eseguire ${resourceDescription} devi avere il permesso WORKEFFORTMGR_UPDATE o WORKEFFORTMGR_ADMIN</value>
+        <value xml:lang="th">Security Error: ${resourceDescription} ความปลอดภัยผิดพลาด ! ในการดำเนินการเชื่อมต่อนี้คุณต้องมี WORKEFFORTMGR_UPDATE หรือ WORKEFFORTMGR_ADMIN อนุญาต</value>
+        <value xml:lang="zh">安全错误：要运行这个操作你必须具有 ${resourceDescription} WORKEFFORTMGR_UPDATE 或 WORKEFFORTMGR_ADMIN 权限</value>
+        <value xml:lang="zh_TW">安全錯誤：要運行這個操作你必須具有 ${resourceDescription} WORKEFFORTMGR_UPDATE 或 WORKEFFORTMGR_ADMIN 權限</value>
     </property>
     <property key="WorkEffortUsername">
         <value xml:lang="de">Benutzername</value>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=1050830&r1=1050829&r2=1050830&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Sun Dec 19 12:21:35 2010
@@ -69,7 +69,9 @@ under the License.
         <if-empty field="timesheets">
                 <call-simple-method method-name="createTimesheet"/>
             <else>
-                <add-error><fail-message message="Time sheet already exist, not created an other one."/></add-error>
+                <add-error>
+                    <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetAlreadyExists"/>
+                </add-error>
                 <check-errors/>
             </else>
         </if-empty>
@@ -82,7 +84,9 @@ under the License.
        </iterate>
     </simple-method>
     <simple-method method-name="addTimesheetToInvoice" short-description="Add Timesheet to Invoice">
-        <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <entity-one entity-name="Timesheet" value-field="timesheet"/>
@@ -103,14 +107,18 @@ under the License.
 
         <entity-one entity-name="Invoice" value-field="invoice"/>
         <if-empty field="invoice">
-            <add-error><fail-message message="Could not find invoice with ID [${invoiceId}], not adding Timesheet Entries to it."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetCannotFindInvoice"/>
+            </add-error>
             <check-errors/>
         </if-empty>
 
         <call-simple-method method-name="createTimeEntryInvoiceItemsInline"/>
     </simple-method>
     <simple-method method-name="addWorkEffortTimeToInvoice" short-description="Add Work Effort Time to Invoice">
-        <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
         <check-errors/>
         <entity-one entity-name="WorkEffort" value-field="workEffort"/>
         <if-empty field="parameters.invoiceId">
@@ -124,7 +132,9 @@ under the License.
         </if-empty>
         <entity-one entity-name="Invoice" value-field="invoice"/>
         <if-empty field="invoice">
-            <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetCannotFindInvoice"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <!-- update currency, can be changed with regenerate -->
@@ -278,7 +288,9 @@ under the License.
                         <else>
                             <set field="errMsg" value="Invoice ${invoiceId} should have the status 'in progress', the status is however: ${invoice.statusId}"/>
                             <log level="error" message="${errMsg}"/>
-                            <add-error error-list-name="errorMessageList"><fail-message message="${errMsg}"/></add-error>
+                            <add-error error-list-name="errorMessageList">
+                                <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetInvoiceShuoldBeInProgressStatus"/>
+                            </add-error>
                             <return response-code="error"/>
                         </else>
                     </if-compare>
@@ -289,7 +301,9 @@ under the License.
 
     <!-- TimesheetRole Services -->
     <simple-method method-name="createTimesheetRole" short-description="Create TimesheetRole">
-        <check-permission permission="WORKEFFORTMGR" action="_CREATE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="TimesheetRole"/>
@@ -297,7 +311,9 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="deleteTimesheetRole" short-description="Delete TimesheetRole">
-        <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_DELETE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <entity-one entity-name="TimesheetRole" value-field="lookedUpValue"/>
@@ -373,7 +389,9 @@ under the License.
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="getTimeEntryRate" short-description="Get TimeEntry Rate">
-        <check-permission permission="WORKEFFORTMGR" action="_VIEW"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_VIEW">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortViewPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <entity-one entity-name="TimeEntry" value-field="timeEntry"/>
@@ -413,14 +431,18 @@ under the License.
                 </if-empty>
                 <entity-one entity-name="Timesheet" value-field="timesheet"/>
                 <if-empty field="timesheet">
-                    <add-error><fail-message message="Timesheet could not be found, timesheetId: ${parameters.timesheetId}"/></add-error>
+                    <add-error>
+                        <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetCouldNotBeFound"/>
+                    </add-error>
                     <log level="info" message="Timesheet not found, timesheet: ${parameters.timesheetId}"/>
                     <check-errors/>
                 </if-empty>
                 <!-- check if the status is in progress... -->
                 <if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="not-equals">
                     <get-related-one value-field="timesheet" relation-name="StatusItem" to-value-field="statusItem"/>
-                    <add-error><fail-message message="Can only update Timesheet, when status is in-process...current status: ${statusItem.description}"/></add-error>
+                    <add-error>
+                        <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetNotInProcessStatus"/>
+                    </add-error>
                     <log level="info" message="Can only update Timesheet, when status is in-process...is now: ${timesheet.statusId}"/>
                 </if-compare>
             </then>

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=1050830&r1=1050829&r2=1050830&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 Sun Dec 19 12:21:35 2010
@@ -77,7 +77,9 @@ under the License.
             <set field="goodStatusId" value="CRQ_ACCEPTED"/>
             <if-compare-field operator="not-equals" field="lookedUpValue.statusId" to-field="goodStatusId" >
                 <set field="entity" value="Customer request"/>
-                <add-error><fail-property resource="CommonUiLabels" property="CommonErrorStatusNotValid"/></add-error>
+                <add-error>
+                    <fail-property resource="CommonUiLabels" property="CommonErrorStatusNotValid"/>
+                </add-error>
                 <check-errors/>
             </if-compare-field>
             <!-- create customer request / work effort relation -->
@@ -110,7 +112,9 @@ under the License.
         <set from-field="partyId" map-name="userLogin" to-map-name="findWepaMap"/>
         <find-by-and entity-name="WorkEffortPartyAssignment" map="findWepaMap" list="wepaList"/>
         <if-empty field="wepaList">
-            <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateWorkEffort you must have the WORKEFFORTMGR_UPDATE or WORKEFFORTMGR_ADMIN permission"/></check-permission>
+            <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
+            </check-permission>
             <check-errors/>
         </if-empty>-->
 
@@ -136,7 +140,9 @@ under the License.
                     </entity-and>
 
                     <if-empty field="validChange">
-                        <add-error><fail-message message="The status change from ${lookedUpValue.currentStatusId} to ${parameters.currentStatusId} is not a valid change"/></add-error>
+                        <add-error>
+                            <fail-property resource="WorkEffortUiLabels" property="WorkEffortStatusChangeNotValid"/>
+                        </add-error>
                         <log level="error" message="The status change from ${lookedUpValue.currentStatusId} to ${parameters.currentStatusId} is not a valid change"/>
                         <check-errors/>
                     </if-empty>
@@ -176,7 +182,9 @@ under the License.
             <field-map field-name="partyId" from-field="userLogin.partyId"/>
         </entity-and>
         <if-empty field="wepaList">
-            <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="Security Error: to run deleteWorkEffort you must have the WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN permission"/></check-permission>
+            <check-permission permission="WORKEFFORTMGR" action="_DELETE">
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
+            </check-permission>
             <check-errors/>
         </if-empty>
 
@@ -218,15 +226,19 @@ under the License.
         <field-to-result field="lookupMap.communicationEventId" result-name="communicationEventId"/>
     </simple-method>
 
-    <simple-method method-name="updateCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff">
-        <check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this work effort."/></check-permission>
+    <simple-method method-name="updateCommunicationEventWorkEff" short-description="Update a CommunicationEventWorkEff">
+        <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
+        </check-permission>
         <check-errors/>
         <!-- Find old value -->
         <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <set-pk-fields value-field="communicationEventWorkEff" map="parameters"/>
         <find-by-primary-key entity-name="CommunicationEventWorkEff" map="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <if-empty field="communicationEventWorkEff">
-            <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCannotUpdateContactInfo"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <set-nonpk-fields value-field="communicationEventWorkEff" map="parameters"/>
@@ -234,14 +246,18 @@ under the License.
     </simple-method>
 
     <simple-method method-name="deleteCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff">
-        <check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="You do not have permission to perform this operation for this work effort."/></check-permission>
+        <check-permission permission="WORKEFFORTMGR" action="_DELETE">
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
+        </check-permission>
         <check-errors/>
         <!-- Find old value -->
         <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <set-pk-fields value-field="communicationEventWorkEff" map="parameters"/>
         <find-by-primary-key entity-name="CommunicationEventWorkEff" map="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <if-empty field="communicationEventWorkEff">
-            <add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCannotDeleteContactInfo"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <remove-value value-field="communicationEventWorkEff"/>
@@ -289,9 +305,7 @@ under the License.
         <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
         <!-- to be dropped later (use now workEffortGenericPermission)
         <if-compare-field field="userLogin.partyId" to-field="workEffortPartyAssignment.partyId" operator="not-equals">
-            <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
-                <fail-message message="You cannot update this Work Effort Party Assignment, you must either be associated with it or have administration permission."/>
-               </check-permission>
+            <check-permission permission="WORKEFFORTMGR" action="_UPDATE"/>
             <check-errors/>
         </if-compare-field>
          -->
@@ -356,7 +370,9 @@ under the License.
         <!-- Find old value -->
         <entity-one entity-name="WorkEffortContactMech" value-field="workEffortContactMech"/>
         <if-empty field="workEffortContactMech">
-            <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCannotUpdateContactInfo"/>
+            </add-error>
         </if-empty>
         <check-errors/>
 
@@ -394,7 +410,9 @@ under the License.
         <!-- Find old value -->
         <entity-one entity-name="WorkEffortContactMech" value-field="workEffortContactMech"/>
         <if-empty field="workEffortContactMech">
-            <add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCannotDeleteContactInfo"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <remove-value value-field="workEffortContactMech"/>
@@ -603,7 +621,9 @@ under the License.
         </else>
         </if-empty>
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/>
+            </add-error>
             <check-errors/>
         <else>
             <if-empty field="parameters.workEffortIdTo">
@@ -629,7 +649,9 @@ under the License.
         </if-empty>
 
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/>
+            </add-error>
             <check-errors/>
         <else>
             <make-value value-field="newEntity" entity-name="WorkEffortAssoc"/>
@@ -655,7 +677,9 @@ under the License.
     <simple-method method-name="createWorkEffortGoodStandard" short-description="Create a link between a WorkEffort and a Product">
         <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/>
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/>
+            </add-error>
             <check-errors/>
         <else>
             <make-value value-field="newEntity" entity-name="WorkEffortGoodStandard"/>
@@ -702,7 +726,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="CustRequestWorkEffort" map="lookupMap" value-field="custRequestWorkEffort"/>
         <if-not-empty field="custRequestWorkEffort">
-            <add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -712,7 +738,9 @@ under the License.
     <simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
         <entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
         <if-empty field="custRequestWorkEffort">
-            <add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="custRequestWorkEffort"/>
@@ -724,7 +752,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="custRequestItemWorkEffort"/>
         <if-not-empty field="custRequestItemWorkEffort">
-            <add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestItemAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -733,7 +763,9 @@ under the License.
     <simple-method method-name="deleteWorkEffortRequestItem" short-description="Delete a CustRequestItemWorkEffort">
         <entity-one entity-name="CustRequestItemWorkEffort" value-field="custRequestItemWorkEffort"/>
         <if-empty field="custRequestItemWorkEffort.custRequestItemSeqId">
-            <add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestItemDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="lookupMap"/>
@@ -758,7 +790,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="quoteWorkEffort"/>
         <if-not-empty field="quoteWorkEffort">
-            <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortQuoteAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -768,7 +802,9 @@ under the License.
     <simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
         <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
         <if-empty field="quoteWorkEffort">
-            <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortQuoteDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="quoteWorkEffort"/>
@@ -780,7 +816,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="WorkRequirementFulfillment" map="lookupMap" value-field="workRequirementFulfillment"/>
         <if-not-empty field="workRequirementFulfillment">
-            <add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequirementFulfillmentAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -790,7 +828,9 @@ under the License.
     <simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
         <entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
         <if-empty field="workRequirementFulfillment">
-            <add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequirementFulfillmentDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="workRequirementFulfillment"/>
@@ -802,7 +842,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="ShoppingListWorkEffort" map="lookupMap" value-field="shoppingListWorkEffort"/>
         <if-not-empty field="shoppingListWorkEffort">
-            <add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortShoppingListAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -812,7 +854,9 @@ under the License.
     <simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
         <entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
         <if-empty field="shoppingListWorkEffort">
-            <add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortShoppingListDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="shoppingListWorkEffort"/>
@@ -824,7 +868,9 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="OrderHeaderWorkEffort" map="lookupMap" value-field="orderWorkEffort"/>
         <if-not-empty field="orderWorkEffort">
-            <add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] already exists."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortOrderHeaderAlreadyExists"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -834,7 +880,9 @@ under the License.
     <simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
         <entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>
         <if-empty field="orderWorkEffort">
-            <add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] does not exist."/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortOrderHeaderDoesNotExists"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <remove-value value-field="orderWorkEffort"/>
@@ -999,7 +1047,9 @@ under the License.
         <check-errors />
         <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/>
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/>
+            </add-error>
             <check-errors/>
         <else>
             <make-value entity-name="WorkEffortReview" value-field="newEntity"/>
@@ -1056,14 +1106,20 @@ under the License.
         <check-errors />
         <entity-one entity-name="WorkEffortKeyword" value-field="lookedUpValue"/>
         <if-not-empty field="lookedUpValue">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortKeywordAlreadyExist"/></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">
-            <add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/></add-error>
+            <add-error>
+                <fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/>
+            </add-error>
         </if-empty>
         <if-empty field="parameters.keyword">
-            <add-error><fail-property resource="ProductUiLabels" property="productevents.keyword_missing"/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="productevents.keyword_missing"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         <set-pk-fields value-field="newEntity" map="parameters"></set-pk-fields>
@@ -1111,13 +1167,12 @@ under the License.
     </simple-method>
 
     <simple-method method-name="duplicateWorkEffort" short-description="Duplicate a WorkEffort" login-required="false">
-
         <check-permission permission="WORKEFFORTMGR" action="_CREATE">
             <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
         </check-permission>
         <check-errors />
         <check-permission permission="WORKEFFORTMGR" action="_DELETE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
+            <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
         </check-permission>
         <check-errors />
         <!-- look up the old workEffort and clone it -->

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml?rev=1050830&r1=1050829&r2=1050830&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequestForms.xml Sun Dec 19 12:21:35 2010
@@ -37,7 +37,7 @@ under the License.
         <field name="custRequestTypeDescription"><display/></field>
         <field name="statusItemDescription"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortRequest">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortRequest">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="custRequestId"/>
             </hyperlink>