svn commit: r501789 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.properties widget/ordermgr/OrderEntryScreens.xml widget/ordermgr/RequirementScreens.xml

Author: jleroux
Date: Wed Jan 31 02:33:47 2007
New Revision: 501789

URL: http://svn.apache.org/viewvc?view=rev&rev=501789
Log:
A patch from Guido Amarilla "Replace harcoded UI labels in Order and Requirement Screens" (https://issues.apache.org/jira/browse/OFBIZ-675)

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=501789&r1=501788&r2=501789
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Jan 31 02:33:47 2007
@@ -207,7 +207,10 @@
 OrderFinalizeOrderDefault=Finalize Order With Default Options
 OrderFindOrder=Find Orders
 OrderFindQuote=Find Quote
+OrderFindQuotes=Find Quotes
 OrderFindRequests=Find Requests
+OrderFindRequirements=Find Requirements
+OrderFindRequirementsForSupplier=Find Requirements For Supplier
 OrderFindReturn=Find Returns
 OrderGift=Gift?
 OrderGiftCard=Gift Card
@@ -469,6 +472,7 @@
 OrderRequirementStatusId=Order Requirement Status Id
 OrderRequirements=Requirements
 OrderRequirementsForRequestItem=Requirements For Request Item
+OrderRequirementsList=Requirement List
 OrderReturnAccept=Accept Return
 OrderReturnAdjustments=Return Order Adjustment(s) From Order
 OrderReturnCreate=Create Return
@@ -565,8 +569,8 @@
 OrderUseDefaultDesiredDeliveryDate=Use as default desired delivery date for next entry
 OrderValuePurchase=Value Purch
 OrderValueSold=Value Sold
-OrderViewEditDeliveryScheduleInfo=View/Edit Delivery Schedule Info
 OrderVendorRequirementCount=# Products
+OrderViewEditDeliveryScheduleInfo=View/Edit Delivery Schedule Info
 OrderViewImage=View Image
 OrderViewOrder=View Order
 OrderViewPermissionError=You do not have permission to view this page.

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?view=diff&rev=501789&r1=501788&r2=501789
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Wed Jan 31 02:33:47 2007
@@ -54,7 +54,7 @@
     <screen name="RequirementsForSupplier">
         <section>
             <actions>
-                <set field="title" value="Find Requirements For Supplier"/>
+                <set field="title" value="${uiLabelMap.OrderFindRequirementsForSupplier}"/>
                 <set field="entityName" value="Requirement"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
@@ -64,10 +64,10 @@
                 <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
                     <decorator-section name="body">
                         <container>
-                            <label style="head1" text="Requirements"/>
+                            <label style="head1" text="${uiLabelMap.OrderRequirements}"/>
                         </container>
                         <container>
-                            <label style="head2" text="Find Requirements"/>
+                            <label style="head2" text="${uiLabelMap.OrderFindRequirements}"/>
                         </container>
                         <include-form name="FindRequirements" location="component://order/widget/ordermgr/OrderEntryForms.xml"/>
                         <section>
@@ -76,7 +76,7 @@
                             </condition>
                             <widgets>
                             <container>
-                                <label style="head2" text="Requirement List"/>
+                                <label style="head2" text="${uiLabelMap.OrderRequirementsList}"/>
                             </container>
                             <include-form name="RequirementsList" location="component://order/widget/ordermgr/OrderEntryForms.xml"/>
                             </widgets>
@@ -91,7 +91,7 @@
     <screen name="FindQuoteForCart">
         <section>
             <actions>
-                <set field="title" value="Find Quotes"/>
+                <set field="title" value="${uiLabelMap.OrderFindQuotes}"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
 

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?view=diff&rev=501789&r1=501788&r2=501789
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Wed Jan 31 02:33:47 2007
@@ -87,7 +87,7 @@
     <screen name="FindRequirements">
         <section>
             <actions>
-                <set field="title" value="Find Requirements"/>
+                <set field="title" value="${uiLabelMap.OrderFindRequirements}"/>
                 <set field="titleProperty" value="PageTitleFindRequirements"/>
                 <set field="headerItem" value="requirement"/>
                 <set field="tabButtonItem" value="FindRequirements"/>
@@ -107,7 +107,7 @@
     <screen name="ApproveRequirements">
         <section>
             <actions>
-                <set field="title" value="Find Requirements"/>
+                <set field="title" value="${uiLabelMap.OrderFindRequirements}"/>
                 <set field="titleProperty" value="PageTitleFindRequirements"/>
                 <set field="headerItem" value="requirement"/>
                 <set field="tabButtonItem" value="ApproveRequirements"/>
@@ -127,7 +127,7 @@
     <screen name="ApprovedProductRequirements">
         <section>
             <actions>
-                <set field="title" value="Approved Product Requirements"/>
+                <set field="title" value="${uiLabelMap.OrderFindRequirements}"/>
                 <set field="titleProperty" value="PageTitleFindRequirements"/>
                 <set field="headerItem" value="requirement"/>
                 <set field="tabButtonItem" value="ApprovedProductRequirements"/>
@@ -158,7 +158,7 @@
                             </condition>
                             <widgets>
                                 <container>
-                                    <label style="head2" text="Requirement List"/>
+                                    <label style="head2" text="${uiLabelMap.RequirementList}"/>
                                 </container>
                                 <include-form name="ApprovedProductRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
                                 <include-form name="ApprovedProductRequirementsSummary" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>