svn commit: r943272 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r943272 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

doogie-3
Author: doogie
Date: Tue May 11 20:25:53 2010
New Revision: 943272

URL: http://svn.apache.org/viewvc?rev=943272&view=rev
Log:
Protect party note display when there is no party attached to the note.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=943272&r1=943271&r2=943272&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Tue May 11 20:25:53 2010
@@ -179,8 +179,10 @@ under the License.
                                     <fo:block>${note.noteInfo?if_exists}</fo:block>
                                 </fo:table-cell>
                                 <fo:table-cell number-columns-spanned="2">
-                                    <#assign notePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", note.noteParty, "compareDate", note.noteDateTime, "lastNameFirst", "Y", "userLogin", userLogin))/>
-                                    <fo:block>${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")}</fo:block>
+                                    <#if note.noteParty?has_content>
+                                        <#assign notePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", note.noteParty, "compareDate", note.noteDateTime, "lastNameFirst", "Y", "userLogin", userLogin))/>
+                                        <fo:block>${uiLabelMap.CommonBy}: ${notePartyNameResult.fullName?default("${uiLabelMap.OrderPartyNameNotFound}")}</fo:block>
+                                    </#if>
                                 </fo:table-cell>
                                 <fo:table-cell number-columns-spanned="1">
                                     <fo:block>${uiLabelMap.CommonAt}: ${note.noteDateTime?string?if_exists}</fo:block>