Author: sbavencoff Date: 2014-01-31 15:17:41 +0100 (Fri, 31 Jan 2014) New Revision: 3742 Url: http://chorem.org/projects/lima/repository/revisions/3742 Log: fixes #757 : Tri des comptes dans l'?\195?\169cran pour g?\195?\169n?\195?\169rer la balance Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-01-17 23:31:14 UTC (rev 3741) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-01-31 14:17:41 UTC (rev 3742) @@ -25,16 +25,6 @@ package org.chorem.lima.business.ejb; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +36,7 @@ import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.ReportService; +import org.chorem.lima.business.utils.AccountComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountDAO; import org.chorem.lima.entity.Entry; @@ -55,6 +46,16 @@ import org.chorem.lima.entity.FiscalPeriod; import org.nuiton.topia.TopiaException; +import javax.ejb.EJB; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + @Stateless @Remote(ReportService.class) @TransactionAttribute @@ -327,6 +328,9 @@ else { accounts = accountDAO.stringToListAccounts( result, false); } + + Collections.sort(accounts, new AccountComparator()); + for (Account account : accounts) { ReportsDatas reportsDatas = generateSubAccountBalance(account, beginDate,