svn commit: r671194 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml widget/ordermgr/OrderViewScreens.xml widget/ordermgr/RequestScreens.xml

[ashish-18]

Author: ashish
Date: Tue Jun 24 07:36:35 2008
New Revision: 671194

URL: http://svn.apache.org/viewvc?rev=671194&view=rev
Log:
Patch from Harsha Chadhar for Ordermgr 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/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=671194&r1=671193&r2=671194&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Jun 24 07:36:35 2008
@@ -8428,6 +8428,16 @@
         <value xml:lang="th">หัวข้อการร้องขอ</value>
         <value xml:lang="zh">请求明细</value>
     </property>
+    <property key="PageTitleRequestRoles">
+        <value xml:lang="en">Request Roles</value>
+        <value xml:lang="fr">Demande de rôles</value>
+        <value xml:lang="it">Ruoli Richiesta</value>
+        <value xml:lang="nl">Request Roles</value>
+        <value xml:lang="ro">Roluri Cerere</value>
+        <value xml:lang="ru">Роли запроса</value>
+        <value xml:lang="th">สถานะการร้องขอ</value>
+        <value xml:lang="zh">请求角色</value>
+    </property>
     <property key="PageTitleReturnHeader">
         <value xml:lang="en">Return Header</value>
         <value xml:lang="fr">Entête de retour</value>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=671194&r1=671193&r2=671194&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Jun 24 07:36:35 2008
@@ -296,7 +296,7 @@
     <screen name="ListOrderTerms">
         <section>
             <actions>
-                <set field="titleProperty" value="OrderAddOrderTerms"/>
+                <set field="titleProperty" value="OrderOrderTerms"/>
                 <set field="headerItem" value="findorders"/>
                 <entity-and entity-name="OrderTerm" list-name="orderTerms">
                     <field-map field-name="orderId" env-name="parameters.orderId"/>
@@ -305,7 +305,7 @@
             <widgets>
                 <decorator-screen name="CommonOrderViewDecorator">
                     <decorator-section name="body">
-                        <screenlet id="OrderTermPanel" title="${uiLabelMap.OrderAddOrderTerms}" collapsible="true">
+                        <screenlet id="AddOrderTermPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.OrderOrderTerms}" collapsible="true">
                             <include-form name="AddOrderTerm" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>
                         </screenlet>
                         <include-form name="ListOrderTerms" location="component://order/webapp/ordermgr/order/OrderForms.xml"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=671194&r1=671193&r2=671194&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue Jun 24 07:36:35 2008
@@ -171,7 +171,7 @@
     <screen name="RequestRoles">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleEditRequestRoles"/>
+                <set field="titleProperty" value="PageTitleRequestRoles"/>
                 <set field="tabButtonItem" value="requestroles"/>
                 <set field="headerItem" value="request"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
@@ -183,7 +183,7 @@
             <widgets>
                 <decorator-screen name="CommonRequestDecorator">
                     <decorator-section name="body">
-                        <screenlet id="RequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
+                        <screenlet id="EditRequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
                             <include-form name="EditRequestRole" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                         <include-form name="ListRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
@@ -496,7 +496,7 @@
             <widgets>
                 <decorator-screen name="CommonRequestDecorator">
                     <decorator-section name="body">
-                        <screenlet id="CustRequestItemWorkEffortPanel" title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}" collapsible="true">
+                        <screenlet id="AddCustRequestItemWorkEffortPanel" title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}" collapsible="true">
                             <link  target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
                             <include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>