svn commit: r1746468 - /ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.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: r1746468 - /ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl

pranayp
Author: pranayp
Date: Wed Jun  1 13:48:09 2016
New Revision: 1746468

URL: http://svn.apache.org/viewvc?rev=1746468&view=rev
Log:
Manually applied fix from trunk revision 1746460.
---------------------------------------------------------------------

[OFBIZ-7146] Applied patch from the ticket to fix error in rendering Quote PDF which is not having terms associated to it.

Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
---------------------------------------------------------------------

Modified:
    ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl

Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl?rev=1746468&r1=1746467&r2=1746468&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Wed Jun  1 13:48:09 2016
@@ -74,9 +74,9 @@ under the License.
                     <fo:table-cell><fo:block>${(quote.validThruDate.toString())?if_exists}</fo:block></fo:table-cell>
                 </fo:table-row>
                 <fo:table-row>
+                    <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
                     <#assign quoteLevelTerms = Static["org.ofbiz.entity.util.EntityUtil"].filterByAnd(quoteTerms, {"quoteItemSeqId": "_NA_"})!>
                     <#if quoteLevelTerms?has_content && quoteLevelTerms.size() gt 0>
-                        <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
                         <fo:table-cell>
                             <#list quoteLevelTerms as quoteLevelTerm>
                                 <fo:block>