Index: applications/party/widget/partymgr/CommonScreens.xml
===================================================================
--- applications/party/widget/partymgr/CommonScreens.xml	(revision 500248)
+++ applications/party/widget/partymgr/CommonScreens.xml	(working copy)
@@ -73,7 +73,9 @@
                                                 <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
                                                 <widgets>
                                                     <link target="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrders}" style="buttontext"/>
+                                                        text="${uiLabelMap.CommonOrders}" style="buttontext"/>
+                                                    <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app" 
+                                                        text="${uiLabelMap.CommonQuotes}" style="buttontext"/>
                                                     <link target="/ordermgr/control/FindRequest?lookupFlag=Y&amp;fromPartyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
                                                         text="${uiLabelMap.PartyPartyRequests}" style="buttontext"/>
                                                 </widgets>
@@ -82,7 +84,9 @@
                                                 <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
                                                 <widgets>
                                                     <link target="/ordermgr/control/checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderNewOrder}" style="buttontext"/>
+                                                        text="${uiLabelMap.CommonNewOrder}" style="buttontext"/>
+                                                    <link target="/ordermgr/control/EditQuote?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
+                                                        text="${uiLabelMap.CommonNewQuote}" style="buttontext"/>
                                                 </widgets>
                                             </section>
                                             <section>
Index: applications/party/config/PartyUiLabels.properties
===================================================================
--- applications/party/config/PartyUiLabels.properties	(revision 500248)
+++ applications/party/config/PartyUiLabels.properties	(working copy)
@@ -69,8 +69,6 @@
 
 Description=Description
 
-OrderNewOrder=New Order
-OrderOrders=Orders
 PageTitleAddPartyContent=Add Party Content
 PageTitleAddressMatchMap=Address Match Map
 PageTitleAddressMatches=Address Matches
Index: applications/party/webapp/partymgr/party/findparty.ftl
===================================================================
--- applications/party/webapp/partymgr/party/findparty.ftl	(revision 500248)
+++ applications/party/webapp/partymgr/party/findparty.ftl	(working copy)
@@ -299,11 +299,17 @@
                     <div class="tabletext"><span style="white-space: nowrap;">
                       <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>&nbsp;
                       <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
-                        <a href="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderOrders}</a>&nbsp;
+                        <a href="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.CommonOrders}</a>&nbsp;
                       </#if>
+                      <#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
+                        <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.CommonQuotes}</a>&nbsp;
+                      </#if>
                       <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
-                        <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderNewOrder}</a>&nbsp;
+                        <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.CommonNewOrder}</a>&nbsp;
                       </#if>
+                      <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
+                        <a href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.CommonNewQuote}</a>&nbsp;
+                      </#if>
                     </span></div>
                   </td>
                 </tr>
Index: framework/common/config/CommonUiLabels.properties
===================================================================
--- framework/common/config/CommonUiLabels.properties	(revision 500248)
+++ framework/common/config/CommonUiLabels.properties	(working copy)
@@ -274,6 +274,9 @@
 CommonOrder=Order
 CommonOrderBy=Order By
 CommonOrders=Orders
+CommonNewOrder=New Order
+CommonQuotes=Quotes
+CommonNewQuote=New Quote
 CommonOther=Other
 CommonOverridesSelection=(overrides either of the above selections.)
 CommonPage=Page