Author: jpepin Date: 2010-07-19 15:53:24 +0200 (Mon, 19 Jul 2010) New Revision: 2975 Url: http://chorem.org/repositories/revision/lima/2975 Log: Suite passage ?\195?\160 topia 2.4.1. : Remplacement de m?\195?\169thodes supprim?\195?\169es des DAOs par des Topia query. 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/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/pom.xml trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 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 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2010-07-19 13:53:24 UTC (rev 2975) @@ -327,9 +327,13 @@ //7. check if date are on fiscal period FiscalPeriodDAO fiscalPeriodDAO = LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaContext); - FiscalPeriod fiscalPeriod = - fiscalPeriodDAO.findContainsFinancialPeriod( - financialTransaction.getFinancialPeriod()); + + //search fiscalperiod have financialperiod in params + TopiaQuery query = fiscalPeriodDAO.createQuery() + .addInElements(":financialPeriod", "financialPeriod") + .addParam("financialPeriod", financialPeriod); + FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByQuery(query); + Date beginDateFiscalPeriod = fiscalPeriod.getBeginDate(); Date endDateFiscalPeriod = fiscalPeriod.getEndDate(); Date financialTransactionDate = 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 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2010-07-19 13:53:24 UTC (rev 2975) @@ -136,7 +136,8 @@ //check the new fiscal period adjoining the last Date dateLastFiscalPeriod = lastFiscalPeriod.getEndDate(); dateLastFiscalPeriod = DateUtils. - addMilliseconds(dateLastFiscalPeriod, 1); + addDays(dateLastFiscalPeriod, 1); + dateLastFiscalPeriod = DateUtils.truncate(dateLastFiscalPeriod, Calendar.DATE); Date dateFiscalPeriod=fiscalPeriod.getBeginDate(); if(dateLastFiscalPeriod.compareTo(dateFiscalPeriod)!=0){ throw new LimaBusinessException( @@ -226,7 +227,7 @@ super.blockClosedPeriodicEntryBookRules( closedPeriodicEntryBook, topiaTransaction); - closedPeriodicEntryBook.getFinancialPeriod(); + FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod(); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = new ArrayList<ClosedPeriodicEntryBook>(); @@ -239,9 +240,13 @@ FiscalPeriodDAO fiscalPeriodDAO = LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaTransaction); - FiscalPeriod fiscalPeriod = - fiscalPeriodDAO.findContainsFinancialPeriod( - closedPeriodicEntryBook.getFinancialPeriod()); + + //search fiscalperiod have financialperiod in params + TopiaQuery query1 = fiscalPeriodDAO.createQuery() + .addInElements(":financialPeriod", "financialPeriod") + .addParam("financialPeriod", financialPeriod); + FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByQuery(query1); + Date beginDate = fiscalPeriod.getBeginDate(); EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); 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 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-07-19 13:53:24 UTC (rev 2975) @@ -25,9 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.StringTokenizer; - import javax.ejb.Stateless; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -376,7 +374,14 @@ Account subAccount = accountDAO.findByTopiaId(account.getTopiaId()); //check rules account if ledger or account if (account.getGeneralLedger() == null){ - Account master = accountDAO.findContainsSubAccounts(subAccount); + + //get masteraccount, search account have account in params in all subaccounts collection + TopiaQuery query = accountDAO.createQuery() + .addInElements(":account", "subAccounts") + .addParam("account", account); + Account master = accountDAO.findByQuery(query); + + log.debug(master); accountingRules.updateAccountRules(master, account); subAccount.setMasterAccount(account.getMasterAccount()); subAccount.setSubAccounts(account.getSubAccounts()); @@ -426,8 +431,6 @@ if (s.contains("..")){ //Split .. String stringDoubleDot[] = s.split("\\.\\."); - log.debug(stringDoubleDot[0]); - log.debug(stringDoubleDot[1]); int lowAccount=Integer.parseInt(stringDoubleDot[0]); int highAccount=Integer.parseInt(stringDoubleDot[1]); for (int i=lowAccount; i <= highAccount; i++) { Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-swing/pom.xml 2010-07-19 13:53:24 UTC (rev 2975) @@ -48,6 +48,11 @@ <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + </dependency> <dependency> <groupId>org.swinglabs</groupId> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-07-19 13:53:24 UTC (rev 2975) @@ -57,6 +57,7 @@ lima.config.locale.description= lima.config.ui.flaunchui.description= lima.config.ui.fullscreen.description= +lima.createPDF= lima.credit=Credit lima.daily=Daily lima.date=Date Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-07-19 10:19:51 UTC (rev 2974) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-07-19 13:53:24 UTC (rev 2975) @@ -57,6 +57,7 @@ lima.config.locale.description=Locale utilis\u00E9e par l'application lima.config.ui.flaunchui.description= lima.config.ui.fullscreen.description= +lima.createPDF= lima.credit=Credit lima.daily=Quotidien lima.date=Date