You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/07/09 06:46:55 UTC
svn commit: r1801351 -
/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
Author: deepak
Date: Sun Jul 9 06:46:54 2017
New Revision: 1801351
URL: http://svn.apache.org/viewvc?rev=1801351&view=rev
Log:
Fixed: Purchase by Organization report was broken, added check to avoid stack trace on fop.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl?rev=1801351&r1=1801350&r2=1801351&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/reports/PurchasesByOrganizationReport.fo.ftl Sun Jul 9 06:46:54 2017
@@ -20,10 +20,6 @@ under the License.
<#escape x as x?xml>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-<#-- do not display columns associated with values specified in the request, ie constraint values -->
-<#assign showToParty = !parameters.toPartyId?has_content>
-<#assign showFromParty = !parameters.fromPartyId?has_content>
-
<fo:layout-master-set>
<fo:simple-page-master master-name="main" page-height="11in" page-width="8.5in"
margin-top="0.5in" margin-bottom="1in" margin-left="1in" margin-right="1in">
@@ -38,8 +34,14 @@ under the License.
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<fo:block font-size="14pt">${uiLabelMap.OrderReportPurchasesByOrganization}</fo:block>
- <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.CommonFor}: ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if>
- <#if !showFromParty><fo:block font-size="10pt">${uiLabelMap.CommonFrom}: ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, fromPartyId, false)}</fo:block></#if>
+ <#if partyIds?has_content>
+ <fo:block font-size="10pt">${uiLabelMap.CommonFor}:
+ <#list partyIds as toPartyId>
+ ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)!} <#sep>,
+ </#list>
+ </fo:block>
+ </#if>
+ <#if fromPartyId?has_content><fo:block font-size="10pt">${uiLabelMap.CommonFrom}: ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, fromPartyId, false)!}</fo:block></#if>
<fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}:
<#if orderStatusIds?has_content>
<#list orderStatusIds as orderStatusId>