Author: vsalaun Date: 2011-06-17 10:22:47 +0200 (Fri, 17 Jun 2011) New Revision: 3180 Url: http://chorem.org/repositories/revision/lima/3180 Log: #310 modify order: FinancialTransaction DATE, then FinancialTrasaction TOPIA CREATE DATE Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-15 13:54:16 UTC (rev 3179) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-17 08:22:47 UTC (rev 3180) @@ -190,7 +190,8 @@ .addBetween(FinancialTransaction.TRANSACTION_DATE, beginDate, endDate) .addDistinct() - .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + .addOrder("T." + FinancialTransaction.TRANSACTION_DATE) + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) //load for lazy .addLoad(financialPeriodProperty) .addLoad(entryBookLabelProperty) @@ -235,7 +236,8 @@ query.addEquals("financialPeriod", financialPeriod); } query.addDistinct() - .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + .addOrder("T." + FinancialTransaction.TRANSACTION_DATE) + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) //load for lazy .addLoad(financialPeriodProperty) .addLoad(entryBookLabelProperty) @@ -273,7 +275,8 @@ TopiaQuery query = financialTransactionDAO.createQuery("T"); query.addDistinct() - .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + .addOrder("T." + FinancialTransaction.TRANSACTION_DATE) + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) .addFrom(FiscalPeriod.class, "F") .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''")