svn commit: r515823 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.properties src/org/ofbiz/party/party/PartyServices.java webapp/partymgr/party/findparty.ftl widget/partymgr/CommonScreens.xml

[sichen]

Author: sichen
Date: Wed Mar  7 14:57:02 2007
New Revision: 515823

URL: http://svn.apache.org/viewvc?view=rev&rev=515823
Log:
Links to quotes from party manager.  Lookup by address now also shows city and state in addition to zip code.  Based on Eric Schwartz.  OFBIZ-656

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.properties
    ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=515823&r1=515822&r2=515823
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Wed Mar  7 14:57:02 2007
@@ -195,6 +195,7 @@
 PartyContactMechanismSuccessfullyUpdated=Contact Mechanism successfully updated.
 PartyPostalAddressSuccessfullyCreated=Postal Address successfully created.
 PartyPostalAddressSuccessfullyUpdated=Postal Address successfully updated.
+PartyPostalCode=Postal Code
 PartyTelecomNumberSuccessfullyCreated=Telecom Number successfully created.
 PartyTelecomNumberSuccessfullyUpdated=Telecom Number successfully updated.
 PartyContactMechIdMissing=Contact Mechanism ID is missing

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?view=diff&rev=515823&r1=515822&r2=515823
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Wed Mar  7 14:57:02 2007
@@ -1209,6 +1209,8 @@
                     }
 
                     fieldsToSelect.add("postalCode");
+                    fieldsToSelect.add("city");
+                    fieldsToSelect.add("stateProvinceGeoId");
                 }
 
                 // ----

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=515823&r1=515822&r2=515823
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Wed Mar  7 14:57:02 2007
@@ -189,6 +189,9 @@
           <#if extInfo?default("") == "P">
             <td>${uiLabelMap.PartyPostalCode}</td>
           </#if>
+          <#if extInfo?default("") == "P" >
+            <td>${uiLabelMap.PartyCity}</td>
+          </#if>
           <#if extInfo?default("") == "T">
             <td>${uiLabelMap.PartyAreaCode}</td>
           </#if>
@@ -231,20 +234,25 @@
                 </#if>
               </#if>
             </td>
-            <#if extInfo?default("") == "P">
-              <td>${partyRow.postalCode?if_exists}</td>
-            </#if>
             <#if extInfo?default("") == "T">
               <td>${partyRow.areaCode?if_exists}</td>
             </#if>
+            <#if extInfo?default("") == "P" >
+               <td>${partyRow.city?if_exists}, ${partyRow.stateProvinceGeoId?if_exists}</td>
+            </#if>
+            <#if extInfo?default("") == "P">
+              <td>${partyRow.postalCode?if_exists}</td>
+            </#if>
             <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
-            <td class="button-col align-float">
+          <td class="button-col align-float">
               <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
               <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
                 <a href="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrders}</a>
+                <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>&nbsp;
               </#if>
               <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
                 <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewOrder}</a>
+                <a href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewQuote}</a>&nbsp;
               </#if>
             </td>
           </tr>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?view=diff&rev=515823&r1=515822&r2=515823
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Wed Mar  7 14:57:02 2007
@@ -29,6 +29,7 @@
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.PartyCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
@@ -77,6 +78,8 @@
                                                 <widgets>
                                                     <link target="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app"
                                                         text="${uiLabelMap.OrderOrders}"/>
+                                                    <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app"
+                                                        text="${uiLabelMap.OrderOrderQuotes}" style="buttontext"/>
                                                     <link target="/ordermgr/control/FindRequest?lookupFlag=Y&amp;fromPartyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"
                                                         text="${uiLabelMap.PartyPartyRequests}"/>
                                                 </widgets>
@@ -86,6 +89,8 @@
                                                 <widgets>
                                                     <link target="/ordermgr/control/checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"
                                                         text="${uiLabelMap.OrderNewOrder}"/>
+                                                    <link target="/ordermgr/control/EditQuote?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"
+                                                        text="${uiLabelMap.OrderNewQuote}" style="buttontext"/>
                                                 </widgets>
                                             </section>
                                             <section>