You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/06/24 16:24:25 UTC
svn commit: r671186 - in /ofbiz/trunk/applications/workeffort:
config/WorkEffortUiLabels.xml widget/WorkEffortScreens.xml
Author: ashish
Date: Tue Jun 24 07:24:24 2008
New Revision: 671186
URL: http://svn.apache.org/viewvc?rev=671186&view=rev
Log:
Patch from Awdesh Parihar for Workeffort Component, part of JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1839.Also improved the Id name.
Based on comments of Adrain.
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=671186&r1=671185&r2=671186&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jun 24 07:24:24 2008
@@ -1027,12 +1027,36 @@
<value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸à¸²à¸£à¸¡à¸à¸à¸«à¸¡à¸²à¸¢à¸à¸²à¸</value>
<value xml:lang="zh">人工æå¡æ派费ç</value>
</property>
+ <property key="PageTitleListWorkEffortCommEvents">
+ <value xml:lang="en">Work Effort Communication Events</value>
+ <value xml:lang="es">Eventos de comunicación</value>
+ <value xml:lang="it">Lista Impegno di Lavoro Eventi Comunicazioni</value>
+ <value xml:lang="nl">Communicatie evenementen</value>
+ <value xml:lang="ro">Lista Sarcina de Lucru Evenimente Comunicatii</value>
+ <value xml:lang="th">à¸à¸¥à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸²à¸</value>
+ <value xml:lang="zh">人工æå¡æ²éäºä»¶</value>
+ </property>
+ <property key="PageTitleListWorkEffortKeyword">
+ <value xml:lang="en">Work Effort Keywords</value>
+ <value xml:lang="it">Chiavi Impegno di Lavoro</value>
+ <value xml:lang="th">à¸à¸µà¸¢à¹à¹à¸§à¸´à¸£à¹à¸à¸à¸²à¸</value>
+ <value xml:lang="zh">人工æå¡å
³é®å</value>
+ </property>
<property key="PageTitleListWorkEffortNotes">
<value xml:lang="en">Work Effort Notes</value>
<value xml:lang="it">Note Impegno di Lavoro</value>
<value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡à¸à¸²à¸</value>
<value xml:lang="zh">人工æå¡ä¾¿ç¬º</value>
</property>
+ <property key="PageTitleListWorkEffortQuotes">
+ <value xml:lang="en">Work Effort Quotes</value>
+ <value xml:lang="es">Cotizaciones</value>
+ <value xml:lang="it">Lista Impegno di Lavoro Preventivi</value>
+ <value xml:lang="nl">Activiteit Quotes</value>
+ <value xml:lang="ro">Lista Sarcini de Lucru Preventive</value>
+ <value xml:lang="th">à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸´à¸à¸à¸²à¸</value>
+ <value xml:lang="zh">人工æå¡è¯¢ä»·</value>
+ </property>
<property key="PageTitleListWorkEffortOrderHeaders">
<value xml:lang="en">Work Effort Orders</value>
<value xml:lang="es">Ãrdenes</value>
@@ -1060,6 +1084,30 @@
<value xml:lang="th">à¸à¸³à¸£à¹à¸à¸à¸à¸²à¸</value>
<value xml:lang="zh">人工æå¡è¯·æ±</value>
</property>
+ <property key="PageTitleListWorkEffortRequirements">
+ <value xml:lang="en">Work Effort Requirements</value>
+ <value xml:lang="es">Requerimientos</value>
+ <value xml:lang="it">Lista Impegno di Lavoro Fabbisogni</value>
+ <value xml:lang="nl">Activiteit Requirements</value>
+ <value xml:lang="ro">Lista Sarcini de Lucru Necesar</value>
+ <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¹à¸à¸à¸à¸²à¸£à¸à¸²à¸</value>
+ <value xml:lang="zh">人工æå¡éæ±</value>
+ </property>
+ <property key="PageTitleListWorkEffortReviews">
+ <value xml:lang="en">Work Effort Reviews</value>
+ <value xml:lang="it">Recensioni Impegno di Lavoro</value>
+ <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸</value>
+ <value xml:lang="zh">人工æå¡æ£æ¥</value>
+ </property>
+ <property key="PageTitleListWorkEffortShopLists">
+ <value xml:lang="en">Work Effort Shopping Lists</value>
+ <value xml:lang="es">Listas de compras</value>
+ <value xml:lang="it">Lista Liste Acquisto Impegno di Lavoro</value>
+ <value xml:lang="nl">Activiteit Shopping Lists</value>
+ <value xml:lang="ro">Lista Listelor de Cumparari Prestari Servicii </value>
+ <value xml:lang="th">à¸à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
+ <value xml:lang="zh">人工æå¡è´ä¹°å表</value>
+ </property>
<property key="PageTitleListWorkEffortTimeEntries">
<value xml:lang="en">Work Effort Time Entries</value>
<value xml:lang="es">Entradas de tiempo</value>
@@ -2873,10 +2921,10 @@
<value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
<value xml:lang="zh">ä¼å</value>
</property>
- <property key="WorkEffortPartyAssignmentError">
+ <property key="WorkEffortPartyAssignmentError">
<value xml:lang="en">Party ${parameters.partyId} with role ${parameters.roleTypeId} is already assigned to work effort Id ${parameters.workEffortId}, not adding again</value>
<value xml:lang="fr">L'acteur ${parameters.partyId} ayant le role ${parameters.roleTypeId} est déjà assigé à la tâche de réf. ${parameters.workEffortId}</value>
- </property>
+ </property>
<property key="WorkEffortPartyId">
<value xml:lang="en">Party Id</value>
<value xml:lang="es">Código del participante</value>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=671186&r1=671185&r2=671186&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Tue Jun 24 07:24:24 2008
@@ -457,7 +457,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortPartyAssignsPanel" title="${uiLabelMap.PageTitleAddWorkEffortPartyAssign}" collapsible="true">
+ <screenlet id="AddWorkEffortPartyAssignsPanel" title="${uiLabelMap.PageTitleAddWorkEffortPartyAssign}" collapsible="true">
<include-form name="EditWorkEffortPartyAssign" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortPartyAssigns" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
@@ -478,7 +478,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortAssignmentRatesPanel" title="${uiLabelMap.PageTitleAddWorkEffortAssignmentRate}" collapsible="true">
+ <screenlet id="AddWorkEffortAssignmentRatesPanel" title="${uiLabelMap.PageTitleAddWorkEffortAssignmentRate}" collapsible="true">
<include-form name="AddWorkEffortAssignmentRate" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortAssignmentRates" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -490,16 +490,16 @@
<screen name="ListWorkEffortCommEvents">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortCommEvent"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortCommEvents"/>
<set field="tabButtonItem" value="WorkEffortCommEvents"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortCommEvent"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortCommEvents"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortCommEventsPanel" title="${uiLabelMap.PageTitleAddWorkEffortCommEvent}" collapsible="true">
+ <screenlet id="AddWorkEffortCommEventsPanel" title="${uiLabelMap.PageTitleAddWorkEffortCommEvent}" collapsible="true">
<include-form name="AddWorkEffortCommEvent" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortCommEvents" location="component://workeffort/widget/WorkEffortCommEventForms.xml"/>
@@ -511,16 +511,16 @@
<screen name="ListWorkEffortShopLists">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortShopList"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortShopLists"/>
<set field="tabButtonItem" value="WorkEffortShopLists"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortShopList"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortShopLists"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortShopListsPanel" title="${uiLabelMap.PageTitleAddWorkEffortShopList}" collapsible="true">
+ <screenlet id="AddWorkEffortShopListsPanel" title="${uiLabelMap.PageTitleAddWorkEffortShopList}" collapsible="true">
<include-form name="AddWorkEffortShopList" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortShopLists" location="component://workeffort/widget/WorkEffortShopListForms.xml"/>
@@ -542,11 +542,11 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortRequestsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequest}" collapsible="true">
+ <screenlet id="AddWorkEffortRequestsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequest}" collapsible="true">
<include-form name="AddWorkEffortRequest" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortRequests" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
- <screenlet id="WorkEffortRequestItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequestItem}" collapsible="true">
+ <screenlet id="AddWorkEffortRequestItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequestItem}" collapsible="true">
<include-form name="AddWorkEffortRequestItem" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortRequestItems" location="component://workeffort/widget/WorkEffortRequestForms.xml"/>
@@ -558,9 +558,9 @@
<screen name="ListWorkEffortRequirements">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortRequirement}"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortRequirements"/>
<set field="tabButtonItem" value="WorkEffortRequirements"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortRequirement}"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortRequirements"/>
<set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
@@ -568,7 +568,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortRequirementsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequirement}" collapsible="true">
+ <screenlet id="AddWorkEffortRequirementsPanel" title="${uiLabelMap.PageTitleAddWorkEffortRequirement}" collapsible="true">
<include-form name="AddWorkEffortRequirement" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortRequirements" location="component://workeffort/widget/WorkEffortRequirementForms.xml"/>
@@ -581,20 +581,20 @@
<screen name="ListWorkEffortQuotes">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortQuote"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortQuotes"/>
<set field="tabButtonItem" value="WorkEffortQuotes"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortQuote"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortQuotes"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortQuotesPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuote}" collapsible="true">
+ <screenlet id="AddWorkEffortQuotesPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuote}" collapsible="true">
<include-form name="AddWorkEffortQuote" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortQuotes" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
- <screenlet id="WorkEffortQuoteItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuoteItem}" collapsible="true">
+ <screenlet id="AddWorkEffortQuoteItemPanel" title="${uiLabelMap.PageTitleAddWorkEffortQuoteItem}" collapsible="true">
<include-form name="AddWorkEffortQuoteItem" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortQuoteItems" location="component://workeffort/widget/WorkEffortQuoteForms.xml"/>
@@ -615,7 +615,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortOrderHeadersPanel" title="${uiLabelMap.PageTitleAddWorkEffortOrderHeader}" collapsible="true">
+ <screenlet id="AddWorkEffortOrderHeadersPanel" title="${uiLabelMap.PageTitleAddWorkEffortOrderHeader}" collapsible="true">
<include-form name="AddWorkEffortOrderHeader" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortOrderHeaders" location="component://workeffort/widget/WorkEffortOrderHeaderForms.xml"/>
@@ -719,7 +719,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortContentsPanel" title="${uiLabelMap.PageTitleAddContent}" collapsible="true">
+ <screenlet id="AddWorkEffortContentsPanel" title="${uiLabelMap.PageTitleAddContent}" collapsible="true">
<include-form name="AddWorkEffortContent" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortContents" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -739,7 +739,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortGoodStandardsPanel" title="${uiLabelMap.WorkEffortAddGoodStandard}" collapsible="true">
+ <screenlet id="AddWorkEffortGoodStandardsPanel" title="${uiLabelMap.WorkEffortAddGoodStandard}" collapsible="true">
<include-form name="AddWorkEffortGoodStandard" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortGoodStandards" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -752,9 +752,9 @@
<screen name="EditWorkEffortReviews">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortReviews"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortReviews"/>
<set field="tabButtonItem" value="WorkEffortReviews"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortReviews"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortReviews"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<set field="defaultUserLoginId" from-field="parameters.userLogin.userLoginId"/>
<set field="partyId" from-field="parameters.userLogin.partyId"/>
@@ -762,7 +762,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortReviewsPanel" title="${uiLabelMap.PageTitleAddWorkEffortReviews}" collapsible="true">
+ <screenlet id="AddWorkEffortReviewsPanel" title="${uiLabelMap.PageTitleAddWorkEffortReviews}" collapsible="true">
<include-form name="AddWorkEffortReview" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortReviews" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -774,15 +774,15 @@
<screen name="EditWorkEffortKeywords">
<section>
<actions>
- <set field="titleProperty" value="PageTitleAddWorkEffortKeyword"/>
+ <set field="titleProperty" value="PageTitleListWorkEffortKeyword"/>
<set field="tabButtonItem" value="WorkEffortKeywords"/>
- <set field="labelTitleProperty" value="PageTitleAddWorkEffortKeyword"/>
+ <set field="labelTitleProperty" value="PageTitleListWorkEffortKeyword"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
</actions>
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortKeywordsPanel" title="${uiLabelMap.PageTitleAddWorkEffortKeyword}" collapsible="true">
+ <screenlet id="AddWorkEffortKeywordsPanel" title="${uiLabelMap.PageTitleAddWorkEffortKeyword}" collapsible="true">
<include-form name="AddWorkEffortKeyword" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortKeywords" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -802,7 +802,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="WorkEffortContactMechsPanel" title="${uiLabelMap.CommonCreate}" collapsible="true">
+ <screenlet id="AddWorkEffortContactMechsPanel" title="${uiLabelMap.CommonCreate}" collapsible="true">
<include-form name="AddWorkEffortContactMech" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListWorkEffortContactMechs" location="component://workeffort/widget/WorkEffortForms.xml"/>
@@ -857,7 +857,7 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="AccountingAgreementWorkEffortApplsPanel" title="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}" collapsible="true">
+ <screenlet id="AddAccountingAgreementWorkEffortApplsPanel" title="${uiLabelMap.AccountingAddAgreementWorkEffortAppl}" collapsible="true">
<include-form name="AddAgreementWorkEffortAppl" location="component://workeffort/widget/WorkEffortForms.xml"/>
</screenlet>
<include-form name="ListAgreementWorkEffortAppls" location="component://workeffort/widget/WorkEffortForms.xml"/>