svn commit: r943276 - in /ofbiz/branches/release10.04: ./ applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

[doogie-3]

Author: doogie
Date: Tue May 11 20:27:54 2010
New Revision: 943276

URL: http://svn.apache.org/viewvc?rev=943276&view=rev
Log:
Applied fix from trunk for revision: 943272
 Protect party note display when there is no party attached to the note.

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 20:27:54 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=943276&r1=943275&r2=943276&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Tue May 11 20:27:54 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>