You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2016/02/20 13:00:18 UTC
svn commit: r1731379 - in /ofbiz/trunk/applications/order:
webapp/ordermgr/quote/quoteInfo.ftl widget/ordermgr/QuoteScreens.xml
Author: ashish
Date: Sat Feb 20 12:00:18 2016
New Revision: 1731379
URL: http://svn.apache.org/viewvc?rev=1731379&view=rev
Log:
Applied patch from jira issue - OFBIZ-6311. Order Manager ViewQuote screen should display party name and link to party manager
Thanks Forest Rae for creating the issue and providing the patch for the same. Thanks Aditi for providing the improved patch.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=1731379&r1=1731378&r2=1731379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Sat Feb 20 12:00:18 2016
@@ -60,11 +60,20 @@ under the License.
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%" class="label">
- ${uiLabelMap.PartyPartyId}
+ ${uiLabelMap.PartyParty}
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${quote.partyId!}
+ <#-- Party name, as a convenience. -->
+ <#if toParty?has_content>
+ <#if toParty.groupName?has_content>
+ ${toParty.groupName}
+ <#elseif toParty.firstName?has_content && toParty.lastName?has_content>
+ ${toParty.firstName} ${toParty.lastName}
+ </#if>
+ </#if>
+ <#-- Link to the party in Party Manager -->
+ <a href="/partymgr/control/viewprofile?partyId=${quote.partyId}" class="buttontext">(${quote.partyId?if_exists})</a>
</td>
</tr>
<#-- quote name -->
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1731379&r1=1731378&r2=1731379&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat Feb 20 12:00:18 2016
@@ -684,6 +684,11 @@ under the License.
</screen>
<screen name="quoteInfo">
<section>
+ <actions>
+ <entity-one entity-name="PartyNameView" value-field="toParty">
+ <field-map field-name="partyId" from-field="quote.partyId"/>
+ </entity-one>
+ </actions>
<widgets>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/quote/quoteInfo.ftl"/></html>