Author: jleroux
Date: Wed Jul 30 18:42:46 2014 New Revision: 1614736 URL: http://svn.apache.org/r1614736 Log: Correct indentation, no functional changes Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=1614736&r1=1614735&r2=1614736&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Wed Jul 30 18:42:46 2014 @@ -27,25 +27,25 @@ under the License. </fo:table-row> <fo:table-row > <fo:table-cell> - <fo:block>${uiLabelMap.CommonTo}: </fo:block> - <#if billingAddress?has_content> - <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> - <fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> - <#if billingAddress.attnName?exists> - <fo:block>${billingAddress.attnName}</fo:block> - </#if> - <fo:block>${billingAddress.address1?if_exists}</fo:block> - <#if billingAddress.address2?exists> - <fo:block>${billingAddress.address2}</fo:block> - </#if> - <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> - <#if billToPartyTaxId?has_content> - <fo:block>${uiLabelMap.PartyTaxId}: ${billToPartyTaxId}</fo:block> - </#if> - <#else> - <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billToParty.partyId}</fo:block> - </#if> - </fo:table-cell> + <fo:block>${uiLabelMap.CommonTo}: </fo:block> + <#if billingAddress?has_content> + <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> + <fo:block>${billToPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> + <#if billingAddress.attnName?exists> + <fo:block>${billingAddress.attnName}</fo:block> + </#if> + <fo:block>${billingAddress.address1?if_exists}</fo:block> + <#if billingAddress.address2?exists> + <fo:block>${billingAddress.address2}</fo:block> + </#if> + <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> + <#if billToPartyTaxId?has_content> + <fo:block>${uiLabelMap.PartyTaxId}: ${billToPartyTaxId}</fo:block> + </#if> + <#else> + <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billToParty.partyId}</fo:block> + </#if> + </fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> |
Free forum by Nabble | Edit this page |