You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2015/02/09 07:48:55 UTC
svn commit: r1658312 -
/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
Author: ashish
Date: Mon Feb 9 06:48:55 2015
New Revision: 1658312
URL: http://svn.apache.org/r1658312
Log:
Applied patch from trunk r1658310
============================================
Applied patch from jira issue - OFBIZ-5952 - IncomeStatement page broken.
Thanks Deepak for creating the issue and providing the patch for the same.
============================================
Modified:
ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
Modified: ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy?rev=1658312&r1=1658311&r2=1658312&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy (original)
+++ ofbiz/branches/release14.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy Mon Feb 9 06:48:55 2015
@@ -52,7 +52,7 @@ GenericValue expenseGlAccountClass = fro
List expenseAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass);
GenericValue cogsExpenseGlAccountClass = from("GlAccountClass").where("glAccountClassId", "COGS_EXPENSE").cache(true).queryOne();
List cogsExpenseAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(cogsExpenseGlAccountClass);
-GenericValue sgaExpenseGlAccountClass = from("GlAccountClass").where("glAccountClassId", "SGA_EXPENSE").cache(true).queryList();
+GenericValue sgaExpenseGlAccountClass = from("GlAccountClass").where("glAccountClassId", "SGA_EXPENSE").cache(true).queryOne();
List sgaExpenseAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(sgaExpenseGlAccountClass);
GenericValue depreciationGlAccountClass = from("GlAccountClass").where("glAccountClassId", "DEPRECIATION").cache(true).queryOne();
List depreciationAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(depreciationGlAccountClass);