Author: deepak
Date: Sat Jan 16 06:48:40 2016 New Revision: 1724924 URL: http://svn.apache.org/viewvc?rev=1724924&view=rev Log: Applied fix from trunk for revision: 1724918 === (OFBIZ-6799) Found issue while working on OFBIZ-6799, ChartOfAccounts.fo.ftl using postedBalance field, but its removed at r1530274, As its not a valid field of entity so system throwing exception while accessing COA pdf. Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 06:48:40 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 +/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918 Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl?rev=1724924&r1=1724923&r2=1724924&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl (original) +++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl Sat Jan 16 06:48:40 2016 @@ -49,8 +49,7 @@ under the License. <fo:table-column column-width="25mm"/> <fo:table-column column-width="35mm"/> <fo:table-column column-width="30mm"/> - <fo:table-column column-width="15mm"/> - <fo:table-column column-width="15mm"/> + <fo:table-column column-width="30mm"/> <fo:table-header> <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_glAccountId}</fo:block> @@ -82,9 +81,6 @@ under the License. <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingProductId}</fo:block> </fo:table-cell> - <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_postedBalance}</fo:block> - </fo:table-cell> </fo:table-header> <fo:table-body> <#list glAccountOrgAndClassList as glAccountOrgAndClass> @@ -139,9 +135,6 @@ under the License. <fo:table-cell border="1pt solid" border-width=".1mm"> <fo:block text-align="center" font-size="5pt">${(glAccountOrgAndClass.productId)!}</fo:block> </fo:table-cell> - <fo:table-cell border="1pt solid" border-width=".1mm"> - <fo:block text-align="center" font-size="5pt">${(glAccountOrgAndClass.postedBalance)!}</fo:block> - </fo:table-cell> </fo:table-row> </#list> </fo:table-body> |
Free forum by Nabble | Edit this page |