[OFBiz] SVN: r6020 - in trunk/applications/order: config webapp/ordermgr/WEB-INF webapp/ordermgr/quote

[jacopo at svn.ofbiz.org]

Author: jacopo
Date: 2005-10-25 02:42:47 -0500 (Tue, 25 Oct 2005)
New Revision: 6020

Modified:
   trunk/applications/order/config/OrderUiLabels.properties
   trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
   trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
Log:
Modified the product lookup link in the "edit quote item" form to call the ProductAndPrice lookup instead of the Product lookup screen.
Obviously, this can be easily changed back; however it would be interesting to add the ability to specify more than one lookup link for a field in the form widget definition.


Modified: trunk/applications/order/config/OrderUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels.properties	2005-10-25 07:38:36 UTC (rev 6019)
+++ trunk/applications/order/config/OrderUiLabels.properties	2005-10-25 07:42:47 UTC (rev 6020)
@@ -298,6 +298,7 @@
 OrderViewOrder = View Order
 OrderViewPermissionError = You do not have permission to view this page.
 OrderViewQuote=View Quote
+OrderViewQuoteProfit=Profit
 OrderViewRequest=View Request
 OrderWaitingApproval=Waiting Approval
 OrderWaitingCompletion=Waiting Completion

Modified: trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml	2005-10-25 07:38:36 UTC (rev 6019)
+++ trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml	2005-10-25 07:42:47 UTC (rev 6020)
@@ -1104,6 +1104,7 @@
     <request-map uri="LookupPartyGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyGroup"/></request-map>
     <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
+    <request-map uri="LookupProductAndPrice"><security https="true" auth="true"/><response name="success" type="view" value="LookupProductAndPrice"/></request-map>
     <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
     <request-map uri="LookupVariantProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
 
@@ -1229,6 +1230,7 @@
     <view-map name="LookupPartyGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyGroup"/>
     <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
     <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
+    <view-map name="LookupProductAndPrice" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductAndPrice"/>
     <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
     <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/>
 

Modified: trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
===================================================================
--- trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml	2005-10-25 07:38:36 UTC (rev 6019)
+++ trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml	2005-10-25 07:42:47 UTC (rev 6020)
@@ -199,7 +199,7 @@
         <field name="quoteId"><hidden/></field>
         <field name="isPromo"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}"><display/></field>
-        <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
+        <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProductAndPrice"/></field>
         <field name="productFeatureId" title="${uiLabelMap.ProductFeatures}"><lookup target-form-name="LookupProductFeature"/></field>
         <field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
             <drop-down allow-empty="true">