- Lima-commits - mailman.cloud.codelutin.com

r3408 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/test/java/org/chorem/lima/business lima-callao/src/main/java/org/chorem/lima/entity lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by echatellier＠users.chorem.org 09 May '12

09 May '12

Author: echatellier Date: 2012-05-09 17:37:59 +0200 (Wed, 09 May 2012) New Revision: 3408 Url: http://chorem.org/repositories/revision/lima/3408 Log: Remove FinancialTransaction link to FinancialPeriod. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/xmi/accounting.properties trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -84,7 +84,7 @@ */ void updateEntryRules(Entry entry, Entry entryOld, TopiaContext topiaTransaction) throws LimaException; - void updateFinancialTransactionDateRules(FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld, TopiaContext topiaContext) throws LimaException; + void updateFinancialTransactionDateRules(FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld) throws LimaException; /** * Financialperiod/entrybook rules Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -26,8 +26,14 @@ package org.chorem.lima.business; import org.chorem.lima.entity.AccountDAO; +import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; +import org.chorem.lima.entity.EntryBookDAO; import org.chorem.lima.entity.EntryDAO; +import org.chorem.lima.entity.FinancialPeriodDAO; +import org.chorem.lima.entity.FiscalPeriodDAO; +import org.chorem.lima.entity.IdentityDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.entity.VatStatementDAO; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -67,5 +73,27 @@ return LimaCallaoDAOHelper.getEntryDAO(context); } + public FinancialPeriodDAO getFinancialPeriodDAO() throws TopiaException { + return LimaCallaoDAOHelper.getFinancialPeriodDAO(context); + } + + public FiscalPeriodDAO getFiscalPeriodDAO() throws TopiaException { + return LimaCallaoDAOHelper.getFiscalPeriodDAO(context); + } + public ClosedPeriodicEntryBookDAO getClosedPeriodicEntryBookDAO() throws TopiaException { + return LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(context); + } + + public EntryBookDAO getEntryBookDAO() throws TopiaException { + return LimaCallaoDAOHelper.getEntryBookDAO(context); + } + + public VatStatementDAO getVatStatementDAO() throws TopiaException { + return LimaCallaoDAOHelper.getVatStatementDAO(context); + } + + public IdentityDAO getIdentityDAO() throws TopiaException { + return LimaCallaoDAOHelper.getIdentityDAO(context); + } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -47,6 +47,7 @@ import org.chorem.lima.entity.EntryBookDAO; import org.chorem.lima.entity.EntryDAO; import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialPeriodDAO; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionDAO; import org.chorem.lima.entity.FiscalPeriod; @@ -157,24 +158,25 @@ */ @Override public void checkFinancialPeriodBlockedWithFinancialTransaction(FinancialTransaction financialTransaction, TopiaContext topiaContext) throws LimaException { - //check financial period locked - if (financialTransaction.getFinancialPeriod().getLocked()) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialperiodblocked")); - } + + try { + //check financial period locked + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); + FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(financialTransaction.getTransactionDate()); + if (financialPeriod.isLocked()) { + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialperiodblocked")); + } + + //check all entrybook of his financial period are blocked + //FIXME echatellier 20120509 il doit y avoir moyen de faire plus + //simple que de recuperer 2 listes et de comparer leur nombres + List<EntryBook> entryBooks = new ArrayList<EntryBook>(); + List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); - //check all entrybook of his financial period are blocked - //FIXME Make this check by topia query ? - List<EntryBook> entryBooks = new ArrayList<EntryBook>(); - List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); - try { - EntryBookDAO entryBookDAO = - LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); - ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = - LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaContext); - FinancialPeriod financialPeriod = - financialTransaction.getFinancialPeriod(); + EntryBookDAO entryBookDAO = getDaoHelper().getEntryBookDAO(); + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); + entryBooks = entryBookDAO.findAll(); - for (EntryBook entryBook : entryBooks) { ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( @@ -247,8 +249,8 @@ try { - FinancialPeriod financialPeriod = - entry.getFinancialTransaction().getFinancialPeriod(); + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); + FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(entry.getFinancialTransaction().getTransactionDate()); ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaTransaction); @@ -288,25 +290,24 @@ */ @Override public void updateFinancialTransactionDateRules( - FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld, TopiaContext topiaContext) throws LimaException { + FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld) throws LimaException { - FinancialPeriod financialPeriod = financialTransaction.getFinancialPeriod(); - FinancialPeriod financialPeriodOld = financialTransactionOld.getFinancialPeriod(); - - //1. check old financial period locked - if (financialPeriodOld.getLocked()) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialtransactionblocked")); - } - - //2. check new financial period locked - if (financialPeriod.getLocked()) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialnewdateblocked")); - } - try { + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); + FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(financialTransaction.getTransactionDate()); + FinancialPeriod financialPeriodOld = financialPeriodDAO.findByDate(financialTransactionOld.getTransactionDate()); + + //1. check old financial period locked + if (financialPeriodOld.getLocked()) { + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialtransactionblocked")); + } + + //2. check new financial period locked + if (financialPeriod.getLocked()) { + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialnewdateblocked")); + } - ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = - LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaContext); + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); //3. the actual entrybook belong to a blocked closedPeriodicEntryBook ClosedPeriodicEntryBook closedPeriodicEntryBookOld = @@ -342,8 +343,7 @@ //7. check if date are on fiscal period - FiscalPeriodDAO fiscalPeriodDAO = - LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaContext); + FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); //search fiscalperiod have financialperiod in params FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByFinancialPeriod(financialPeriod); @@ -394,8 +394,8 @@ }*/ - } catch (TopiaException eee) { - doCatch(topiaContext, eee, log); + } catch (TopiaException ex) { + throw new LimaException("Can't check financial transaction", ex); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -744,8 +744,8 @@ FormatsEnum format) throws LimaException { Document document = new Document(PageSize.A4, 8, 8, 8, 8); TopiaContext transaction = beginTransaction(rootContext); - ; + try { Date newDate = new Date(); String dateS = dateFormat.format(newDate); @@ -774,26 +774,17 @@ closedPeriodicEntryBookDAO.findAllByDates(beginDate, endDate); for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) { - TopiaQuery query = entryDAO.createQuery(); - String financialPeriodProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_ENTRY_BOOK); - query.addWhere(financialPeriodProperty, Op.EQ, - closedPeriodicEntryBook.getFinancialPeriod()) - .addWhere(entryBookProperty, Op.EQ, - closedPeriodicEntryBook.getEntryBook()); + // TODO echatellier 20120509, was not about only + // balanced transaction here, normal ? + List<Entry> entries = entryDAO.findAllEntryOfTransaction(closedPeriodicEntryBook.getEntryBook(), + closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), + closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); - List<Entry> entries = entryDAO.findAllByQuery(query); - - List<Object[]> results; - BigDecimal debit = new BigDecimal(0); - BigDecimal credit = new BigDecimal(0); - query.setSelect(Entry.PROPERTY_DEBIT, "SUM(" + Entry.PROPERTY_AMOUNT + ")"); - query.addGroup(Entry.PROPERTY_DEBIT); - results = query.execute(transaction); + List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), + closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), + closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); + BigDecimal debit = null; + BigDecimal credit = null; int nbAmount = results.size(); if (nbAmount == 2) { debit = (BigDecimal) results.get(0)[1]; @@ -1185,7 +1176,6 @@ Date endDate, FormatsEnum format) throws LimaException { TopiaContext transaction = beginTransaction(rootContext); - ; Document document = new Document(PageSize.A4, 8, 8, 8, 8); try { @@ -1215,15 +1205,8 @@ LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(transaction); EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(transaction); - - TopiaQuery financialPeriodsQuery = financialPeriodDAO.createQuery(); - String beginDateProperty = TopiaQuery.getProperty(FinancialPeriod.PROPERTY_BEGIN_DATE); - String endDateProperty = TopiaQuery.getProperty(FinancialPeriod.PROPERTY_BEGIN_DATE); - financialPeriodsQuery.addWhere(beginDateProperty, Op.GE, beginDate) - .addWhere(endDateProperty, Op.LE, endDate) - .addOrder(beginDateProperty); List<FinancialPeriod> financialPeriods = - financialPeriodDAO.findAllByQuery(financialPeriodsQuery); + financialPeriodDAO.findByDates(beginDate, endDate); List<GeneralEntryBooksDatas> list = new ArrayList<GeneralEntryBooksDatas>(); BigDecimal amountDebit = new BigDecimal(0); @@ -1237,24 +1220,12 @@ BigDecimal subAmountCredit = new BigDecimal(0); for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) { - List<Object[]> results; - TopiaQuery query = entryDAO.createQuery(); - BigDecimal debit = new BigDecimal(0); - BigDecimal credit = new BigDecimal(0); + BigDecimal debit = null; + BigDecimal credit = null; - String financialPeriodProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_ENTRY_BOOK); - query.addWhere(financialPeriodProperty, Op.EQ, - closedPeriodicEntryBook.getFinancialPeriod()) - .addWhere(entryBookProperty, Op.EQ, - closedPeriodicEntryBook.getEntryBook()) - .setSelect(Entry.PROPERTY_DEBIT, "SUM(" + Entry.PROPERTY_AMOUNT + ")") - .addGroup(Entry.PROPERTY_DEBIT); - results = query.execute(transaction); + List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), + closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), + closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); int nbAmount = results.size(); if (nbAmount == 2) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -521,19 +521,12 @@ String[] nextLine = new String[8]; nextLine[0] = ImportExportEntityEnum.FINANCIALTRANSACTION.getLabel(); nextLine[1] = String.valueOf(numTransaction); - nextLine[2] = - SDATEFORMAT.format(financialTransaction.getTransactionDate()); + nextLine[2] = SDATEFORMAT.format(financialTransaction.getTransactionDate()); nextLine[3] = financialTransaction.getAmountDebit().toString(); nextLine[4] = financialTransaction.getAmountCredit().toString(); - nextLine[5] = - SDATEFORMAT.format(financialTransaction.getFinancialPeriod(). - getBeginDate()); - nextLine[6] = - SDATEFORMAT.format(financialTransaction.getFinancialPeriod(). - getEndDate()); EntryBook entryBook = financialTransaction.getEntryBook(); if (entryBook != null) { - nextLine[7] = entryBook.getCode(); + nextLine[5] = entryBook.getCode(); } // Ajoute la ligne au fichier csvWriter.writeNext(nextLine); 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 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -134,13 +134,6 @@ return null; } - /** Return the list of all financial transaction of a financial period */ - @Override - public List<FinancialTransaction> getAllFinancialTransactions( - FinancialPeriod period) throws LimaException { - return getAllFinancialTransactions(period, null); - } - /** Return the list of all financial transaction from two dates */ @Override public List<FinancialTransaction> getAllFinancialTransactions( @@ -148,26 +141,8 @@ List<FinancialTransaction> financialTransactions = null; TopiaContext topiaTransaction = beginTransaction(rootContext); try { - FinancialTransactionDAO transactionDAO = - LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaTransaction); - - String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_ENTRY_BOOK); - - // filter with topia query - TopiaQuery query = transactionDAO.createQuery("T") - - .addBetween(FinancialTransaction.PROPERTY_TRANSACTION_DATE, beginDate, endDate) - - .addDistinct() - .addOrder("T." + FinancialTransaction.PROPERTY_TRANSACTION_DATE) - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - //load for lazy - .addLoad(financialPeriodProperty) - .addLoad(entryBookLabelProperty) - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addFetch("E." + Entry.PROPERTY_ACCOUNT); - financialTransactions = transactionDAO.findAllByQuery(query); + FinancialTransactionDAO transactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaTransaction); + financialTransactions = transactionDAO.findAllByDates(beginDate, endDate); } catch (Exception ex) { doCatch(topiaTransaction, ex); } finally { @@ -176,6 +151,13 @@ return financialTransactions; } + /** Return the list of all financial transaction of a financial period */ + @Override + public List<FinancialTransaction> getAllFinancialTransactions( + FinancialPeriod period) throws LimaException { + return getAllFinancialTransactions(period, null); + } + /** Return the list of all financial transaction of a financial period and an entrybook */ @Override public List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod financialPeriod, EntryBook entryBook) throws LimaException { @@ -185,29 +167,15 @@ try { FinancialTransactionDAO transactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaTransaction); - - String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_ENTRY_BOOK); - - // filter with topia query - TopiaQuery query = transactionDAO.createQuery("T"); - + if (entryBook != null) { - query.addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook); + financialTransactions = transactionDAO.findAllByDates(financialPeriod.getBeginDate(), + financialPeriod.getEndDate(), entryBook); + } else { + financialTransactions = transactionDAO.findAllByDates(financialPeriod.getBeginDate(), + financialPeriod.getEndDate()); } - if (financialPeriod != null) { - query.addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, financialPeriod); - } - query.addDistinct() - .addOrder("T." + FinancialTransaction.PROPERTY_TRANSACTION_DATE) - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - //load for lazy - .addLoad(financialPeriodProperty) - .addLoad(entryBookLabelProperty) - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addFetch("E." + Entry.PROPERTY_ACCOUNT); - financialTransactions = transactionDAO.findAllByQuery(query); } catch (Exception ex) { doCatch(topiaTransaction, ex); } finally { @@ -217,7 +185,9 @@ } - /** Get unbalanced financialtransaction from selected fiscalperiod */ + /** + * Get unbalanced financialtransaction from selected fiscalperiod. + */ @Override public List<FinancialTransaction> getAllInexactFinancialTransactions(FiscalPeriod fiscalPeriod) throws LimaException { TopiaContext topiaContext = beginTransaction(rootContext); @@ -228,40 +198,8 @@ FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); - // SELECT DISTINCT T - // FROM org.chorem.lima.entity.FinancialTransaction T, org.chorem.lima.entity.FiscalPeriod F - // LEFT JOIN FETCH T.entry E LEFT JOIN FETCH E.account - // LEFT JOIN FETCH E.letter - // WHERE (T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null - // OR E.description = '') AND T.financialPeriod IN elements(F.financialPeriod) AND F = :F - // ORDER BY T.transactionDate, T.topiaCreateDate; - - TopiaQuery query = financialTransactionDAO.createQuery("T"); - String financialPeriodProperty = TopiaQuery.getProperty("T", FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookLabelProperty = TopiaQuery.getProperty("T", FinancialTransaction.PROPERTY_ENTRY_BOOK); - query.addDistinct() - .addOrder("T." + FinancialTransaction.PROPERTY_TRANSACTION_DATE) - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - .addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) <> " + - "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T) OR " + - "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T) = null OR " + - "(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) = null OR " + - "E.account = null OR T.entryBook = null OR E.voucher = null " + - "OR E.voucher = '' OR E.description = null OR E.description = ''") - .addInElements("T.financialPeriod", "F.financialPeriod") - .addEquals("F", fiscalPeriod) - // load lazy - .addFetch("E." + Entry.PROPERTY_ACCOUNT) - .addLoad(financialPeriodProperty) - .addLoad(entryBookLabelProperty); - - if (log.isDebugEnabled()) { - log.debug("Query = " + query.toString()); - } - - result = financialTransactionDAO.findAllByQuery(query); + result = financialTransactionDAO.getAllIncorrectTransaction(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate(), null); for (FinancialTransaction fTransaction : result) { BigDecimal credit = fTransaction.getAmountCredit(); BigDecimal debit = fTransaction.getAmountDebit(); @@ -312,19 +250,9 @@ FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); - // WARN No load lazy, modify query with addLoad or addFetch if loading is necessary - TopiaQuery query = financialTransactionDAO.createQuery("T"); - query.addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", false) - .addWhere("(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) <> " + - "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T)") - .addNotNull("E.account") - .addNotNull("T.entryBook") - .addInElements("T.financialPeriod", "F.financialPeriod") - .addEquals("F", fiscalPeriod); + result = financialTransactionDAO.getAllBalancedTransaction(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate(), null); - result = financialTransactionDAO.findAllByQuery(query); - } catch (TopiaException ex) { doCatch(topiaContext, ex); } @@ -352,7 +280,9 @@ } - /** Method used by update entry and remove entry for update amounts */ + /** + * Method used by update entry and remove entry for update amounts. + */ @Override public void updateFinancialTransactionWithTransaction(FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException { @@ -365,26 +295,11 @@ FinancialTransaction financialTransactionOld = transactionDAO.findByTopiaId(financialtransaction.getTopiaId()); - /* if update date change - check : - * - if old financialtransaction date are on periodblocked - * - if new date are on fiscalperiod - * - new financialtransaction date are on periodunblocked - * - if all closedperiod are open - */ - Date oldDate = financialTransactionOld.getTransactionDate(); - Date newDate = financialtransaction.getTransactionDate(); - if (newDate.compareTo(oldDate) != 0) { - financialTransactionOld.setTransactionDate(newDate); - //change financial period - FinancialPeriodDAO financialPeriodDAO = - LimaCallaoDAOHelper.getFinancialPeriodDAO(topiaContext); - FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(newDate); - if (financialPeriod != null) { - financialTransactionOld.setFinancialPeriod(financialPeriod); - } - } + // FIXME echatellier 20120509, plusieurs chose à verifier ici: + // changement de date induisant en changement de période, verifier + // la permission (periode close/non close à l'arrivée) accountingRules.updateFinancialTransactionDateRules( - financialtransaction, financialTransactionOld, topiaContext); + financialtransaction, financialTransactionOld); financialTransactionOld.setEntryBook( financialtransaction.getEntryBook()); @@ -553,8 +468,8 @@ query.addDistinct(); query.addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true); //Load for lazy - query.addLoad(FinancialTransaction.PROPERTY_ENTRY_BOOK) - .addLoad(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); + query.addLoad(FinancialTransaction.PROPERTY_ENTRY_BOOK); + // .addLoad(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); Date beginDate = financialTransactionSearch.getBeginDate(); Date endDate = financialTransactionSearch.getEndDate(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -421,7 +421,6 @@ if (lastFPeriod != null) { //Sets the endfinancialTransaction endfinancialTransaction.setEntryBook(entryBook); - endfinancialTransaction.setFinancialPeriod(lastFPeriod); endfinancialTransaction.setTransactionDate(fiscalPeriod.getEndDate()); financialTransactionService.createFinancialTransaction(endfinancialTransaction); } @@ -432,7 +431,6 @@ if (found) { //Sets the endfinancialTransaction beginfinancialTransaction.setEntryBook(entryBook); - beginfinancialTransaction.setFinancialPeriod(beginfinancialPeriod); beginfinancialTransaction.setTransactionDate(beginfinancialPeriod.getBeginDate()); financialTransactionService.createFinancialTransaction(beginfinancialTransaction); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -282,10 +282,6 @@ financialTransaction = new FinancialTransactionImpl(); financialTransaction.setEntryBook(entryBook); financialTransaction.setTransactionDate(date); - FinancialPeriod financialPeriod = financialPeriodDAO - .findByDate(date); - financialTransaction - .setFinancialPeriod(financialPeriod); financialTransactionService .createFinancialTransactionWithTransaction( financialTransaction, topiaContext); @@ -927,9 +923,7 @@ financialTransactionImport.setDate(nextLine[2]); financialTransactionImport.setAmountDebit(nextLine[3]); financialTransactionImport.setAmountCredit(nextLine[4]); - financialTransactionImport.setBeginDateFinancialPeriod(nextLine[5]); - financialTransactionImport.setEndDateFinancialPeriod(nextLine[6]); - financialTransactionImport.setCodeEntryBook(nextLine[7]); + financialTransactionImport.setCodeEntryBook(nextLine[5]); financialTransactions.put(num, financialTransactionImport); } @@ -1233,11 +1227,7 @@ .getCodeEntryBook()); financialTransaction.setEntryBook(entryBook); - FinancialPeriod financialPeriod = financialPeriodDAO - .findByDate(dateFinancialTransaction); - financialTransactionDAO.create(financialTransaction); - financialTransaction.setFinancialPeriod(financialPeriod); List<EntryImport> entryImports = entries.get(map.getKey()); for (EntryImport entryImport : entryImports) { Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -52,7 +52,6 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; import org.chorem.lima.entity.EntryImpl; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; @@ -280,13 +279,9 @@ EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); Account accountVmpVae = accountService.getAccountByNumber("511"); - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - FinancialTransaction transaction1 = new FinancialTransactionImpl(); transaction1.setTransactionDate(df.parse("April 4, 2012")); transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); transaction1 = financialTransactionService.createFinancialTransaction(transaction1); Entry tr1Entry1 = new EntryImpl(); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -27,7 +27,6 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryImpl; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; @@ -83,13 +82,9 @@ EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); Account accountVmpVae = accountService.getAccountByNumber("511"); - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - FinancialTransaction transaction1 = new FinancialTransactionImpl(); transaction1.setTransactionDate(df.parse("April 5, 2012")); transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); transaction1 = financialTransactionService.createFinancialTransaction(transaction1); Entry tr1Entry1 = new EntryImpl(); @@ -129,13 +124,9 @@ EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); Account accountVmpVae = accountService.getAccountByNumber("511"); - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - FinancialTransaction transaction1 = new FinancialTransactionImpl(); transaction1.setTransactionDate(df.parse("April 5, 2012")); transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); transaction1 = financialTransactionService.createFinancialTransaction(transaction1); Entry tr1Entry1 = new EntryImpl(); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -30,7 +30,6 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryImpl; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; import org.junit.Assert; @@ -89,13 +88,9 @@ EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); Account accountVmpVae = accountService.getAccountByNumber("511"); - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - FinancialTransaction transaction1 = new FinancialTransactionImpl(); transaction1.setTransactionDate(df.parse("April 5, 2012")); transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); transaction1 = financialTransactionService.createFinancialTransaction(transaction1); Entry tr1Entry1 = new EntryImpl(); Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -140,4 +140,53 @@ "endDate", endDate, "entryBook", entryBook); return result; } + + /** + * Retourne les entrees des transaction entre deux dates pour + * un journal. + * + * @param entryBook entry book + * @param beginDate begin date + * @param endDate end date + * @throws TopiaException + */ + public List<Entry> findAllEntryOfTransaction(EntryBook entryBook, Date beginDate, + Date endDate) throws TopiaException { + String query = "FROM " + Entry.class.getName() + " E" + + // entre les 2 dates + " WHERE :beginDate <= E.financialTransaction.transactionDate" + + " AND E.financialTransaction.transactionDate <= :endDate" + + // concerne le compte + " AND E.entryBook = :entryBook"; + + List<Entry> entries = context.find(query, "beginDate", beginDate, + "endDate", endDate, "entryBook", entryBook); + return entries; + } + + /** + * Retourne la somme des entrées des transaction entre + * deux dates pour un journal donné. + * + * @param entryBook entry book + * @param beginDate bebin date + * @param endDate end date + * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) + * @throws TopiaException + */ + public List<Object[]> getDebitCreditOfTransaction(EntryBook entryBook, + Date beginDate, Date endDate) throws TopiaException { + String query = "SELECT E.debit, sum(E.amount) " + + "FROM " + Entry.class.getName() + " E" + + // entre les 2 dates + " WHERE :beginDate <= E.financialTransaction.transactionDate" + + " AND E.financialTransaction.transactionDate <= :endDate" + + // concerne le compte + " AND E.entryBook = :entryBook" + + " GROUP BY E.debit"; + + List<Object[]> result = context.find(query, "beginDate", beginDate, + "endDate", endDate, "entryBook", entryBook); + return result; + } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -54,5 +54,24 @@ } return result; } + + /** + * Return all FinancialPeriod with begin date between two given dates. + * + * @param beginDate period begin date + * @param endDate period end date + * @return FinancialPeriod for {@code date} + * @throws TopiaException + */ + public List<FinancialPeriod> findByDates(Date beginDate, Date endDate) throws TopiaException { + String query = "FROM " + FinancialPeriod.class.getName() + + " WHERE :beginDate <= beginDate" + + " AND beginDate <= :endDate"; + + // add unique result here + List<FinancialPeriod> financialPeriod = context.find(query, "beginDate", beginDate, "endDate", endDate); + return financialPeriod; + } + } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -25,6 +25,7 @@ package org.chorem.lima.entity; +import java.util.Date; import java.util.List; import org.nuiton.topia.TopiaException; @@ -54,6 +55,44 @@ } /** + * Find all transactions between two dates. + * + * @param beginDate begin date + * @param endDate end date + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> findAllByDates(Date beginDate, Date endDate) throws TopiaException { + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate" + + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; + List<FinancialTransaction> result = context.find(query, "beginDate", + beginDate, "endDate", endDate); + return result; + } + + /** + * Find all transactions between two dates in an entry book. + * + * @param beginDate begin date + * @param endDate end date + * @param entryBook entry book + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> findAllByDates(Date beginDate, Date endDate, EntryBook entryBook) throws TopiaException { + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate" + + " AND T.entryBook = :entryBook" + + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; + List<FinancialTransaction> result = context.find(query, "beginDate", + beginDate, "endDate", endDate, "entryBook", entryBook); + return result; + } + + /** * Find all unbalanced transactions. * * @param financialPeriod period @@ -61,6 +100,7 @@ * @return unbalanced transactions * @throws TopiaException */ + @Deprecated public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod financialPeriod, EntryBook entryBook) throws TopiaException { String query = "FROM " + FinancialTransaction.class.getName() + " T"+ @@ -74,8 +114,101 @@ financialPeriod, "entryBook", entryBook); return result; } + + /** + * Find all unbalanced transactions. + * + * @param beginDate beginDate + * @param endDate endDate + * @param entryBook entry book (can be null) + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> getAllUnbalancedTransaction(Date beginDate, Date endDate, + EntryBook entryBook) throws TopiaException { + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) != " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T)" + + " AND :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate"; + List<FinancialTransaction> result = null; + if (entryBook != null) { + query += " AND T.entryBook = :entryBook"; + result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + } else { + result = context.find(query, "beginDate", beginDate, "endDate", endDate); + } + return result; + } + /** + * Find all unbalanced transactions. + * + * @param beginDate beginDate + * @param endDate endDate + * @param entryBook entry book (can be null) + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> getAllBalancedTransaction(Date beginDate, Date endDate, + EntryBook entryBook) throws TopiaException { + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) = " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T)" + + " AND :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate"; + List<FinancialTransaction> result = null; + if (entryBook != null) { + query += " AND T.entryBook = :entryBook"; + result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + } else { + result = context.find(query, "beginDate", beginDate, "endDate", endDate); + } + + return result; + } + + /** + * Find all unbalanced transactions. + * + * @param beginDate beginDate + * @param endDate endDate + * @param entryBook entry book (can be null) + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> getAllIncorrectTransaction(Date beginDate, Date endDate, + EntryBook entryBook) throws TopiaException { + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " LEFT JOIN T.entry AS E" + + " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) != " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T)" + + " OR E.account = null" + + " OR E.voucher = null" + + " OR E.voucher = ''" + + " OR E.description = null" + + " OR E.description = '')" + + " AND :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate"; + List<FinancialTransaction> result = null; + if (entryBook != null) { + query += " AND T.entryBook = :entryBook"; + result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + } else { + result = context.find(query, "beginDate", beginDate, "endDate", endDate); + } + + return result; + } + + /** * Find all transaction where some field are not filled in. * * @param financialPeriod period @@ -83,6 +216,7 @@ * @return unfilled transaction * @throws TopiaException */ + @Deprecated public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod financialPeriod, EntryBook entryBook) throws TopiaException { String query = "FROM " + FinancialTransaction.class.getName() + " T"+ @@ -108,14 +242,6 @@ * @throws TopiaException */ public List<FinancialTransaction> getAllTransactionWithoutEntryBook() throws TopiaException { - /*TopiaQuery query = createQuery("T"); - query.addDistinct() - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - .addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") - .addNull(FinancialTransaction.PROPERTY_ENTRY_BOOK); - List<FinancialTransaction> result = findAllByQuery(query);*/ String query = "FROM " + FinancialTransaction.class.getName() + " T"+ " LEFT JOIN T.entry AS E" + Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-09 15:37:59 UTC (rev 3408) @@ -48,6 +48,8 @@ # lazy org.chorem.lima.entity.FiscalPeriod.attribute.financialPeriod.tagvalue.lazy=false +org.chorem.lima.entity.FinancialTransaction.attribute.entry.tagvalue.lazy=false +org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.subFinancialStatements.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.masterFinancialStatement.tagvalue.lazy=false org.chorem.lima.entity.VatStatement.attribute.subVatStatements.tagvalue.lazy=false Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -310,7 +310,6 @@ FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setFinancialPeriod(financialPeriod); // can be defined later by user if (entryBook != null) { financialTransaction.setEntryBook(entryBook); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-05-09 13:09:24 UTC (rev 3407) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-05-09 15:37:59 UTC (rev 3408) @@ -364,7 +364,7 @@ } else { throw new LimaException("Can't set new transaction"); } - financialTransaction.setFinancialPeriod(financialPeriod); + //financialTransaction.setSelectedFinancialPeriod(selectedFiscalPeriod); // get today Calendar actualCalendar = Calendar.getInstance();

1 0

r3407 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/test/java/org/chorem/lima/entity lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 09 May '12

09 May '12

Author: echatellier Date: 2012-05-09 15:09:24 +0200 (Wed, 09 May 2012) New Revision: 3407 Url: http://chorem.org/repositories/revision/lima/3407 Log: Refactoring periodic entry book rule Added: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-05-09 13:03:32 UTC (rev 3406) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-05-09 13:09:24 UTC (rev 3407) @@ -175,7 +175,9 @@ return financialPeriods; } - /** Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française */ + /** + * Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française. + */ @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { try { @@ -209,6 +211,10 @@ * get all blocked closedperiodicentrybook while his same period, return the number * * compare there + * + * FIXME echatellier 20120504 a quoi ca sert de recuperer un nombre + * et de le comparer avec un autre, c'est pas plus simple de verifier + * qu'il reste des ClosedPeriodicEntryBook non clos ? */ @Override public void blockClosedPeriodicEntryBookRules(ClosedPeriodicEntryBook closedPeriodicEntryBook, TopiaContext topiaTransaction) throws LimaException { @@ -216,51 +222,35 @@ closedPeriodicEntryBook, topiaTransaction); FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod(); - List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = - new ArrayList<ClosedPeriodicEntryBook>(); try { // Get all closedperiod between for the period and entrybook - Date endDate = closedPeriodicEntryBook. - getFinancialPeriod().getBeginDate(); + Date endDate = closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(); + // FIXME echatellier 20120502 c'est pas un hack ca ? + // un period peut ne pas durer un mois endDate = DateUtils.addMonths(endDate, -1); - FiscalPeriodDAO fiscalPeriodDAO = - LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaTransaction); + FiscalPeriodDAO fiscalPeriodDAO = LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaTransaction); - //search fiscalperiod have financialperiod in params - TopiaQuery query1 = fiscalPeriodDAO.createQuery() - .addInElements(":financialPeriod", "financialPeriod") - .addParam("financialPeriod", financialPeriod); - FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByQuery(query1); - + //search fiscalperiod have financialperiod + FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByFinancialPeriod(financialPeriod); Date beginDate = fiscalPeriod.getBeginDate(); - + // FIXME echatellier 20120502 quels est la rapport entre beginDate + // et endDate ? il ne provienent pas du même endroit EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaTransaction); - TopiaQuery query = closedPeriodicEntryBookDAO.createQuery(); - String closedPeriodicEntryBookDateProperty = - TopiaQuery.getProperty(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, - FinancialPeriod.PROPERTY_BEGIN_DATE); - query.addWhere(closedPeriodicEntryBookDateProperty - + " BETWEEN :beginDate AND :endDate") - .addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook) - .addParam("beginDate", beginDate) - .addParam("endDate", endDate); - closedPeriodicEntryBooks. - addAll(closedPeriodicEntryBookDAO.findAllByQuery(query)); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = + closedPeriodicEntryBookDAO.findAllByEntryBookAndDates(entryBook, beginDate, endDate); + // FIXME echatellier 20120504 juste un count suffit int nbClosedPeriodicEntryBooks = closedPeriodicEntryBooks.size(); // Get all closed between for the period, entrybook and are blocked - query.addEquals(ClosedPeriodicEntryBook.PROPERTY_LOCKED, true); - closedPeriodicEntryBooks.clear(); - closedPeriodicEntryBooks. - addAll(closedPeriodicEntryBookDAO.findAllByQuery(query)); + closedPeriodicEntryBooks = closedPeriodicEntryBookDAO.findAllByEntryBookAndDatesLocked(entryBook, beginDate, endDate); int nbBlockedClosedPeriodicEntryBooks = closedPeriodicEntryBooks.size(); Added: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2012-05-09 13:09:24 UTC (rev 3407) @@ -0,0 +1,71 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.List; + +import org.chorem.lima.business.AbstractLimaTest; +import org.chorem.lima.business.LimaException; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * Test for {@link FinancialTransactionDAO}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionDAOTest extends AbstractLimaTest { + + @Before + public void initTest() throws Exception { + initTestDatabase(); + } + + /** + * Test la recherche des transactions non equilibrées. + * + * @throws TopiaException + * @throws LimaException + */ + @Test + public void testFindAllUnbalancedTransactions() throws TopiaException, LimaException { + + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + + TopiaContext tx = getTestContext().beginTransaction(); + FinancialTransactionDAO ftDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(tx); + List<FinancialTransaction> fTransactions = ftDAO.getAllUnbalancedTransaction(financialPeriod, journalDesVentes); + Assert.assertNotNull(fTransactions); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-05-09 13:03:32 UTC (rev 3406) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-05-09 13:09:24 UTC (rev 3407) @@ -102,5 +102,46 @@ " ORDER BY entryBook.code"; return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate); } + + /** + * Retourne toutes les ClosedPeriodicEntryBook par interval de date + * sur les periodes sur lequelles elles portent pour un journal. + * + * @param entryBook entry book + * @param beginDate begin date + * @param endDate end date + * @return all ClosedPeriodicEntryBook between begin and end + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllByEntryBookAndDates(EntryBook entryBook, + Date beginDate, Date endDate) throws TopiaException { + String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + + " WHERE :begindate <= financialPeriod.beginDate " + + " AND financialPeriod.beginDate <= :endDate" + + " AND entryBook = :entryBook"; + return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + } + + /** + * Retourne toutes les ClosedPeriodicEntryBook par interval de date + * sur les periodes sur lequelles elles portent pour un journal. + * + * @param entryBook entry book + * @param beginDate begin date + * @param endDate end date + * @return all ClosedPeriodicEntryBook between begin and end + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllByEntryBookAndDatesLocked(EntryBook entryBook, + Date beginDate, Date endDate) throws TopiaException { + + String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + + " WHERE :begindate <= financialPeriod.beginDate " + + " AND financialPeriod.beginDate <= :endDate" + + " AND entryBook = :entryBook" + + " AND locked = true"; + return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + } + }

1 0

r3406 - in trunk/lima-business/src: main/java/org/chorem/lima/business main/java/org/chorem/lima/business/accountingrules main/java/org/chorem/lima/business/ejb test/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 09 May '12

09 May '12

Author: echatellier Date: 2012-05-09 15:03:32 +0200 (Wed, 09 May 2012) New Revision: 3406 Url: http://chorem.org/repositories/revision/lima/3406 Log: Remove topia context in service, juste expose contextable DAOHelper Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -42,21 +42,30 @@ */ public class LimaDaoHelper { - protected static TopiaContext getContextTransaction() { - TopiaContext result = (TopiaContext)LimaInterceptor.TOPIA_CONTEXT.get(); + protected TopiaContext context; + + public LimaDaoHelper(TopiaContext context) { + this.context = context; + } - if (result == null) { - throw new IllegalStateException("No opened transaction found. Put @TransactionAttribute on method or class"); - } + /** + * Get internal topia context. + * + * Only use full for test. + * + * @return topia context + */ + public TopiaContext getTopiaContext() { + return context; + } - return result; + public AccountDAO getAccountDAO() throws TopiaException { + return LimaCallaoDAOHelper.getAccountDAO(context); } - public static AccountDAO getAccountDAO() throws TopiaException { - return LimaCallaoDAOHelper.getAccountDAO(getContextTransaction()); + public EntryDAO getEntryDAO() throws TopiaException { + return LimaCallaoDAOHelper.getEntryDAO(context); } - public static EntryDAO getEntryDAO() throws TopiaException { - return LimaCallaoDAOHelper.getEntryDAO(getContextTransaction()); - } + } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -38,7 +38,6 @@ import org.chorem.lima.LimaXAResource; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaNotFoundException; /** * Interceptor for topia context transaction. @@ -56,7 +55,7 @@ private static final Log log = LogFactory.getLog(LimaInterceptor.class); - public static final ThreadLocal<TopiaContext> TOPIA_CONTEXT = new ThreadLocal<TopiaContext>(); + public static final ThreadLocal<LimaDaoHelper> DAO_HELPER = new ThreadLocal<LimaDaoHelper>(); @Resource private TransactionManager transactionManager; @@ -70,7 +69,7 @@ // enter in service layer // interceptor will be called before each internal // ejb call, but opening a new transaction in not required - if (TOPIA_CONTEXT.get() == null) { + if (DAO_HELPER.get() == null) { // maybe take care of TransactionAttributeTypes ? if (context.getTarget().getClass().getAnnotation(TransactionAttribute.class) != null || @@ -84,7 +83,8 @@ TopiaContext rootContext = TopiaContextFactory.getContext(config.getFlatOptions()); TopiaContext tx = rootContext.beginTransaction(); - TOPIA_CONTEXT.set(tx); + LimaDaoHelper helper = new LimaDaoHelper(tx); + DAO_HELPER.set(helper); Transaction tr = transactionManager.getTransaction(); @@ -95,7 +95,7 @@ try { result = context.proceed(); } finally { - TOPIA_CONTEXT.remove(); + DAO_HELPER.remove(); } } else { result = context.proceed(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -38,6 +38,7 @@ import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaDaoHelper; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.LimaInterceptor; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; @@ -68,6 +69,16 @@ LogFactory.getLog(DefaultAccountingRules.class); /** + * Return Dao helper to use in current thread. + * Defined by {@link LimaInterceptor}. + * + * @return dao helper + */ + protected LimaDaoHelper getDaoHelper() { + return LimaInterceptor.DAO_HELPER.get(); + } + + /** * Rules to check before create accounts. */ @Override @@ -113,7 +124,7 @@ @Override public void removeAccountRules(Account account) throws LimaException { try { - EntryDAO entryDAO = LimaDaoHelper.getEntryDAO(); + EntryDAO entryDAO = getDaoHelper().getEntryDAO(); // Check if account have entries int nbentries = entryDAO.findAllByAccount(account).size(); if (nbentries != 0) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -25,20 +25,22 @@ package org.chorem.lima.business.ejb; +import static org.nuiton.i18n.I18n._; + +import java.util.Properties; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaDaoHelper; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.LimaInterceptor; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.TopiaRuntimeException; -import java.util.Properties; - -import static org.nuiton.i18n.I18n._; - /** * Abstract code for all ejb services (get context, catch, finally...). * @@ -50,6 +52,16 @@ /** Logger. */ protected static final Log log = LogFactory.getLog(AbstractLimaService.class); + /** + * Return Dao helper to use in current thread. + * Defined by {@link LimaInterceptor}. + * + * @return dao helper + */ + protected LimaDaoHelper getDaoHelper() { + return LimaInterceptor.DAO_HELPER.get(); + } + protected static TopiaContext acquireRootContext() { try { LimaConfig config = LimaConfig.getInstance(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -37,8 +37,8 @@ import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaConfig; -import org.chorem.lima.business.LimaDaoHelper; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.LimaInterceptor; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.utils.AccountComparator; import org.chorem.lima.entity.Account; @@ -63,7 +63,7 @@ long result = 0; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); result = accountDAO.count(); } catch (TopiaException ex) { throw new LimaException("Can't count", ex); @@ -91,7 +91,7 @@ account.setAccountNumber(account.getAccountNumber().toUpperCase()); // check if account number already exist - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); Account existAccount = accountDAO.findByAccountNumber(account.getAccountNumber()); @@ -115,7 +115,7 @@ Account account = null; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); while (account == null && accountNumber.length() > 1) { @@ -135,7 +135,7 @@ Account account = null; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); account = accountDAO.findByAccountNumber(number); } catch (Exception ex) { throw new LimaException("Can't get master account", ex); @@ -152,7 +152,7 @@ List<Account> accountsList; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); accountsList = accountDAO.findAll(); Collections.sort(accountsList, new AccountComparator()); @@ -171,7 +171,7 @@ List<Account> accountsList = null; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); accountsList = accountDAO.findAllLeafAccounts(); } catch (Exception ex) { throw new LimaException("Can't get all leaf accounts", ex); @@ -189,7 +189,7 @@ List<Account> accountsList = null; try { - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); accountsList = accountDAO.findAllSubAccounts(account); } catch (Exception ex) { throw new LimaException("Can't get all sub accounts", ex); @@ -218,7 +218,7 @@ accountingRules.removeAccountRules(account); // remove account - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); Account accountToDelete = accountDAO.findByTopiaId(account.getTopiaId()); accountDAO.delete(accountToDelete); @@ -244,7 +244,7 @@ Account result = null; try { // DAO - AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + AccountDAO accountDAO = getDaoHelper().getAccountDAO(); accountingRules.updateAccountRules(account); result = accountDAO.update(account); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java 2012-05-04 14:51:40 UTC (rev 3405) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java 2012-05-09 13:03:32 UTC (rev 3406) @@ -24,7 +24,6 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.LimaInterceptor; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -51,7 +50,7 @@ public void clearDatabase() throws LimaException { try { - TopiaContext transaction = LimaInterceptor.TOPIA_CONTEXT.get(); + TopiaContext transaction = getDaoHelper().getTopiaContext(); transaction.createSchema(); } catch (TopiaException ex) { throw new LimaException("Can't clear database", ex);

1 0

r3405 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 16:51:40 +0200 (Fri, 04 May 2012) New Revision: 3405 Url: http://chorem.org/repositories/revision/lima/3405 Log: Just another topia query removal Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-05-04 14:51:40 UTC (rev 3405) @@ -0,0 +1,61 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.List; + +import org.nuiton.topia.TopiaException; + +/** + * Fiscal period entity DAO. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FiscalPeriodDAOImpl <E extends FiscalPeriod> extends FiscalPeriodDAOAbstract<FiscalPeriod> { + + /** + * Find fiscal period by financial period. + * + * @param financialPeriod financial period + * @return fiscal period containing financial period + * @throws TopiaException + */ + public FiscalPeriod findByFinancialPeriod(FinancialPeriod financialPeriod) throws TopiaException { + String query = "FROM " + FiscalPeriod.class.getName() + + "WHERE :financialPeriod in elements(financialPeriod)"; + + List<FiscalPeriod> fiscalPeriods = context.find(query, "financialPeriod", financialPeriod); + FiscalPeriod result = null; + if (!fiscalPeriods.isEmpty()) { + result = fiscalPeriods.get(0); + } + return result; + } +} Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3404 - trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 16:44:00 +0200 (Fri, 04 May 2012) New Revision: 3404 Url: http://chorem.org/repositories/revision/lima/3404 Log: Just another topia query removal Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-04 14:36:29 UTC (rev 3403) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-05-04 14:44:00 UTC (rev 3404) @@ -53,7 +53,6 @@ import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; /** * Defaults rules, if no localized rules classes is instantiated @@ -195,6 +194,8 @@ LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); // Check if all financial transactions of closedperiodicentrybook are equilibrate + // FIMXE echatellier 20120504 unutile de recuperer une liste + // entiere juste pour tester l'existence List<FinancialTransaction> result = financialTransactionDAO.getAllUnbalancedTransaction(closedPeriodicEntryBook.getFinancialPeriod(), closedPeriodicEntryBook.getEntryBook()); if (result.size() > 0) { @@ -204,14 +205,16 @@ // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in result = financialTransactionDAO.getAllUnfilledTransaction(closedPeriodicEntryBook.getFinancialPeriod(), closedPeriodicEntryBook.getEntryBook()); - + // FIMXE echatellier 20120504 unutile de recuperer une liste + // entiere juste pour tester l'existence if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.missingelements")); } // Check if all financial transactions have EntryBooks result = financialTransactionDAO.getAllTransactionWithoutEntryBook(); - + // FIMXE echatellier 20120504 unutile de recuperer une liste + // entiere juste pour tester l'existence if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.missingentrybook")); } @@ -332,10 +335,7 @@ LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaContext); //search fiscalperiod have financialperiod in params - TopiaQuery query = fiscalPeriodDAO.createQuery() - .addInElements(":financialPeriod", "financialPeriod") - .addParam("financialPeriod", financialPeriod); - FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByQuery(query); + FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByFinancialPeriod(financialPeriod); Date beginDateFiscalPeriod = fiscalPeriod.getBeginDate(); Date endDateFiscalPeriod = fiscalPeriod.getEndDate();

1 0

r3403 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 16:36:29 +0200 (Fri, 04 May 2012) New Revision: 3403 Url: http://chorem.org/repositories/revision/lima/3403 Log: Remove topia query from all dao Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-05-04 13:53:36 UTC (rev 3402) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-05-04 14:36:29 UTC (rev 3403) @@ -28,7 +28,6 @@ import java.util.List; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; /** * Ajout de requetes specifiques aux financial transaction sur le DAO. @@ -57,40 +56,46 @@ /** * Find all unbalanced transactions. * - * @param period period + * @param financialPeriod period * @param entryBook entry book * @return unbalanced transactions * @throws TopiaException */ - public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod period, + public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod financialPeriod, EntryBook entryBook) throws TopiaException { - TopiaQuery query = createQuery("E"); - query.addWhere("E.amountCredit != E.amountDebit") - .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); - List<FinancialTransaction> result = findAllByQuery(query); + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) != " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T)" + + " AND T.financialPeriod = :financialPeriod" + + " AND T.entryBook = :entryBook"; + List<FinancialTransaction> result = context.find(query, "financialPeriod", + financialPeriod, "entryBook", entryBook); return result; } /** * Find all transaction where some field are not filled in. * - * @param period period + * @param financialPeriod period * @param entryBook entry book * @return unfilled transaction * @throws TopiaException */ - public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod period, + public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod financialPeriod, EntryBook entryBook) throws TopiaException { - TopiaQuery query = createQuery("T"); - query.addDistinct() - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - .addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") - .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); - List<FinancialTransaction> result = findAllByQuery(query); + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " LEFT JOIN T.entry AS E" + + " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) != " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T) + OR E.account = null" + + " OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = '')" + + " AND T.entryBook = :entryBook" + + " AND T.financialPeriod = :financialPeriod"; + List<FinancialTransaction> result = context.find(query, "financialPeriod", + financialPeriod, "entryBook", entryBook); return result; } @@ -98,20 +103,31 @@ * Find all transaction without entry book. * * TODO echatellier 20120425 same method as getAllUnfilledTransaction ? - * doesn't concern a period ? * * @return * @throws TopiaException */ public List<FinancialTransaction> getAllTransactionWithoutEntryBook() throws TopiaException { - TopiaQuery query = createQuery("T"); + /*TopiaQuery query = createQuery("T"); query.addDistinct() .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) .addFrom(FiscalPeriod.class, "F") .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") .addNull(FinancialTransaction.PROPERTY_ENTRY_BOOK); - List<FinancialTransaction> result = findAllByQuery(query); + List<FinancialTransaction> result = findAllByQuery(query);*/ + + String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " LEFT JOIN T.entry AS E" + + " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = true AND financialTransaction = T) != " + + " (SELECT sum(amount) FROM " + Entry.class.getName() + + " WHERE debit = false AND financialTransaction = T) + OR E.account = null" + + " OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = '')" + + " AND entryBook = null"; + // FIXME echatellier 20120504 doesn't concern a period ? all database ? + List<FinancialTransaction> result = context.find(query); + return result; }

1 0

r3402 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 15:53:36 +0200 (Fri, 04 May 2012) New Revision: 3402 Url: http://chorem.org/repositories/revision/lima/3402 Log: Begin report service refactoring. Move query to DAO. Remove topia query. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.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 2012-05-04 13:17:42 UTC (rev 3401) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-05-04 13:53:36 UTC (rev 3402) @@ -157,42 +157,6 @@ return reportsDatas; } - /* - * Query for find entries for accountsreports and balancereports - * Just exact and balanced transaction are calculated. - * - * @param account - * @param beginDate - * @param endDate - * @param entryDAO - * @param queryAlias - * @return - * @throws LimaException - * - protected TopiaQuery createEntryQuery(Account account, - Date beginDate, - Date endDate, - EntryDAO entryDAO, - String queryAlias) { - TopiaQuery query = entryDAO.createQuery(queryAlias); - - String transactionDateProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_TRANSACTION_DATE); - String entryBookProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_ENTRY_BOOK); - - // echatellier, oui c'est hardcodé, mais qu'est ce que c'est illisible sans ca - query .addWhere("(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + - "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)") - .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") - .addNotNull(entryBookProperty) - .addParam("beginDate", beginDate) - .addParam("endDate", endDate) - .addEquals(Entry.PROPERTY_ACCOUNT, account); - - return query; - }*/ - /** * Get list entries * Calculate all credit, debit and solde amounts for the accounts reports @@ -206,9 +170,7 @@ * @throws TopiaException */ protected ReportsDatas generateSubAccountReportsWithTransaction(Account account, - Date beginDate, - Date endDate, - TopiaContext topiaContext) throws TopiaException { + Date beginDate, Date endDate, TopiaContext topiaContext) throws TopiaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); @@ -217,11 +179,11 @@ EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); // trouve les entrees associées à ca compte entre les date données - List<Entry> listEntries = entryDAO.findAllEntryOfEquilibredTransaction(account, beginDate, endDate); + List<Entry> listEntries = entryDAO.findAllEntryOfBalancedTransaction(account, beginDate, endDate); reportsDatas.setListEntry(listEntries); // recupere les totaux pour le compte - List<Object[]> results = entryDAO.getDebitCreditOfEquilibredTransaction(account, beginDate, endDate); + List<Object[]> results = entryDAO.getDebitCreditOfBalancedTransaction(account, beginDate, endDate); int nbAmount = results.size(); if (nbAmount == 2) { debit = (BigDecimal) results.get(0)[1]; @@ -259,37 +221,20 @@ * @throws TopiaException */ public ReportsDatas generateSubAccountBalanceWithTransaction(Account account, - Date beginDate, - Date endDate, - Boolean getEntries, - TopiaContext topiaContext) throws LimaException, TopiaException { + Date beginDate, Date endDate, Boolean getEntries, TopiaContext topiaContext) throws LimaException, TopiaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); - //String queryAlias = "E"; EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); if (getEntries) { - //TopiaQuery entriesQuery = - // createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - //IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION - //entriesQuery.addLoad(Entry.PROPERTY_FINANCIAL_TRANSACTION); - //String loadEntryBookProperty = - // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - // FinancialTransaction.PROPERTY_ENTRY_BOOK); - //entriesQuery.addLoad(loadEntryBookProperty); - List<Entry> listEntries = entryDAO.findAllEntryOfEquilibredTransaction(account, beginDate, endDate); + List<Entry> listEntries = entryDAO.findAllEntryOfBalancedTransaction(account, beginDate, endDate); reportsDatas.setListEntry(listEntries); } - //TopiaQuery amountsQuery = - // createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - //amountsQuery.setSelect("E." + Entry.PROPERTY_DEBIT, "SUM(E." + Entry.PROPERTY_AMOUNT + ")"); - //amountsQuery.addGroup("E." + Entry.PROPERTY_DEBIT); - //results = amountsQuery.execute(topiaContext); - List<Object[]> results = entryDAO.getDebitCreditOfEquilibredTransaction(account, beginDate, endDate); + List<Object[]> results = entryDAO.getDebitCreditOfBalancedTransaction(account, beginDate, endDate); int nbAmount = results.size(); if (nbAmount == 2) { debit = (BigDecimal) results.get(0)[1]; @@ -330,114 +275,55 @@ */ @Override public ReportsDatas generateEntryBooksReports(EntryBook entryBook, - Date beginDate, - Date endDate) throws LimaException { + Date beginDate, Date endDate) throws LimaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); - List<Object[]> results; - if (entryBook != null && beginDate != null && endDate != null) { - // Get all entries with a topia query - TopiaContext topiaTransaction = beginTransaction(rootContext); - try { - EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaTransaction); - TopiaQuery entriesQuery = createEntryBookReportsQuery( - entryBook, beginDate, endDate, entryDAO, "E"); - String orderDateProperty = - TopiaQuery.getProperty("E", Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_TRANSACTION_DATE); - String orderIdProperty = - TopiaQuery.getProperty("E", Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.TOPIA_ID); - entriesQuery.addOrder(orderDateProperty) - .addOrder(orderIdProperty); - reportsDatas.setListEntry(entryDAO.findAllByQuery(entriesQuery)); - - TopiaQuery amountsQuery = - createEntryBookReportsQuery(entryBook, beginDate, endDate, entryDAO, "E"); - amountsQuery.setSelect("E." + Entry.PROPERTY_DEBIT, "SUM(E." + Entry.PROPERTY_AMOUNT + ")"); - amountsQuery.addGroup("E." + Entry.PROPERTY_DEBIT); - results = amountsQuery.execute(topiaTransaction); - int nbAmount = results.size(); - if (nbAmount == 2) { + // Get all entries with a topia query + TopiaContext topiaTransaction = beginTransaction(rootContext); + try { + EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaTransaction); + List<Entry> entries = entryDAO.findAllEntryOfBalancedTransaction(entryBook, beginDate, endDate); + reportsDatas.setListEntry(entries); + + List<Object[]> results = entryDAO.getDebitCreditOfBalancedTransaction(entryBook, beginDate, endDate); + int nbAmount = results.size(); + if (nbAmount == 2) { + debit = (BigDecimal) results.get(0)[1]; + credit = (BigDecimal) results.get(1)[1]; + } + if (nbAmount == 1) { + if ((Boolean) results.get(0)[0]) { debit = (BigDecimal) results.get(0)[1]; - credit = (BigDecimal) results.get(1)[1]; + } else { + credit = (BigDecimal) results.get(0)[1]; } - if (nbAmount == 1) { - if ((Boolean) results.get(0)[0]) { - debit = (BigDecimal) results.get(0)[1]; - } else { - credit = (BigDecimal) results.get(0)[1]; - } - } + } - // set the amounts and solde - //solde = debit - credit; - solde = solde.add(debit); - solde = solde.subtract(credit); - if (solde.compareTo(BigDecimal.ZERO) == 1) { - reportsDatas.setSoldeDebit(true); - } - solde = solde.abs(); - - reportsDatas.setAmountCredit(credit); - reportsDatas.setAmountDebit(debit); - reportsDatas.setAmountSolde(solde); - - //commitTransaction(topiaTransaction); - } catch (Exception ex) { - doCatch(topiaTransaction, ex); - } finally { - doFinally(topiaTransaction); + // set the amounts and solde + //solde = debit - credit; + solde = solde.add(debit); + solde = solde.subtract(credit); + if (solde.compareTo(BigDecimal.ZERO) == 1) { + reportsDatas.setSoldeDebit(true); } + solde = solde.abs(); + + reportsDatas.setAmountCredit(credit); + reportsDatas.setAmountDebit(debit); + reportsDatas.setAmountSolde(solde); + } catch (Exception ex) { + doCatch(topiaTransaction, ex); + } finally { + doFinally(topiaTransaction); } return reportsDatas; } /** - * Query for find entries for accountsreports and balancereports - * Just balanced transaction are calculated - * - * @param entryBook - * @param beginDate - * @param endDate - * @param entryDAO - * @param queryAlias - * @return - * @throws LimaException - */ - public TopiaQuery createEntryBookReportsQuery(EntryBook entryBook, - Date beginDate, - Date endDate, - EntryDAO entryDAO, - String queryAlias) throws LimaException { - TopiaQuery query = entryDAO.createQuery(queryAlias); - String transactionDateProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_TRANSACTION_DATE); - - // FIXME 20120110 echatellier amoutcredit and debit removed since 0.6 - //String amountCreditProperty = - // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - // FinancialTransaction.PROPERTY_AMOUNT_CREDIT); - //String amountDebitProperty = - // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - // FinancialTransaction.PROPERTY_AMOUNT_DEBIT); - String entryBookProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_ENTRY_BOOK); - query - //.addWhere(amountCreditProperty + " = " + amountDebitProperty) - .addEquals(entryBookProperty, entryBook) - .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") - .addParam("beginDate", beginDate) - .addParam("endDate", endDate); - - return query; - } - - /** * Get balance trial * * Calculate the amounts and the solde for all subaccounts @@ -476,8 +362,7 @@ } //build list account from selectedAccounts else { - accounts = accountDAO.stringToListAccounts( - result, false); + accounts = accountDAO.stringToListAccounts( result, false); } for (Account account : accounts) { ReportsDatas reportsDatas = @@ -571,6 +456,8 @@ accountsList = accountDAO.findAll(); for (Account account : accountsList) { //VAT accounts start only with number 44 + //FIXME echatellier 44 is hardcoded and depends on + //french rule ? if (account.getAccountNumber().startsWith("44")) { list.add(generateBalanceTrial(fp.getBeginDate(), fp.getEndDate(), account.getAccountNumber(), Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-04 13:53:36 UTC (rev 3402) @@ -33,24 +33,21 @@ public class EntryDAOImpl<E extends Entry> extends EntryDAOAbstract<Entry> { /** - * Requete generique qui recupere les entrees equilibrées portant sur un - * compte entre deux dates. + * Requete generique qui recupere les entrees equilibrées portant entre + * deux dates. * * @param account account * @param beginDate begin date * @param endDate end date */ - protected String getEquilibredTransactionQuery(Account account, - Date beginDate, Date endDate) { + protected String getEquilibredTransactionQuery(Date beginDate, Date endDate) { String query = "FROM " + Entry.class.getName() + " E" + // equlibrée (somme des débit = somme des crédit) " WHERE (select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)" + // entre les 2 dates " AND :beginDate <= E.financialTransaction.transactionDate" + - " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le compte - " AND E.account = :account"; + " AND E.financialTransaction.transactionDate <= :endDate"; return query; } @@ -64,10 +61,12 @@ * @return entries * @throws TopiaException */ - public List<Entry> findAllEntryOfEquilibredTransaction(Account account, + public List<Entry> findAllEntryOfBalancedTransaction(Account account, Date beginDate, Date endDate) throws TopiaException { - String query = getEquilibredTransactionQuery(account, beginDate, endDate); + String query = getEquilibredTransactionQuery(beginDate, endDate) + + // concerne le compte + " AND E.account = :account"; List<Entry> entries = context.find(query, "beginDate", beginDate, "endDate", endDate, "account", account); @@ -78,20 +77,67 @@ * Retourne la somme des entrées des transaction equilibrées entre * deux dates pour un compte donné. * - * @param account le compte + * @param account account * @param beginDate bebin date * @param endDate end date * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) * @throws TopiaException */ - public List<Object[]> getDebitCreditOfEquilibredTransaction(Account account, + public List<Object[]> getDebitCreditOfBalancedTransaction(Account account, Date beginDate, Date endDate) throws TopiaException { String query = "SELECT E.debit, sum(E.amount) " + - getEquilibredTransactionQuery(account, beginDate, endDate) + + getEquilibredTransactionQuery(beginDate, endDate) + + // concerne le compte + " AND E.account = :account" + " GROUP BY E.debit"; List<Object[]> result = context.find(query, "beginDate", beginDate, "endDate", endDate, "account", account); return result; } + + /** + * Retourne les entrees des transaction equlibrées entre deux dates pour + * un journal. + * + * @param entryBook entry book + * @param beginDate begin date + * @param endDate end date + * @throws TopiaException + */ + public List<Entry> findAllEntryOfBalancedTransaction(EntryBook entryBook, Date beginDate, + Date endDate) throws TopiaException { + String query = getEquilibredTransactionQuery(beginDate, endDate) + + // concerne le compte + " AND E.entryBook = :entryBook" + + // fix order + " ORDER BY, E.financialTransaction.beginDate, E.financialTransaction.topiaId"; + + List<Entry> entries = context.find(query, "beginDate", beginDate, + "endDate", endDate, "entryBook", entryBook); + return entries; + } + + /** + * Retourne la somme des entrées des transaction equilibrées entre + * deux dates pour un journal donné. + * + * @param entryBook entry book + * @param beginDate bebin date + * @param endDate end date + * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) + * @throws TopiaException + */ + public List<Object[]> getDebitCreditOfBalancedTransaction(EntryBook entryBook, + Date beginDate, Date endDate) throws TopiaException { + String query = "SELECT E.debit, sum(E.amount) " + + getEquilibredTransactionQuery(beginDate, endDate) + + // concerne le compte + " AND E.entryBook = :entryBook" + + " GROUP BY E.debit"; + + List<Object[]> result = context.find(query, "beginDate", beginDate, + "endDate", endDate, "entryBook", entryBook); + return result; + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-05-04 13:17:42 UTC (rev 3401) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-05-04 13:53:36 UTC (rev 3402) @@ -58,7 +58,6 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; - /** * Handler associated with accounts reports view. * By : $Author$

1 0

r3401 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 15:17:42 +0200 (Fri, 04 May 2012) New Revision: 3401 Url: http://chorem.org/repositories/revision/lima/3401 Log: Rename DAO to DAOImpl Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java Removed: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-05-04 09:43:18 UTC (rev 3400) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -1,190 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.entity; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.StringTokenizer; - -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.TopiaException; - -public class AccountDAO extends AccountDAOImpl<Account> { - - /** - * Retourne tous les comptes qui n'ont pas eux meme de sous compte. - * - * @return leaf accounts - * @throws TopiaException - */ - public List<Account> findAllLeafAccounts() throws TopiaException { - // FIXME echatellier 20120413 la requete ne fonctionne pas - // et retourne vide - /*String query = "FROM " + Account.class.getName() + " a WHERE a NOT IN (" + - "FROM " + Account.class.getName() + " b where b.accountNumber like concat(a.accountNumber,'%'))"; - List<Account> accounts = context.find(query);*/ - - // code temporaire non performant en attandant: - List<Account> allAccounts = findAll(); - Iterator<Account> itAccount = allAccounts.iterator(); - while (itAccount.hasNext()) { - Account acc = itAccount.next(); - Iterator<Account> itAccount2 = allAccounts.iterator(); - while (itAccount2.hasNext()) { - Account acc2 = itAccount2.next(); - if (!acc2.getAccountNumber().equals(acc.getAccountNumber()) && - acc2.getAccountNumber().startsWith(acc.getAccountNumber())) { - itAccount.remove(); - break; - } - } - } - return allAccounts; - } - - /** - * TODO pas compris l'interet de la methode, si on veut un compte feuille - * par son numero, cela revient a avoir un compte par son numero. - */ - @Deprecated - public Account findLeafAccountByNumber(String number) throws TopiaException { - return findByAccountNumber(number); - } - - /** - * Find account contained into account number interval. - * - * @param accountNumberLow min account number - * @param accountNumberHigh max account number - * @return account list - * @throws TopiaException - */ - protected List<Account> findIntervalAccountByNumber(String accountNumberLow, - String accountNumberHigh) throws TopiaException { - String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; - return (List<Account>) context.find(query, "accountNumberLow", - accountNumberLow, "accountNumberHigh", accountNumberHigh); - } - - /** - * Retourne tous les comptes dont le numero commence par celui specifié. - * - * @param account parent account - * @return - * @throws TopiaException - */ - public List<Account> findAllSubAccounts(Account account) throws TopiaException { - - String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; - List<Account> accounts = context.find(query, "accountNumber", account.getAccountNumber()); - - return accounts; - } - - /** - * @deprecated since 0.6, business method, need to be moved out of dao - */ - @Deprecated - public List<Account> stringToListAccounts(String selectedAccounts, - Boolean leafAccountsMode) throws TopiaException { - Set<Account> accounts = new HashSet<Account>(); - if (selectedAccounts != null) { - //Remove Spaces - String result = StringUtils.deleteWhitespace(selectedAccounts); - - Boolean first = true; - StringTokenizer stStar = new StringTokenizer(result, "-"); - while (stStar.hasMoreTokens()) { - String subString = stStar.nextToken(); - - //Split comma - StringTokenizer stComma = new StringTokenizer(subString, ","); - while (stComma.hasMoreTokens()) { - String s = stComma.nextToken(); - //if intervall account - if (s.contains("..") && !s.endsWith("..")) { - //Split .. - String stringDoubleDot[] = s.split("\\.\\."); - - List<Account> resultIntervall = - findIntervalAccountByNumber(stringDoubleDot[0], stringDoubleDot[1]); - - //if first add accounts, else remove - if (first) { - accounts.addAll(resultIntervall); - } else { - accounts.removeAll(resultIntervall); - } - } - //else one account - else { - Account account = null; - if (leafAccountsMode) { - account = findLeafAccountByNumber(s); - } else { - account = findByAccountNumber(s); - } - //if exist - if (account != null) { - //if first - if (first) { - accounts.add(account); - } else { - accounts.remove(account); - } - } - //search all account start with accountnumber - else { - /*TopiaQuery query = createQuery(); - String subAccountsProperty = TopiaQuery.getProperty(Account.PROPERTY_SUB_ACCOUNTS); - query.addWhere("not exists elements (" + subAccountsProperty + ")") - .addWhere(Account.PROPERTY_ACCOUNT_NUMBER, Op.LIKE, s + "%"); - List<Account> accountsResult = (List<Account>) findAllByQuery(query);*/ - - String query = "FROM " + Account.class.getName() + " a WHERE NOT IN (" + - "FROM " + Account.class.getName() + " b where b.accountNumber like a.accountNumber+'%')" + - " AND a.accountNumber LIKE ?"; - List<Account> accountsResult = getContext().find(query, s); - if (accountsResult != null) { - //if first - if (first) { - accounts.addAll(accountsResult); - } else { - accounts.removeAll(accountsResult); - } - } - } - } - } - first = false; - } - } - return new ArrayList(accounts); - } -} Copied: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java (from rev 3400, trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java) =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -0,0 +1,190 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.TopiaException; + +public class AccountDAOImpl<E extends Account> extends AccountDAOAbstract<Account> { + + /** + * Retourne tous les comptes qui n'ont pas eux meme de sous compte. + * + * @return leaf accounts + * @throws TopiaException + */ + public List<Account> findAllLeafAccounts() throws TopiaException { + // FIXME echatellier 20120413 la requete ne fonctionne pas + // et retourne vide + /*String query = "FROM " + Account.class.getName() + " a WHERE a NOT IN (" + + "FROM " + Account.class.getName() + " b where b.accountNumber like concat(a.accountNumber,'%'))"; + List<Account> accounts = context.find(query);*/ + + // code temporaire non performant en attandant: + List<Account> allAccounts = findAll(); + Iterator<Account> itAccount = allAccounts.iterator(); + while (itAccount.hasNext()) { + Account acc = itAccount.next(); + Iterator<Account> itAccount2 = allAccounts.iterator(); + while (itAccount2.hasNext()) { + Account acc2 = itAccount2.next(); + if (!acc2.getAccountNumber().equals(acc.getAccountNumber()) && + acc2.getAccountNumber().startsWith(acc.getAccountNumber())) { + itAccount.remove(); + break; + } + } + } + return allAccounts; + } + + /** + * TODO pas compris l'interet de la methode, si on veut un compte feuille + * par son numero, cela revient a avoir un compte par son numero. + */ + @Deprecated + public Account findLeafAccountByNumber(String number) throws TopiaException { + return findByAccountNumber(number); + } + + /** + * Find account contained into account number interval. + * + * @param accountNumberLow min account number + * @param accountNumberHigh max account number + * @return account list + * @throws TopiaException + */ + protected List<Account> findIntervalAccountByNumber(String accountNumberLow, + String accountNumberHigh) throws TopiaException { + String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; + return (List<Account>) context.find(query, "accountNumberLow", + accountNumberLow, "accountNumberHigh", accountNumberHigh); + } + + /** + * Retourne tous les comptes dont le numero commence par celui specifié. + * + * @param account parent account + * @return + * @throws TopiaException + */ + public List<Account> findAllSubAccounts(Account account) throws TopiaException { + + String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; + List<Account> accounts = context.find(query, "accountNumber", account.getAccountNumber()); + + return accounts; + } + + /** + * @deprecated since 0.6, business method, need to be moved out of dao + */ + @Deprecated + public List<Account> stringToListAccounts(String selectedAccounts, + Boolean leafAccountsMode) throws TopiaException { + Set<Account> accounts = new HashSet<Account>(); + if (selectedAccounts != null) { + //Remove Spaces + String result = StringUtils.deleteWhitespace(selectedAccounts); + + Boolean first = true; + StringTokenizer stStar = new StringTokenizer(result, "-"); + while (stStar.hasMoreTokens()) { + String subString = stStar.nextToken(); + + //Split comma + StringTokenizer stComma = new StringTokenizer(subString, ","); + while (stComma.hasMoreTokens()) { + String s = stComma.nextToken(); + //if intervall account + if (s.contains("..") && !s.endsWith("..")) { + //Split .. + String stringDoubleDot[] = s.split("\\.\\."); + + List<Account> resultIntervall = + findIntervalAccountByNumber(stringDoubleDot[0], stringDoubleDot[1]); + + //if first add accounts, else remove + if (first) { + accounts.addAll(resultIntervall); + } else { + accounts.removeAll(resultIntervall); + } + } + //else one account + else { + Account account = null; + if (leafAccountsMode) { + account = findLeafAccountByNumber(s); + } else { + account = findByAccountNumber(s); + } + //if exist + if (account != null) { + //if first + if (first) { + accounts.add(account); + } else { + accounts.remove(account); + } + } + //search all account start with accountnumber + else { + /*TopiaQuery query = createQuery(); + String subAccountsProperty = TopiaQuery.getProperty(Account.PROPERTY_SUB_ACCOUNTS); + query.addWhere("not exists elements (" + subAccountsProperty + ")") + .addWhere(Account.PROPERTY_ACCOUNT_NUMBER, Op.LIKE, s + "%"); + List<Account> accountsResult = (List<Account>) findAllByQuery(query);*/ + + String query = "FROM " + Account.class.getName() + " a WHERE NOT IN (" + + "FROM " + Account.class.getName() + " b where b.accountNumber like a.accountNumber+'%')" + + " AND a.accountNumber LIKE ?"; + List<Account> accountsResult = getContext().find(query, s); + if (accountsResult != null) { + //if first + if (first) { + accounts.addAll(accountsResult); + } else { + accounts.removeAll(accountsResult); + } + } + } + } + } + first = false; + } + } + return new ArrayList(accounts); + } +} Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java 2012-05-04 09:43:18 UTC (rev 3400) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -1,106 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.entity; - -import java.util.Date; -import java.util.List; - -import org.nuiton.topia.TopiaException; - -public class ClosedPeriodicEntryBookDAO extends ClosedPeriodicEntryBookDAOImpl<ClosedPeriodicEntryBook> { - - /** - * Find all ClosedPeriodicEntryBook with common EntryBook. - * - * @param entryBook entry book property - * @return ClosedPeriodicEntryBook list - * @throws TopiaException - */ - public List<ClosedPeriodicEntryBook> findAllByEntryBook(EntryBook entryBook) throws TopiaException { - return findAllByProperties(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); - } - - /** - * Return ClosedPeriodicEntryBook by EntryBook and FinancialPeriod. - * - * @param entryBook - * @param financialPeriod - * @return ClosedPeriodicEntryBook - * @throws TopiaException - */ - public ClosedPeriodicEntryBook findByEntryBookAndFinancialPeriod( - EntryBook entryBook, FinancialPeriod financialPeriod) - throws TopiaException { - - List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; - String query = "FROM " + ClosedPeriodicEntryBook.class.getName(); - if (entryBook != null) { - query += " WHERE entryBook = :entryBook"; - if (financialPeriod != null) { - query += " AND financialPeriod = :financialPeriod"; - //context.find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook, "financialPeriod", financialPeriod); - } else { - //context.find(query, 0, 0, "entryBook", entryBook); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook); - } - } else { - if (financialPeriod != null) { - query += " WHERE financialPeriod = :financialPeriod"; - } - - //context.find(query, 0, 0, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "financialPeriod", financialPeriod); - } - - // get only first one - ClosedPeriodicEntryBook result = null; - if (!closedPeriodicEntryBooks.isEmpty()) { - result = closedPeriodicEntryBooks.get(0); - } - return result; - } - - /** - * Retourne toutes les ClosedPeriodicEntryBook par interval de date - * sur les periodes sur lequelles elles portent ordonnée par journal. - * - * @param beginDate begin date - * @param endDate end date - * @return all ClosedPeriodicEntryBook between begin and end - * @throws TopiaException - */ - public List<ClosedPeriodicEntryBook> findAllByDates(Date beginDate, - Date endDate) throws TopiaException { - - String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + - " WHERE :begindate <= financialPeriod.beginDate " + - " AND financialPeriod.beginDate <= :endDate" + - " ORDER BY entryBook.code"; - return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate); - } - -} Copied: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java (from rev 3400, trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java) =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -0,0 +1,106 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.Date; +import java.util.List; + +import org.nuiton.topia.TopiaException; + +public class ClosedPeriodicEntryBookDAOImpl<E extends ClosedPeriodicEntryBook> extends ClosedPeriodicEntryBookDAOAbstract<ClosedPeriodicEntryBook> { + + /** + * Find all ClosedPeriodicEntryBook with common EntryBook. + * + * @param entryBook entry book property + * @return ClosedPeriodicEntryBook list + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllByEntryBook(EntryBook entryBook) throws TopiaException { + return findAllByProperties(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); + } + + /** + * Return ClosedPeriodicEntryBook by EntryBook and FinancialPeriod. + * + * @param entryBook + * @param financialPeriod + * @return ClosedPeriodicEntryBook + * @throws TopiaException + */ + public ClosedPeriodicEntryBook findByEntryBookAndFinancialPeriod( + EntryBook entryBook, FinancialPeriod financialPeriod) + throws TopiaException { + + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; + String query = "FROM " + ClosedPeriodicEntryBook.class.getName(); + if (entryBook != null) { + query += " WHERE entryBook = :entryBook"; + if (financialPeriod != null) { + query += " AND financialPeriod = :financialPeriod"; + //context.find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook, "financialPeriod", financialPeriod); + } else { + //context.find(query, 0, 0, "entryBook", entryBook); + closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook); + } + } else { + if (financialPeriod != null) { + query += " WHERE financialPeriod = :financialPeriod"; + } + + //context.find(query, 0, 0, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.find(query, "financialPeriod", financialPeriod); + } + + // get only first one + ClosedPeriodicEntryBook result = null; + if (!closedPeriodicEntryBooks.isEmpty()) { + result = closedPeriodicEntryBooks.get(0); + } + return result; + } + + /** + * Retourne toutes les ClosedPeriodicEntryBook par interval de date + * sur les periodes sur lequelles elles portent ordonnée par journal. + * + * @param beginDate begin date + * @param endDate end date + * @return all ClosedPeriodicEntryBook between begin and end + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllByDates(Date beginDate, + Date endDate) throws TopiaException { + + String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + + " WHERE :begindate <= financialPeriod.beginDate " + + " AND financialPeriod.beginDate <= :endDate" + + " ORDER BY entryBook.code"; + return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate); + } + +} Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java 2012-05-04 09:43:18 UTC (rev 3400) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -1,97 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.entity; - -import java.util.Date; -import java.util.List; - -import org.nuiton.topia.TopiaException; - -public class EntryDAO extends EntryDAOImpl<Entry> { - - /** - * Requete generique qui recupere les entrees equilibrées portant sur un - * compte entre deux dates. - * - * @param account account - * @param beginDate begin date - * @param endDate end date - */ - protected String getEquilibredTransactionQuery(Account account, - Date beginDate, Date endDate) { - String query = "FROM " + Entry.class.getName() + " E" + - // equlibrée (somme des débit = somme des crédit) - " WHERE (select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + - "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)" + - // entre les 2 dates - " AND :beginDate <= E.financialTransaction.transactionDate" + - " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le compte - " AND E.account = :account"; - return query; - } - - /** - * Query for find entries for accountsreports and balancereports - * Just exact and balanced transaction are calculated. - * - * @param account account - * @param beginDate begin date - * @param endDate end date - * @return entries - * @throws TopiaException - */ - public List<Entry> findAllEntryOfEquilibredTransaction(Account account, - Date beginDate, Date endDate) throws TopiaException { - - String query = getEquilibredTransactionQuery(account, beginDate, endDate); - - List<Entry> entries = context.find(query, "beginDate", beginDate, - "endDate", endDate, "account", account); - return entries; - } - - /** - * Retourne la somme des entrées des transaction equilibrées entre - * deux dates pour un compte donné. - * - * @param account le compte - * @param beginDate bebin date - * @param endDate end date - * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) - * @throws TopiaException - */ - public List<Object[]> getDebitCreditOfEquilibredTransaction(Account account, - Date beginDate, Date endDate) throws TopiaException { - String query = "SELECT E.debit, sum(E.amount) " + - getEquilibredTransactionQuery(account, beginDate, endDate) + - " GROUP BY E.debit"; - - List<Object[]> result = context.find(query, "beginDate", beginDate, - "endDate", endDate, "account", account); - return result; - } -} Copied: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java (from rev 3400, trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java) =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -0,0 +1,97 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.Date; +import java.util.List; + +import org.nuiton.topia.TopiaException; + +public class EntryDAOImpl<E extends Entry> extends EntryDAOAbstract<Entry> { + + /** + * Requete generique qui recupere les entrees equilibrées portant sur un + * compte entre deux dates. + * + * @param account account + * @param beginDate begin date + * @param endDate end date + */ + protected String getEquilibredTransactionQuery(Account account, + Date beginDate, Date endDate) { + String query = "FROM " + Entry.class.getName() + " E" + + // equlibrée (somme des débit = somme des crédit) + " WHERE (select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + + "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)" + + // entre les 2 dates + " AND :beginDate <= E.financialTransaction.transactionDate" + + " AND E.financialTransaction.transactionDate <= :endDate" + + // concerne le compte + " AND E.account = :account"; + return query; + } + + /** + * Query for find entries for accountsreports and balancereports + * Just exact and balanced transaction are calculated. + * + * @param account account + * @param beginDate begin date + * @param endDate end date + * @return entries + * @throws TopiaException + */ + public List<Entry> findAllEntryOfEquilibredTransaction(Account account, + Date beginDate, Date endDate) throws TopiaException { + + String query = getEquilibredTransactionQuery(account, beginDate, endDate); + + List<Entry> entries = context.find(query, "beginDate", beginDate, + "endDate", endDate, "account", account); + return entries; + } + + /** + * Retourne la somme des entrées des transaction equilibrées entre + * deux dates pour un compte donné. + * + * @param account le compte + * @param beginDate bebin date + * @param endDate end date + * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) + * @throws TopiaException + */ + public List<Object[]> getDebitCreditOfEquilibredTransaction(Account account, + Date beginDate, Date endDate) throws TopiaException { + String query = "SELECT E.debit, sum(E.amount) " + + getEquilibredTransactionQuery(account, beginDate, endDate) + + " GROUP BY E.debit"; + + List<Object[]> result = context.find(query, "beginDate", beginDate, + "endDate", endDate, "account", account); + return result; + } +} Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java 2012-05-04 09:43:18 UTC (rev 3400) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -1,58 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.entity; - -import java.util.Date; -import java.util.List; - -import org.nuiton.topia.TopiaException; - -public class FinancialPeriodDAO extends FinancialPeriodDAOImpl<FinancialPeriod> { - - /** - * Return FinancialPeriod by Date. - * Date is include between financialperiod begin and end date. - * - * @param date period middle date - * @return FinancialPeriod for {@code date} - * @throws TopiaException - */ - public FinancialPeriod findByDate(Date date) throws TopiaException { - - String query = "FROM " + FinancialPeriod.class.getName() + - " WHERE beginDate <= :date" + - " AND :date <= endDate"; - - // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query, "date", date); - FinancialPeriod result = null; - if (!financialPeriod.isEmpty()) { - result = financialPeriod.get(0); - } - return result; - } - -} Copied: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java (from rev 3400, trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java) =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -0,0 +1,58 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.Date; +import java.util.List; + +import org.nuiton.topia.TopiaException; + +public class FinancialPeriodDAOImpl<E extends FinancialPeriod> extends FinancialPeriodDAOAbstract<FinancialPeriod> { + + /** + * Return FinancialPeriod by Date. + * Date is include between financialperiod begin and end date. + * + * @param date period middle date + * @return FinancialPeriod for {@code date} + * @throws TopiaException + */ + public FinancialPeriod findByDate(Date date) throws TopiaException { + + String query = "FROM " + FinancialPeriod.class.getName() + + " WHERE beginDate <= :date" + + " AND :date <= endDate"; + + // add unique result here + List<FinancialPeriod> financialPeriod = context.find(query, "date", date); + FinancialPeriod result = null; + if (!financialPeriod.isEmpty()) { + result = financialPeriod.get(0); + } + return result; + } + +} Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java 2012-05-04 09:43:18 UTC (rev 3400) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -1,118 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.entity; - -import java.util.List; - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; - -/** - * Ajout de requetes specifiques aux financial transaction sur le DAO. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class FinancialTransactionDAO extends FinancialTransactionDAOImpl<FinancialTransaction> { - - /** - * Return how many transaction are found with specified entryBook. - * - * @param entryBook entry book - * @return transaction referencing entry book - * @throws TopiaException - */ - public long getCountByEntryBook(EntryBook entryBook) throws TopiaException { - String query = "SELECT count(*) FROM " + FinancialTransaction.class.getName() + " t WHERE t.entryBook = :entryBook"; - Number count = (Number)context.find(query, "entryBook", entryBook).get(0); - return count.longValue(); - } - - /** - * Find all unbalanced transactions. - * - * @param period period - * @param entryBook entry book - * @return unbalanced transactions - * @throws TopiaException - */ - public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod period, - EntryBook entryBook) throws TopiaException { - TopiaQuery query = createQuery("E"); - query.addWhere("E.amountCredit != E.amountDebit") - .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); - List<FinancialTransaction> result = findAllByQuery(query); - return result; - } - - /** - * Find all transaction where some field are not filled in. - * - * @param period period - * @param entryBook entry book - * @return unfilled transaction - * @throws TopiaException - */ - public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod period, - EntryBook entryBook) throws TopiaException { - TopiaQuery query = createQuery("T"); - query.addDistinct() - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - .addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") - .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); - List<FinancialTransaction> result = findAllByQuery(query); - return result; - } - - /** - * Find all transaction without entry book. - * - * TODO echatellier 20120425 same method as getAllUnfilledTransaction ? - * doesn't concern a period ? - * - * @return - * @throws TopiaException - */ - public List<FinancialTransaction> getAllTransactionWithoutEntryBook() throws TopiaException { - TopiaQuery query = createQuery("T"); - query.addDistinct() - .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) - .addFrom(FiscalPeriod.class, "F") - .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") - .addNull(FinancialTransaction.PROPERTY_ENTRY_BOOK); - List<FinancialTransaction> result = findAllByQuery(query); - return result; - } - -} //FinancialTransactionDAO Copied: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java (from rev 3397, trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java) =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-05-04 13:17:42 UTC (rev 3401) @@ -0,0 +1,118 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; + +/** + * Ajout de requetes specifiques aux financial transaction sur le DAO. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionDAOImpl<E extends FinancialTransaction> extends FinancialTransactionDAOAbstract<FinancialTransaction> { + + /** + * Return how many transaction are found with specified entryBook. + * + * @param entryBook entry book + * @return transaction referencing entry book + * @throws TopiaException + */ + public long getCountByEntryBook(EntryBook entryBook) throws TopiaException { + String query = "SELECT count(*) FROM " + FinancialTransaction.class.getName() + " t WHERE t.entryBook = :entryBook"; + Number count = (Number)context.find(query, "entryBook", entryBook).get(0); + return count.longValue(); + } + + /** + * Find all unbalanced transactions. + * + * @param period period + * @param entryBook entry book + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod period, + EntryBook entryBook) throws TopiaException { + TopiaQuery query = createQuery("E"); + query.addWhere("E.amountCredit != E.amountDebit") + .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) + .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + + /** + * Find all transaction where some field are not filled in. + * + * @param period period + * @param entryBook entry book + * @return unfilled transaction + * @throws TopiaException + */ + public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod period, + EntryBook entryBook) throws TopiaException { + TopiaQuery query = createQuery("T"); + query.addDistinct() + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") + .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) + .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + + /** + * Find all transaction without entry book. + * + * TODO echatellier 20120425 same method as getAllUnfilledTransaction ? + * doesn't concern a period ? + * + * @return + * @throws TopiaException + */ + public List<FinancialTransaction> getAllTransactionWithoutEntryBook() throws TopiaException { + TopiaQuery query = createQuery("T"); + query.addDistinct() + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") + .addNull(FinancialTransaction.PROPERTY_ENTRY_BOOK); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + +} //FinancialTransactionDAO

1 0

r3400 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/test/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 11:43:18 +0200 (Fri, 04 May 2012) New Revision: 3400 Url: http://chorem.org/repositories/revision/lima/3400 Log: Begin report service refactoring. Move query to DAO. Remove topia query. Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportService.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -180,6 +180,24 @@ return accountsList; } + /* + * @see org.chorem.lima.business.api.AccountService#getAllSubAccounts(org.chorem.lima.entity.Account) + */ + @Override + public List<Account> getAllSubAccounts(Account account) + throws LimaException { + List<Account> accountsList = null; + + try { + AccountDAO accountDAO = LimaDaoHelper.getAccountDAO(); + accountsList = accountDAO.findAllSubAccounts(account); + } catch (Exception ex) { + throw new LimaException("Can't get all sub accounts", ex); + } + + return accountsList; + } + /** * Permet d'effacer un compte dans la base de données. * 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 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -104,68 +104,60 @@ * - for subaccount * - for a foldaccounts, contains many accounts * - for a foldthirdparts accounts + * @throws TopiaException */ @Override public ReportsDatas generateAccountReportsWithTransaction(Account account, Boolean thirdPartAccountsMode, Date beginDate, Date endDate, - TopiaContext topiaContext) throws LimaException { + TopiaContext topiaContext) throws LimaException, TopiaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); + BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); List<Entry> entries = new ArrayList<Entry>(); - if (account != null) { - //Get allsubaccounts and thirdParts accounts - List<Account> accounts = null; // FIXME review code (List<Account>) account.getSubAccounts(); - if (thirdPartAccountsMode) { - List<Account> thirdPartAccount = null; // FIXME review code (List<Account>) account.getSubLedgers(); - if (thirdPartAccount != null) { - ReportsDatas subReportsDatas = generateSubAccountReportsWithTransaction(account, - beginDate, endDate, topiaContext); + //Get allsubaccounts and thirdParts accounts + List<Account> accounts = accountService.getAllSubAccounts(account); - entries.addAll(subReportsDatas.getListEntry()); - debit = debit.add(subReportsDatas.getAmountDebit()); - credit = credit.add(subReportsDatas.getAmountCredit()); - accounts.addAll(thirdPartAccount); - } + // is already subaccount + // TODO echatellier 20120502 c'est vraiment voulu ? + // il ne peut pas y avoir de transaction sur des comptes non feuilles ? + // a verifier, sinon, supprimer la récursion + if (accounts.size() == 0) { + reportsDatas = generateSubAccountReportsWithTransaction(account, + beginDate, endDate, topiaContext); + } + // else is folder accounts contains many subs and thirds accounts + else { + for (Account subAccount : accounts) { + ReportsDatas subReportsDatas = + generateAccountReportsWithTransaction(subAccount, true, + beginDate, endDate, topiaContext); + debit = debit.add(subReportsDatas.getAmountDebit()); + credit = credit.add(subReportsDatas.getAmountCredit()); + entries.addAll(subReportsDatas.getListEntry()); } + //solde = debit - credit + solde = solde.add(debit); + solde = solde.subtract(credit); - // is already subaccount - if (accounts.size() == 0) { - reportsDatas = generateSubAccountReportsWithTransaction(account, - beginDate, endDate, topiaContext); + if (solde.compareTo(BigDecimal.ZERO) == 1) { + reportsDatas.setSoldeDebit(true); } - // else is folder accounts contains many subs and thirds accounts - else { - for (Account subAccount : accounts) { - ReportsDatas subReportsDatas = - generateAccountReportsWithTransaction(subAccount, true, - beginDate, endDate, topiaContext); - debit = debit.add(subReportsDatas.getAmountDebit()); - credit = credit.add(subReportsDatas.getAmountCredit()); - entries.addAll(subReportsDatas.getListEntry()); - } - //solde = debit - credit - solde = solde.add(debit); - solde = solde.subtract(credit); - - if (solde.compareTo(BigDecimal.ZERO) == 1) { - reportsDatas.setSoldeDebit(true); - } - solde = solde.abs(); - reportsDatas.setAmountCredit(credit); - reportsDatas.setAmountDebit(debit); - reportsDatas.setAmountSolde(solde); - reportsDatas.setListEntry(entries); - } + solde = solde.abs(); + reportsDatas.setAmountCredit(credit); + reportsDatas.setAmountDebit(debit); + reportsDatas.setAmountSolde(solde); + reportsDatas.setListEntry(entries); } + return reportsDatas; } - /** + /* * Query for find entries for accountsreports and balancereports * Just exact and balanced transaction are calculated. * @@ -176,12 +168,12 @@ * @param queryAlias * @return * @throws LimaException - */ + * protected TopiaQuery createEntryQuery(Account account, Date beginDate, Date endDate, EntryDAO entryDAO, - String queryAlias) throws LimaException { + String queryAlias) { TopiaQuery query = entryDAO.createQuery(queryAlias); String transactionDateProperty = TopiaQuery.getProperty( @@ -190,8 +182,7 @@ Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_ENTRY_BOOK); // echatellier, oui c'est hardcodé, mais qu'est ce que c'est illisible sans ca - query - .addWhere("(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + + query .addWhere("(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)") .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") .addNotNull(entryBookProperty) @@ -200,7 +191,7 @@ .addEquals(Entry.PROPERTY_ACCOUNT, account); return query; - } + }*/ /** * Get list entries @@ -212,68 +203,52 @@ * @param topiaContext * @return * @throws LimaException + * @throws TopiaException */ protected ReportsDatas generateSubAccountReportsWithTransaction(Account account, Date beginDate, Date endDate, - TopiaContext topiaContext) throws LimaException { + TopiaContext topiaContext) throws TopiaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); - List<Object[]> results; - String queryAlias = "E"; - if (beginDate != null && endDate != null) { - try { - EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); - TopiaQuery entriesQuery = - createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - //IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION - String loadEntryBookProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_ENTRY_BOOK); - entriesQuery.addLoad(loadEntryBookProperty); - reportsDatas.setListEntry(entryDAO.findAllByQuery(entriesQuery)); + EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); - TopiaQuery amountsQuery = - createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - amountsQuery.setSelect("E." + Entry.PROPERTY_DEBIT, "SUM(E." + Entry.PROPERTY_AMOUNT + ")"); - amountsQuery.addGroup("E." + Entry.PROPERTY_DEBIT); - results = amountsQuery.execute(topiaContext); - int nbAmount = results.size(); - if (nbAmount == 2) { - debit = (BigDecimal) results.get(0)[1]; - credit = (BigDecimal) results.get(1)[1]; - } - if (nbAmount == 1) { - if ((Boolean) results.get(0)[0]) { - debit = (BigDecimal) results.get(0)[1]; - } else { - credit = (BigDecimal) results.get(0)[1]; - } - } + // trouve les entrees associées à ca compte entre les date données + List<Entry> listEntries = entryDAO.findAllEntryOfEquilibredTransaction(account, beginDate, endDate); + reportsDatas.setListEntry(listEntries); - // set the amounts and solde - //solde = debit - credit - solde = solde.add(debit); - solde = solde.subtract(credit); + // recupere les totaux pour le compte + List<Object[]> results = entryDAO.getDebitCreditOfEquilibredTransaction(account, beginDate, endDate); + int nbAmount = results.size(); + if (nbAmount == 2) { + debit = (BigDecimal) results.get(0)[1]; + credit = (BigDecimal) results.get(1)[1]; + } + if (nbAmount == 1) { + if ((Boolean) results.get(0)[0]) { + debit = (BigDecimal) results.get(0)[1]; + } else { + credit = (BigDecimal) results.get(0)[1]; + } + } - if (solde.compareTo(BigDecimal.ZERO) == 1) { - reportsDatas.setSoldeDebit(true); - } - solde = solde.abs(); + // set the amounts and solde + // solde = debit - credit + solde = solde.add(debit); + solde = solde.subtract(credit); - reportsDatas.setAmountCredit(credit); - reportsDatas.setAmountDebit(debit); - reportsDatas.setAmountSolde(solde); - - //commitTransaction(topiaContext); - } catch (TopiaException ex) { - doCatch(topiaContext, ex); - } + if (solde.compareTo(BigDecimal.ZERO) == 1) { + reportsDatas.setSoldeDebit(true); } + solde = solde.abs(); + reportsDatas.setAmountCredit(credit); + reportsDatas.setAmountDebit(debit); + reportsDatas.setAmountSolde(solde); + return reportsDatas; } @@ -281,75 +256,68 @@ * Calculate all credit, debit and solde amounts for the balance * * Get all entries if true + * @throws TopiaException */ public ReportsDatas generateSubAccountBalanceWithTransaction(Account account, Date beginDate, Date endDate, Boolean getEntries, - TopiaContext topiaContext) throws LimaException { + TopiaContext topiaContext) throws LimaException, TopiaException { ReportsDatas reportsDatas = new ReportsDatasImpl(); BigDecimal credit = new BigDecimal(0); BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); + //String queryAlias = "E"; + EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); - List<Object[]> results; - String queryAlias = "E"; - if (beginDate != null && endDate != null) { - try { - EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); + if (getEntries) { + //TopiaQuery entriesQuery = + // createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); + //IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION + //entriesQuery.addLoad(Entry.PROPERTY_FINANCIAL_TRANSACTION); + //String loadEntryBookProperty = + // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, + // FinancialTransaction.PROPERTY_ENTRY_BOOK); + //entriesQuery.addLoad(loadEntryBookProperty); + List<Entry> listEntries = entryDAO.findAllEntryOfEquilibredTransaction(account, beginDate, endDate); + reportsDatas.setListEntry(listEntries); + } - if (getEntries) { - TopiaQuery entriesQuery = - createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - //IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION - entriesQuery.addLoad(Entry.PROPERTY_FINANCIAL_TRANSACTION); - String loadEntryBookProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_ENTRY_BOOK); - entriesQuery.addLoad(loadEntryBookProperty); - reportsDatas.setListEntry(entryDAO.findAllByQuery(entriesQuery)); - } + //TopiaQuery amountsQuery = + // createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); + //amountsQuery.setSelect("E." + Entry.PROPERTY_DEBIT, "SUM(E." + Entry.PROPERTY_AMOUNT + ")"); + //amountsQuery.addGroup("E." + Entry.PROPERTY_DEBIT); + //results = amountsQuery.execute(topiaContext); + List<Object[]> results = entryDAO.getDebitCreditOfEquilibredTransaction(account, beginDate, endDate); + int nbAmount = results.size(); + if (nbAmount == 2) { + debit = (BigDecimal) results.get(0)[1]; + credit = (BigDecimal) results.get(1)[1]; + } + if (nbAmount == 1) { + if ((Boolean) results.get(0)[0]) { + debit = (BigDecimal) results.get(0)[1]; + } else { + credit = (BigDecimal) results.get(0)[1]; + } + } - TopiaQuery amountsQuery = - createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias); - amountsQuery.setSelect("E." + Entry.PROPERTY_DEBIT, "SUM(E." + Entry.PROPERTY_AMOUNT + ")"); - amountsQuery.addGroup("E." + Entry.PROPERTY_DEBIT); - results = amountsQuery.execute(topiaContext); - int nbAmount = results.size(); - if (nbAmount == 2) { - debit = (BigDecimal) results.get(0)[1]; - credit = (BigDecimal) results.get(1)[1]; - } - if (nbAmount == 1) { - if ((Boolean) results.get(0)[0]) { - debit = (BigDecimal) results.get(0)[1]; - } else { - credit = (BigDecimal) results.get(0)[1]; - } - } + // set the amounts and solde + //solde = debit - credit + solde = solde.add(debit); + solde = solde.subtract(credit); - // set the amounts and solde - //solde = debit - credit - solde = solde.add(debit); - solde = solde.subtract(credit); + if (solde.compareTo(BigDecimal.ZERO) == 1) { + reportsDatas.setSoldeDebit(true); - if (solde.compareTo(BigDecimal.ZERO) == 1) { - reportsDatas.setSoldeDebit(true); - - } - solde = solde.abs(); - - reportsDatas.setAmountCredit(credit); - reportsDatas.setAmountDebit(debit); - reportsDatas.setAmountSolde(solde); - - //commitTransaction(topiaContext); - } catch (TopiaException ex) { - doCatch(topiaContext, ex); - } } + solde = solde.abs(); + reportsDatas.setAmountCredit(credit); + reportsDatas.setAmountDebit(debit); + reportsDatas.setAmountSolde(solde); + return reportsDatas; } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -176,6 +176,22 @@ } /** + * Test get all subaccounts. + * + * @throws LimaException + */ + @Test + public void getAllSubAccountsTest() throws LimaException { + Account parent = accountService.getAccountByNumber("50"); + List<Account> listAccount = accountService.getAllSubAccounts(parent); + Assert.assertEquals(2, listAccount.size()); + + parent = accountService.getAccountByNumber("501"); + listAccount = accountService.getAllSubAccounts(parent); + Assert.assertEquals(0, listAccount.size()); + } + + /** * Permet de tester si un compte est bien effacé. * * @throws LimaException Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -75,6 +75,15 @@ List<Account> getAllLeafAccounts() throws LimaException; /** + * Return all {@code account}-s subaccounts. + * + * @param account account to get sub accounts + * @return sub accounts + * @throws LimaException + */ + List<Account> getAllSubAccounts(Account account) throws LimaException; + + /** * Create new account. If {@code masterAccount} is not null, {@code account} * is added in {@code masterAccount}'s subAccounts. * Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportService.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportService.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -103,27 +103,7 @@ Date beginDate, Date endDate) throws LimaException; - /** - * Calculate all credit, debit and solde amounts for the balance. - * - * Get all entries if true - * - * @param account - * @param beginDate - * @param endDate - * @param getEntries - * @param topiaContext - * @return - * @throws LimaException - */ - ReportsDatas generateSubAccountBalanceWithTransaction(Account account, - Date beginDate, - Date endDate, - Boolean getEntries, - TopiaContext topiaContext) throws LimaException; - - /** * Generation du rapports des journaux. * * @param entryBook Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportServiceLocal.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportServiceLocal.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ReportServiceLocal.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -29,6 +29,7 @@ import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import java.util.Date; @@ -55,6 +56,24 @@ Boolean thirdPartAccountsMode, Date beginDate, Date endDate, - TopiaContext topiaContext) throws LimaException; + TopiaContext topiaContext) throws LimaException, TopiaException; + /** + * Calculate all credit, debit and solde amounts for the balance. + * + * Get all entries if true + * + * @param account + * @param beginDate + * @param endDate + * @param getEntries + * @param topiaContext + * @return + * @throws LimaException + */ + ReportsDatas generateSubAccountBalanceWithTransaction(Account account, + Date beginDate, + Date endDate, + Boolean getEntries, + TopiaContext topiaContext) throws LimaException, TopiaException; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -33,16 +33,15 @@ import java.util.StringTokenizer; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -public class AccountDAO extends AccountDAOAbstract<Account> { +public class AccountDAO extends AccountDAOImpl<Account> { - private static final Log log = LogFactory.getLog(AccountDAO.class); - /** * Retourne tous les comptes qui n'ont pas eux meme de sous compte. + * + * @return leaf accounts + * @throws TopiaException */ public List<Account> findAllLeafAccounts() throws TopiaException { // FIXME echatellier 20120413 la requete ne fonctionne pas @@ -94,6 +93,21 @@ } /** + * Retourne tous les comptes dont le numero commence par celui specifié. + * + * @param account parent account + * @return + * @throws TopiaException + */ + public List<Account> findAllSubAccounts(Account account) throws TopiaException { + + String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; + List<Account> accounts = context.find(query, "accountNumber", account.getAccountNumber()); + + return accounts; + } + + /** * @deprecated since 0.6, business method, need to be moved out of dao */ @Deprecated Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAO.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,16 +28,10 @@ import java.util.Date; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; public class ClosedPeriodicEntryBookDAO extends ClosedPeriodicEntryBookDAOImpl<ClosedPeriodicEntryBook> { - private static final Log log = LogFactory.getLog(ClosedPeriodicEntryBookDAO.class); - /** * Find all ClosedPeriodicEntryBook with common EntryBook. * @@ -49,33 +43,64 @@ return findAllByProperties(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); } - /** Return ClosedPeriodicEntryBook by EntryBook and FinancialPeriod */ + /** + * Return ClosedPeriodicEntryBook by EntryBook and FinancialPeriod. + * + * @param entryBook + * @param financialPeriod + * @return ClosedPeriodicEntryBook + * @throws TopiaException + */ public ClosedPeriodicEntryBook findByEntryBookAndFinancialPeriod( EntryBook entryBook, FinancialPeriod financialPeriod) throws TopiaException { - TopiaQuery query = createQuery(); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; + String query = "FROM " + ClosedPeriodicEntryBook.class.getName(); if (entryBook != null) { - query.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); + query += " WHERE entryBook = :entryBook"; + if (financialPeriod != null) { + query += " AND financialPeriod = :financialPeriod"; + //context.find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook, "financialPeriod", financialPeriod); + } else { + //context.find(query, 0, 0, "entryBook", entryBook); + closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook); + } + } else { + if (financialPeriod != null) { + query += " WHERE financialPeriod = :financialPeriod"; + } + + //context.find(query, 0, 0, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.find(query, "financialPeriod", financialPeriod); } - if (financialPeriod != null) { - query.addEquals(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, financialPeriod); + + // get only first one + ClosedPeriodicEntryBook result = null; + if (!closedPeriodicEntryBooks.isEmpty()) { + result = closedPeriodicEntryBooks.get(0); } - return findByQuery(query); + return result; } + /** + * Retourne toutes les ClosedPeriodicEntryBook par interval de date + * sur les periodes sur lequelles elles portent ordonnée par journal. + * + * @param beginDate begin date + * @param endDate end date + * @return all ClosedPeriodicEntryBook between begin and end + * @throws TopiaException + */ public List<ClosedPeriodicEntryBook> findAllByDates(Date beginDate, Date endDate) throws TopiaException { - TopiaQuery query = createQuery(); - if (beginDate != null && endDate != null) { - String beginDateProperty = TopiaQuery.getProperty(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, FinancialPeriod.PROPERTY_BEGIN_DATE); - String endDateProperty = TopiaQuery.getProperty(ClosedPeriodicEntryBook.PROPERTY_FINANCIAL_PERIOD, FinancialPeriod.PROPERTY_BEGIN_DATE); - String entrybookProperty = TopiaQuery.getProperty(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, EntryBook.PROPERTY_CODE); - query.addWhere(beginDateProperty, Op.GE, beginDate) - .addWhere(endDateProperty, Op.LE, endDate) - .addOrder(beginDateProperty, entrybookProperty); - } - return (List<ClosedPeriodicEntryBook>) findAllByQuery(query); + + String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + + " WHERE :begindate <= financialPeriod.beginDate " + + " AND financialPeriod.beginDate <= :endDate" + + " ORDER BY entryBook.code"; + return context.find(query, 0d, 0d, "beginDate", beginDate, "endDate", endDate); } } Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -0,0 +1,97 @@ +/* + * #%L + * Lima callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.entity; + +import java.util.Date; +import java.util.List; + +import org.nuiton.topia.TopiaException; + +public class EntryDAO extends EntryDAOImpl<Entry> { + + /** + * Requete generique qui recupere les entrees equilibrées portant sur un + * compte entre deux dates. + * + * @param account account + * @param beginDate begin date + * @param endDate end date + */ + protected String getEquilibredTransactionQuery(Account account, + Date beginDate, Date endDate) { + String query = "FROM " + Entry.class.getName() + " E" + + // equlibrée (somme des débit = somme des crédit) + " WHERE (select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + + "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)" + + // entre les 2 dates + " AND :beginDate <= E.financialTransaction.transactionDate" + + " AND E.financialTransaction.transactionDate <= :endDate" + + // concerne le compte + " AND E.account = :account"; + return query; + } + + /** + * Query for find entries for accountsreports and balancereports + * Just exact and balanced transaction are calculated. + * + * @param account account + * @param beginDate begin date + * @param endDate end date + * @return entries + * @throws TopiaException + */ + public List<Entry> findAllEntryOfEquilibredTransaction(Account account, + Date beginDate, Date endDate) throws TopiaException { + + String query = getEquilibredTransactionQuery(account, beginDate, endDate); + + List<Entry> entries = context.find(query, "beginDate", beginDate, + "endDate", endDate, "account", account); + return entries; + } + + /** + * Retourne la somme des entrées des transaction equilibrées entre + * deux dates pour un compte donné. + * + * @param account le compte + * @param beginDate bebin date + * @param endDate end date + * @return list boolean,int (une ligne pour le debit true, une ligne pour le credit) + * @throws TopiaException + */ + public List<Object[]> getDebitCreditOfEquilibredTransaction(Account account, + Date beginDate, Date endDate) throws TopiaException { + String query = "SELECT E.debit, sum(E.amount) " + + getEquilibredTransactionQuery(account, beginDate, endDate) + + " GROUP BY E.debit"; + + List<Object[]> result = context.find(query, "beginDate", beginDate, + "endDate", endDate, "account", account); + return result; + } +} Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAO.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAO.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,26 +25,34 @@ package org.chorem.lima.entity; +import java.util.Date; +import java.util.List; + import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; -import java.util.Date; - public class FinancialPeriodDAO extends FinancialPeriodDAOImpl<FinancialPeriod> { /** - * Return FinancialPeriod by Date - * Date is include between financialperiod begin and end date + * Return FinancialPeriod by Date. + * Date is include between financialperiod begin and end date. + * + * @param date period middle date + * @return FinancialPeriod for {@code date} + * @throws TopiaException */ public FinancialPeriod findByDate(Date date) throws TopiaException { - TopiaQuery query = createQuery(); - if (date != null) { - query.addWhere(FinancialPeriod.PROPERTY_BEGIN_DATE + " <= :value") - .addWhere(FinancialPeriod.PROPERTY_END_DATE + " >= :value") - .addParam("value", date); + String query = "FROM " + FinancialPeriod.class.getName() + + " WHERE beginDate <= :date" + + " AND :date <= endDate"; + + // add unique result here + List<FinancialPeriod> financialPeriod = context.find(query, "date", date); + FinancialPeriod result = null; + if (!financialPeriod.isEmpty()) { + result = financialPeriod.get(0); } - return findByQuery(query); + return result; } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementImpl.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java 2012-05-04 09:42:31 UTC (rev 3399) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java 2012-05-04 09:43:18 UTC (rev 3400) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as

1 0

r3399 - trunk
by echatellier＠users.chorem.org 04 May '12

04 May '12

Author: echatellier Date: 2012-05-04 11:42:31 +0200 (Fri, 04 May 2012) New Revision: 3399 Url: http://chorem.org/repositories/revision/lima/3399 Log: Remove openejb default sjf4j impl Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 12:33:54 UTC (rev 3398) +++ trunk/pom.xml 2012-05-04 09:42:31 UTC (rev 3399) @@ -118,6 +118,12 @@ <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> <version>${openEjbVersion}</version> + <exclusions> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> <scope>compile</scope> </dependency>

1 0