Posted by
hansbak-2 on
Jul 13, 2006; 6:55am
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r421505-in-incubator-ofbiz-trunk-applications-order-config-OrderUiLabels-properties-confil-tp208445.html
Author: hansbak
Date: Wed Jul 12 22:55:51 2006
New Revision: 421505
URL:
http://svn.apache.org/viewvc?rev=421505&view=revLog:
small text change quoteWorkeffort
Modified:
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_nl.properties
incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=421505&r1=421504&r2=421505&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Jul 12 22:55:51 2006
@@ -79,6 +79,7 @@
OrderCreateOrderQuoteWorkEfforts=Create Quote Work Efforts
OrderCreateQuoteFromCart=Create New Quote From Cart
OrderCreateQuoteFromShoppingList=Create New Quote
+OrderCreateQuoteWorkEffort=Create new Quote Workeffort
OrderCreateReturn = Create return
OrderCreatedBy = Created by
OrderCurrentStatus = Current Status
Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_nl.properties?rev=421505&r1=421504&r2=421505&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_nl.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_nl.properties Wed Jul 12 22:55:51 2006
@@ -303,10 +303,6 @@
OrderCreateNewReturn = Create new return
-OrderCreateQuoteFromCart = Create New Offerte From Cart
-
-OrderCreateQuoteFromShoppingList = Create New Offerte
-
OrderCreateOrder = Nieuwe Bestelling
OrderCreateOrderQuote = Create New Offerte
@@ -323,6 +319,12 @@
OrderCreateOrderQuoteWorkEfforts = Create Offerte Work Efforts
+OrderCreateQuoteFromCart = Create New Offerte From Cart
+
+OrderCreateQuoteFromShoppingList = Create New Offerte
+
+OrderCreateQuoteWorkEffort = Nieuwe Activiteit voor de offerte
+
OrderCreateReturn = Create return
OrderCreatedBy = Created by
@@ -359,10 +361,10 @@
OrderFinalizeOrderDefault = Finalize Order With Default Options
-OrderFindQuote = Find Offerte
-
OrderFindOrder = Zoek Bestellingen
+OrderFindQuote = Find Offerte
+
OrderFindRequests = Find Requests
OrderFindReturn = Find Returns
@@ -421,10 +423,10 @@
OrderJurisdiction = Jurisdiction
-OrderLinkedToQuote = Linked to quote
-
OrderLinkedToOrderItem = Linked to order item
+OrderLinkedToQuote = Linked to quote
+
OrderLinkedToRequirement = Linked to requirement
OrderLookupOrder = Lookup Order(s)
@@ -441,14 +443,14 @@
OrderNbr = #
+OrderNewQuantity = New quantity
+
OrderNewQuote = Nieuwe Offerte
OrderNewQuoteAttribute = New Offerte Attribute
OrderNewQuoteItem = New Offerte Item
-OrderNewQuantity = New quantity
-
OrderNewReceipt = New Receipt
OrderNewRequest = New Request
@@ -469,8 +471,6 @@
OrderNoNotesForThisRequestItem = No Notes For This Request Item
-OrderNoQuoteFound = No Offerte Found.
-
OrderNoOrderAdjustments = No adjustments on this order.
OrderNoOrderFound = No Order Found
@@ -485,6 +485,8 @@
OrderNoPurchaseSpecified = No Purchase Order was specified
+OrderNoQuoteFound = No Offerte Found.
+
OrderNoRequestFound = No Request Found
OrderNoReturnFound = No return found.
@@ -567,6 +569,12 @@
OrderOrderNumber = Order Number
+OrderOrderOptionSettings = Order Option Settings
+
+OrderOrderPurchaseToBeScheduled = Order Purchase To Be Scheluded
+
+OrderOrderQty = Order Qty
+
OrderOrderQuote = Offerte
OrderOrderQuoteAdjustmentId = OrderOrderOfferteAdjustmentId
@@ -671,14 +679,6 @@
OrderOrderQuoteuomId = Offerte Uom Id
-OrderOrderOptionSettings = Order Option Settings
-
-OrderOrderPurchaseToBeScheduled = Order Purchase To Be Scheluded
-
-OrderOrderQty = Order Qty
-
-OrderOrderQuotes = Offertes
-
OrderOrderReturn = Return
OrderOrderReturns = Returns
@@ -1055,14 +1055,14 @@
OrderViewImage = View Image
-OrderViewQuote = View Quote
-
-OrderViewQuoteProfit = Profit
-
OrderViewOrder = View Order
OrderViewPermissionError = You do not have permission to view this page.
+OrderViewQuote = View Quote
+
+OrderViewQuoteProfit = Profit
+
OrderViewRequest = View Request
OrderWTD = WTD
@@ -1103,15 +1103,15 @@
PageTitleLookupCustomerRequestItem = Lookup Customer Request Item
-PageTitleLookupQuote = Lookup Quote
-
-PageTitleLookupQuoteItem = Lookup Quote Item
-
PageTitleLookupOrderHeader = Lookup Order Header
PageTitleLookupOrderHeaderAndShipInfo = Lookup Order Header and Ship Info
PageTitleLookupPurchaseOrderHeaderAndShipInfo = Lookup Purchase Order Header and Ship Info
+
+PageTitleLookupQuote = Lookup Quote
+
+PageTitleLookupQuoteItem = Lookup Quote Item
PageTitleLookupRequirement = Lookup Requirement
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=421505&r1=421504&r2=421505&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Wed Jul 12 22:55:51 2006
@@ -25,12 +25,8 @@
<field-map field-name="quoteId"/>
</entity-and>
</actions>
- <field name="quoteId" widget-style="buttontext">
- <display-entity entity-name="Quote" description="${quoteName}" >
- <sub-hyperlink description="[${quoteId}]" target="EditQuote?quoteId=${quoteId}" link-style="linktext"/>
- </display-entity>
- </field>
- <field name="workEffortId" widget-style="buttontext">
+ <field name="quoteId"><hidden/></field>
+ <field name="workEffortId">
<display-entity entity-name="WorkEffort" description="${workEffortName}" >
<sub-hyperlink description="[${workEffortId}]" target="EditQuoteWorkEffort?workEffortId=${workEffortId}&quoteId=${quoteId}" link-style="linktext"/>
</display-entity>
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=421505&r1=421504&r2=421505&view=diff==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Wed Jul 12 22:55:51 2006
@@ -79,7 +79,9 @@
<widgets>
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link target="AddQuoteWorkEffort?quoteId=${quoteId}" text="[${uiLabelMap.OrderCreateOrderQuote}]" style="linktext"></link></container>
+ <container>
+ <link target="AddQuoteWorkEffort?quoteId=${quoteId}" text="[${uiLabelMap.OrderCreateQuoteWorkEffort}]" style="linktext"></link>
+ </container>
<include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
</decorator-section>
</decorator-screen>