Author: deepak
Date: Sat Jan 16 07:00:23 2016 New Revision: 1724926 URL: http://svn.apache.org/viewvc?rev=1724926&view=rev Log: Applied fix from trunk for revision: 1724925 === (OFBIZ-6800) Applied patch manually from jira issue OFBIZ-6800. ============================================================ There's no attribute "align" for tag "<fo:block>", must change to "text-align". ============================================================ Thanks Parinya Wongjina for your contribution. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 07:00:23 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918 +/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925 Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=1724926&r1=1724925&r2=1724926&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (original) +++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Sat Jan 16 07:00:23 2016 @@ -27,7 +27,7 @@ under the License. </fo:layout-master-set> <fo:page-sequence master-reference="11x17-landscape"> <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> - <fo:block align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> + <fo:block text-align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> <#if acctgTransEntryList?has_content> <fo:block>${uiLabelMap.AccountingAcctgTransEntriesFor} <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!> Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl?rev=1724926&r1=1724925&r2=1724926&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (original) +++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Sat Jan 16 07:00:23 2016 @@ -26,7 +26,7 @@ under the License. </fo:layout-master-set> <fo:page-sequence master-reference="main"> <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> - <fo:block align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> + <fo:block text-align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> <#if acctgTransList?has_content> <fo:block>${uiLabelMap.AccountingAcctgTransFor} <#if (organizationPartyId)??> |
Free forum by Nabble | Edit this page |