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

r3608 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 14 Aug '12

14 Aug '12

Author: mallon Date: 2012-08-14 16:28:26 +0200 (Tue, 14 Aug 2012) New Revision: 3608 Url: http://chorem.org/repositories/revision/lima/3608 Log: refs #768 Correction sur les libelles et les clefs d'internationalisation lors de l ajout d un journal. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 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/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 13:54:14 UTC (rev 3607) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 14:28:26 UTC (rev 3608) @@ -302,6 +302,12 @@ } } + //if entrybook isn't found + //then create it + if (!found) { + entryBook = entryBookService.createEntryBook(entryBook); + } + //Sets accounts, check if they exist, if not create them //-> 8 COMPTES SPECIAUX // -> 89 BILAN Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2012-08-14 13:54:14 UTC (rev 3607) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2012-08-14 14:28:26 UTC (rev 3608) @@ -104,7 +104,7 @@ <cell anchor="west"> <JRadioButton id="newEntryBook" - text="lima.home.entrybooks.create" + text="lima.ui.fiscalperiod.entrybooks.create" selected="false" buttonGroup="EntryBookGroup" onActionPerformed="performNew()"/> 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 2012-08-14 13:54:14 UTC (rev 3607) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-14 14:28:26 UTC (rev 3608) @@ -276,6 +276,7 @@ lima.ui.fiscalperiod.closure= lima.ui.fiscalperiod.delete.confirmation= lima.ui.fiscalperiod.delete.title= +lima.ui.fiscalperiod.entrybooks.create= lima.ui.fiscalperiod.fiscalperiod= lima.ui.fiscalperiod.open= lima.ui.home.account= 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 2012-08-14 13:54:14 UTC (rev 3607) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-14 14:28:26 UTC (rev 3608) @@ -134,7 +134,6 @@ lima.financialstatement.subamount=Calculer un sous-total lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste lima.fiscalperiod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées -lima.home.entrybooks.create= lima.identity=Identité lima.identity.address=Adresse lima.identity.address2=Adresse (suite) @@ -276,6 +275,7 @@ lima.ui.fiscalperiod.closure=Cloture lima.ui.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! lima.ui.fiscalperiod.delete.title=Suppression de l'exercice +lima.ui.fiscalperiod.entrybooks.create=Création d'un nouveau journal lima.ui.fiscalperiod.fiscalperiod=Exercice lima.ui.fiscalperiod.open=Ouvert lima.ui.home.account=Plan comptable

1 0

r3607 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 14 Aug '12

14 Aug '12

Author: mallon Date: 2012-08-14 15:54:14 +0200 (Tue, 14 Aug 2012) New Revision: 3607 Url: http://chorem.org/repositories/revision/lima/3607 Log: refs #768 Correction sur la methode permettant le report a nouveau et la cloture de la periode fiscal selectionnee - Reste a voir de maniere plus precise les regles concernant le report a nouveau Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 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-08-14 13:05:05 UTC (rev 3606) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 13:54:14 UTC (rev 3607) @@ -302,19 +302,6 @@ } } - //if entrybook isn't found - //then create it - if (!found) { - entryBookService.createEntryBook(entryBook); - entryBooksList = entryBookService.getAllEntryBooks(); - for (EntryBook entry : entryBooksList) { - if (!found && entry.getCode().equals(entryBook.getCode())) { - entryBook = entry; - found = true; - } - } - } - //Sets accounts, check if they exist, if not create them //-> 8 COMPTES SPECIAUX // -> 89 BILAN Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 13:05:05 UTC (rev 3606) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 13:54:14 UTC (rev 3607) @@ -229,7 +229,6 @@ _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - //ask user for the entrybook to use for retained earnings if (answerRetainedEarnings == JOptionPane.YES_OPTION) { retainedEarnings = true;

1 0

r3606 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/java/org/chorem/lima/ui/lettering lima-swing/src/main/resources
by mallon＠users.chorem.org 14 Aug '12

14 Aug '12

Author: mallon Date: 2012-08-14 15:05:05 +0200 (Tue, 14 Aug 2012) New Revision: 3606 Url: http://chorem.org/repositories/revision/lima/3606 Log: refs #768 Correction sur la methode permettant le report a nouveau et la cloture de la periode fiscal selectionnee Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.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/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java trunk/lima-swing/src/main/resources/log4j.properties 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-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -187,7 +187,7 @@ fiscalPeriodDAO.getLastUnlockedFiscalPeriod(); //Check if the fiscal period to block is the oldest - if (!oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { + if (oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.antefiscalperiodnotblocked")); } } catch (TopiaException ex) { 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-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -220,7 +220,7 @@ AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); - FiscalPeriod result = null; + FiscalPeriod result; try { if (fiscalPeriod.getLocked()) { @@ -252,97 +252,113 @@ } @Override - public void addRetainedEarnings(FiscalPeriod fiscalPeriod, boolean newyear, - EntryBook entryBook) throws LimaException { - - // re-attach entities to current session - FiscalPeriod localFiscalPeriod = null; - try { - FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); - localFiscalPeriod = fiscalPeriodDAO.findByTopiaId(fiscalPeriod.getTopiaId()); - } catch (TopiaException ex) { - throw new LimaException("Can't find fiscal period", ex); + public boolean isRetainedEarnings(FiscalPeriod fiscalPeriod) throws LimaException{ + boolean found = false; + List<FinancialTransaction> financialTransactionsList = + financialTransactionService.getAllFinancialTransactions( + fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); + //check if they are at least one transaction to be report + if (!financialTransactionsList.isEmpty()) { + int i = 0; + while (i < financialTransactionsList.size() && !found) { + Collection<Entry> entryList = financialTransactionsList.get(i).getEntry(); + for (Entry entry : entryList) { + if (entry.getAccount() != null) { + if (Integer.valueOf(entry.getAccount().getAccountNumber().substring(0, 1)) < 6 + && !entry.getAmount().equals(BigDecimal.ZERO)) { + found = true; + } + } + } + i++; + } } + return found; + } - //sets dates - // - endRetainedEarnings: last day of the closing year - // - beginRetainedEarnings: first open day of the following year - // Date endRetainedEarnings = fiscalPeriod.getBeginDate(); - // Date beginRetainedEarnings = null; + @Override + public FiscalPeriod retainedEarningsAndBlockFiscalPeriod(FiscalPeriod fiscalPeriod, EntryBook entryBook, + boolean retainedEarnings) throws LimaException { - //Sets entryBook - //search for the entryBook to use using param - boolean found = false; - List<EntryBook> entryBooksList = entryBookService.getAllEntryBooks(); - for (EntryBook entry : entryBooksList) { - if (!found && entry.getCode().equals(entryBook.getCode())) { - entryBook = entry; - found = true; + if (entryBook != null && retainedEarnings) { + + // re-attach entities to current session + FiscalPeriod localFiscalPeriod; + try { + FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); + localFiscalPeriod = fiscalPeriodDAO.findByTopiaId(fiscalPeriod.getTopiaId()); + } catch (TopiaException ex) { + throw new LimaException("Can't find fiscal period", ex); } - } - //if entrybook isn't found - //then create it - if (!found) { - entryBookService.createEntryBook(entryBook); - entryBooksList = entryBookService.getAllEntryBooks(); + //Sets entryBook + //search for the entryBook to use using param + boolean found = false; + List<EntryBook> entryBooksList = entryBookService.getAllEntryBooks(); for (EntryBook entry : entryBooksList) { if (!found && entry.getCode().equals(entryBook.getCode())) { entryBook = entry; found = true; } } - } - //Sets accounts, check if they exist, if not create them - //-> 8 COMPTES SPECIAUX - // -> 89 BILAN - // -> 890 Bilan d'ouverture - // -> 891 Bilan de cloture + //if entrybook isn't found + //then create it + if (!found) { + entryBookService.createEntryBook(entryBook); + entryBooksList = entryBookService.getAllEntryBooks(); + for (EntryBook entry : entryBooksList) { + if (!found && entry.getCode().equals(entryBook.getCode())) { + entryBook = entry; + found = true; + } + } + } - //89 BILAN - Account accountMaster = accountService.getAccountByNumber("89"); - if (accountMaster == null) { - accountMaster = new AccountImpl(); - accountMaster.setAccountNumber("89"); - accountMaster.setLabel("BILAN"); - accountMaster = accountService.createAccount(accountMaster); - } + //Sets accounts, check if they exist, if not create them + //-> 8 COMPTES SPECIAUX + // -> 89 BILAN + // -> 890 Bilan d'ouverture + // -> 891 Bilan de cloture - //890 Bilan d'ouverture - Account beginRetainedAccount = accountService.getAccountByNumber("890"); - if (beginRetainedAccount == null) { - beginRetainedAccount = new AccountImpl(); - beginRetainedAccount.setAccountNumber("890"); - beginRetainedAccount.setLabel("Bilan d'ouverture"); - beginRetainedAccount = accountService.createAccount(beginRetainedAccount); - } + //89 BILAN + Account accountMaster = accountService.getAccountByNumber("89"); + if (accountMaster == null) { + accountMaster = new AccountImpl(); + accountMaster.setAccountNumber("89"); + accountMaster.setLabel("BILAN"); + accountService.createAccount(accountMaster); + } - //891 Bilan de cloture - Account endRetainedAccount = accountService.getAccountByNumber("891"); - if (endRetainedAccount == null) { - endRetainedAccount = new AccountImpl(); - endRetainedAccount.setAccountNumber("891"); - endRetainedAccount.setLabel("Bilan de clôture"); - endRetainedAccount = accountService.createAccount(endRetainedAccount); - } + //890 Bilan d'ouverture + Account beginRetainedAccount = accountService.getAccountByNumber("890"); + if (beginRetainedAccount == null) { + beginRetainedAccount = new AccountImpl(); + beginRetainedAccount.setAccountNumber("890"); + beginRetainedAccount.setLabel("Bilan d'ouverture"); + accountService.createAccount(beginRetainedAccount); + } - //look for the last financial period from the previous fiscal year - //check if the last financial period isn't blocked - Collection<FinancialPeriod> fperiod = localFiscalPeriod.getFinancialPeriod(); - Iterator<FinancialPeriod> itr = fperiod.iterator(); - FinancialPeriod lastFPeriod = null; - while (itr.hasNext()) { - lastFPeriod = itr.next(); - } + //891 Bilan de cloture + Account endRetainedAccount = accountService.getAccountByNumber("891"); + if (endRetainedAccount == null) { + endRetainedAccount = new AccountImpl(); + endRetainedAccount.setAccountNumber("891"); + endRetainedAccount.setLabel("Bilan de clôture"); + endRetainedAccount = accountService.createAccount(endRetainedAccount); + } - if (lastFPeriod.getLocked()) { - throw new LimaBusinessException(_("lima-business.fiscalperiod.previousfiscalperiodalreadyblocked")); - } + //look for the last financial period from the previous fiscal year + //check if the last financial period isn't blocked + Collection<FinancialPeriod> fperiod = localFiscalPeriod.getFinancialPeriod(); + Iterator<FinancialPeriod> itr = fperiod.iterator(); + FinancialPeriod lastFPeriod = null; + while (itr.hasNext()) { + lastFPeriod = itr.next(); + } - FinancialPeriod beginfinancialPeriod = null; - //settings to be done only if a new year exists - if (newyear) { + FinancialPeriod beginfinancialPeriod = null; + //look for the first financial period on the new fiscal year which is unlocked found = false; List<ClosedPeriodicEntryBook> resultsArray = @@ -352,6 +368,7 @@ Collections.sort(closedPeriodicEntryBook, new FinancialPeriodComparator()); resultsArray.addAll(closedPeriodicEntryBook); for (ClosedPeriodicEntryBook cPeriodicEntryBook : resultsArray) { + //check for - unlocked financial period // - date after the closing fiscal year // - unlocked entrybook @@ -368,83 +385,89 @@ if (!found) { throw new LimaBusinessException(_("lima-business.fiscalperiod.newfinancialperioderror")); } - } - //holds entries of all closing transactions - FinancialTransaction endfinancialTransaction = new FinancialTransactionImpl(); - if (lastFPeriod != null) { - //Sets the endfinancialTransaction - endfinancialTransaction.setEntryBook(entryBook); - endfinancialTransaction.setTransactionDate(localFiscalPeriod.getEndDate()); - endfinancialTransaction = financialTransactionService.createFinancialTransaction(endfinancialTransaction); - } + //holds entries of all closing transactions + FinancialTransaction endfinancialTransaction = new FinancialTransactionImpl(); + if (lastFPeriod != null) { + //Sets the endfinancialTransaction + endfinancialTransaction.setEntryBook(entryBook); + endfinancialTransaction.setTransactionDate(localFiscalPeriod.getEndDate()); + endfinancialTransaction = financialTransactionService.createFinancialTransaction(endfinancialTransaction); + } - //holds entries of all opening transactions - FinancialTransaction beginfinancialTransaction = new FinancialTransactionImpl(); - if (newyear) { + //holds entries of all opening transactions + FinancialTransaction beginfinancialTransaction = new FinancialTransactionImpl(); if (found) { //Sets the endfinancialTransaction beginfinancialTransaction.setEntryBook(entryBook); beginfinancialTransaction.setTransactionDate(beginfinancialPeriod.getBeginDate()); beginfinancialTransaction = financialTransactionService.createFinancialTransaction(beginfinancialTransaction); } - } - //Sets date for description, e.g: Report à nouveau (DATE) - Calendar calendar = Calendar.getInstance(); - calendar.setTime(fiscalPeriod.getEndDate()); + //Sets date for description, e.g: Report à nouveau (DATE) + Calendar calendar = Calendar.getInstance(); + calendar.setTime(fiscalPeriod.getEndDate()); - //Sets entries - BalanceTrial results = reportService.generateBalanceTrial(localFiscalPeriod.getBeginDate(), - localFiscalPeriod.getEndDate(), null, false, false); + //Sets entries + BalanceTrial results = reportService.generateBalanceTrial(localFiscalPeriod.getBeginDate(), + localFiscalPeriod.getEndDate(), null, false, false); - List<ReportsDatas> reportsDatasList = (List<ReportsDatas>) results.getReportsDatas(); + List<ReportsDatas> reportsDatasList = (List<ReportsDatas>) results.getReportsDatas(); - for (ReportsDatas report : reportsDatasList) { - //Account class from 1 to 5 and only non zero amount - if (Integer.valueOf(report.getAccount().getAccountNumber().substring(0, 1)) < 6 - && !report.getAmountSolde().equals(BigDecimal.ZERO)) { - //close accounts by removing amounts from all class 1 to 5 accounts - Entry beginEntry = new EntryImpl(); - beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); - beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); - beginEntry.setFinancialTransaction(endfinancialTransaction); - beginEntry.setAccount(report.getAccount()); - beginEntry.setAmount(report.getAmountSolde().abs()); - beginEntry.setDebit(!report.getSoldeDebit()); - financialTransactionService.createEntry(beginEntry); - //save amounts inside account number 891 - beginEntry = new EntryImpl(); - beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); - beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); - beginEntry.setFinancialTransaction(endfinancialTransaction); - beginEntry.setAccount(endRetainedAccount); - beginEntry.setAmount(report.getAmountSolde().abs()); - beginEntry.setDebit(report.getSoldeDebit()); - financialTransactionService.createEntry(beginEntry); - //open new year accounts if new year exists and a date has been found for the transaction - if (newyear && found) { - //give back amounts from class 1 to 5 accounts - beginEntry = new EntryImpl(); + for (ReportsDatas report : reportsDatasList) { + + //Account class from 1 to 5 and only non zero amount + if (Integer.valueOf(report.getAccount().getAccountNumber().substring(0, 1)) < 6 + && !report.getAmountSolde().equals(BigDecimal.ZERO)) { + + //close accounts by removing amounts from all class 1 to 5 accounts + Entry beginEntry = new EntryImpl(); beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); - beginEntry.setFinancialTransaction(beginfinancialTransaction); + beginEntry.setFinancialTransaction(endfinancialTransaction); beginEntry.setAccount(report.getAccount()); beginEntry.setAmount(report.getAmountSolde().abs()); - beginEntry.setDebit(report.getSoldeDebit()); + beginEntry.setDebit(!report.getSoldeDebit()); financialTransactionService.createEntry(beginEntry); - //close account by removing amount from account number 890 + + //save amounts inside account number 891 beginEntry = new EntryImpl(); beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); - beginEntry.setFinancialTransaction(beginfinancialTransaction); + beginEntry.setFinancialTransaction(endfinancialTransaction); beginEntry.setAccount(endRetainedAccount); beginEntry.setAmount(report.getAmountSolde().abs()); - beginEntry.setDebit(!report.getSoldeDebit()); + beginEntry.setDebit(report.getSoldeDebit()); financialTransactionService.createEntry(beginEntry); + + //open new year accounts if new year exists and a date has been found for the transaction + if (found) { + //give back amounts from class 1 to 5 accounts + beginEntry = new EntryImpl(); + beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); + beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); + beginEntry.setFinancialTransaction(beginfinancialTransaction); + beginEntry.setAccount(report.getAccount()); + beginEntry.setAmount(report.getAmountSolde().abs()); + beginEntry.setDebit(report.getSoldeDebit()); + financialTransactionService.createEntry(beginEntry); + //close account by removing amount from account number 890 + beginEntry = new EntryImpl(); + beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); + beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); + beginEntry.setFinancialTransaction(beginfinancialTransaction); + beginEntry.setAccount(endRetainedAccount); + beginEntry.setAmount(report.getAmountSolde().abs()); + beginEntry.setDebit(!report.getSoldeDebit()); + financialTransactionService.createEntry(beginEntry); + } } } } + + /*block the antepenultimate fiscalPeriod */ + FiscalPeriod fiscalPeriodBlocked = blockFiscalPeriod(fiscalPeriod); + return fiscalPeriodBlocked; } /** Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -56,7 +56,21 @@ void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; - void addRetainedEarnings(FiscalPeriod fiscalPeriod, - boolean newyear, - EntryBook entryBook) throws LimaException; + /** + * Eventually add retained earnings on last unclosed fiscal period, + * and in any case, block fiscal period + * @param fiscalPeriod fiscal period selected, and to block + * @param entryBook entry book where entries will be save in new fiscal period + * @param retainedEarnings to know if user want retained earnings + * @return fiscal period blocked + * */ + FiscalPeriod retainedEarningsAndBlockFiscalPeriod(FiscalPeriod fiscalPeriod, EntryBook entryBook, + boolean retainedEarnings) throws LimaException; + + /** + * Test if we have retained earnings on a fiscal period + * @param fiscalPeriod + * @return true if retained earnings are possible + * */ + boolean isRetainedEarnings(FiscalPeriod fiscalPeriod) throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -32,6 +32,8 @@ import javax.swing.table.AbstractTableModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.FiscalPeriod; @@ -49,6 +51,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 77027335135838258L; + private static final Log log = LogFactory.getLog(FiscalPeriodTableModel.class); + protected List<FiscalPeriod> fiscalPeriods; public void setFiscalPeriods(List<FiscalPeriod> fiscalPeriods) { @@ -147,7 +151,12 @@ public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { int row = fiscalPeriods.indexOf(fiscalPeriod); + + if (log.isDebugEnabled()) { + log.debug("Selected row : " + row); + } + fiscalPeriods.set(row, fiscalPeriod); - fireTableRowsInserted(row, row); + fireTableRowsUpdated(row, row); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -27,11 +27,7 @@ import static org.nuiton.i18n.I18n._; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.math.BigDecimal; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -46,7 +42,6 @@ import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; import org.chorem.lima.entity.FinancialTransaction; @@ -194,106 +189,72 @@ } /** - * Block selected fiscal period after user confirmation. + * Block selected fiscal period, + * and make new fiscal period and retained earnings + * after user confirmations */ public void blockFiscalPeriod() { JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTableModel(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); int selectedRow = fiscalPeriodeTable.getSelectedRow(); FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); //check if the user want to block the fiscal year - int response = JOptionPane.showConfirmDialog(view, + int answerBlock = JOptionPane.showConfirmDialog(view, _("lima.ui.fiscalperiod.block.confirmation"), _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); - if (response == JOptionPane.YES_OPTION) { - // FIXME report a nouveau et bloquage en une seule opération - // transactionnelle - selectedFiscalPeriod = fiscalPeriodService.blockFiscalPeriod(selectedFiscalPeriod); - model.updateFiscalPeriod(selectedFiscalPeriod); + if (answerBlock == JOptionPane.YES_OPTION) { + boolean retainedEarnings = false; + EntryBook entryBook = null; - //use to tell if the user wants to create a new fiscal year - boolean newyear = false; - //check if two fiscal periods are open - if (model.getRowCount() - 1 != selectedRow) { - newyear = true; //two are open - } else { - //check if the user wants to create a new fiscal year - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.block.newyear"), - _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); - // create a new fiscal year - if (response == JOptionPane.YES_OPTION) { - addFiscalPeriod(); - newyear = true; - } - } + //check if the user wants to create a new fiscal year + int answerCreate = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.block.newyear"), + _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); - addRetainedEarnings(selectedFiscalPeriod, newyear); - view.getModel().setBlockEnabled(false); - view.getModel().setDeleteEnabled(false); - } - } + // create a new fiscal year + if (answerCreate == JOptionPane.YES_OPTION) { + addFiscalPeriod(); - /** - * Report à nouveau. - * - * @deprecated a déplacer en partie en metier - * @param selectedFiscalPeriod - * @param newyear - */ - @Deprecated - public void addRetainedEarnings(FiscalPeriod selectedFiscalPeriod, boolean newyear) { + //report if they are at least one transaction to be report + if (fiscalPeriodService.isRetainedEarnings(selectedFiscalPeriod)) { - boolean found = false; - List<FinancialTransaction> financialTransactionsList = - financialTransactionService.getAllFinancialTransactions( - selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); - //check if they are at least one transaction to be report - if (!financialTransactionsList.isEmpty()) { - int i = 0; - while (i < financialTransactionsList.size() && !found) { - Collection<Entry> entryList = financialTransactionsList.get(i).getEntry(); - for (Entry entry : entryList) { - if (Integer.valueOf(entry.getAccount().getAccountNumber().substring(0, 1)) < 6 - && !entry.getAmount().equals(BigDecimal.ZERO)) { - found = true; + //check if the user wants to report datas + int answerRetainedEarnings = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.block.addretainedearnings"), + _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); + + //ask user for the entrybook to use for retained earnings + if (answerRetainedEarnings == JOptionPane.YES_OPTION) { + retainedEarnings = true; + + //Sets EntryBook + EntryBook newEntryBook = new EntryBookImpl(); + RetainedEarningsEntryBookForm entryBookForm = + new RetainedEarningsEntryBookForm(view); + entryBookForm.setEntryBook(newEntryBook); + + // jaxx constructor don't call super() ? + entryBookForm.setLocationRelativeTo(view); + entryBookForm.setVisible(true); + entryBook = entryBookForm.getEntryBook(); } } - i++; } + + FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.retainedEarningsAndBlockFiscalPeriod(selectedFiscalPeriod, entryBook, retainedEarnings); + model.updateFiscalPeriod(fiscalPeriodBlocked); + + view.getModel().setBlockEnabled(false); + view.getModel().setDeleteEnabled(false); } - //report if they are at least one transaction to be report - if (found) { - //check if the user wants to report datas - int response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.block.addretainedearnings"), - _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); - //ask user for the entrybook to use for retained earnings - if (response == JOptionPane.YES_OPTION) { - //Sets EntryBook - EntryBook newEntryBook = new EntryBookImpl(); - RetainedEarningsEntryBookForm entryBookForm = - new RetainedEarningsEntryBookForm(view); - entryBookForm.setEntryBook(newEntryBook); - // jaxx constructor don't call super() ? - entryBookForm.setLocationRelativeTo(view); - entryBookForm.setVisible(true); - // null == cancel action - EntryBook entryBook = entryBookForm.getEntryBook(); - if (entryBook != null) { - fiscalPeriodService.addRetainedEarnings( - selectedFiscalPeriod, newyear, entryBook); - } - } - } } - + @Override public void notifyMethod(String serviceName, String methodeName) { //refresh on import datas @@ -340,12 +301,7 @@ enableBlock = true; //only an empty and open fiscal period may be deleted - if (financialTransactionList.size() <= 0){ - enableDelete = true; - - }else{ - enableDelete = false; - } + enableDelete = financialTransactionList.size() <= 0; } } view.getModel().setBlockEnabled(enableBlock); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-14 13:05:05 UTC (rev 3606) @@ -237,19 +237,6 @@ getEntryAt(rowEntry).setLettering(letters); fireTableRowsUpdated(rowEntry, rowEntry); } -// fireTableDataChanged(); } - /**Copy parametrised entry, without amount*/ - /*public Entry copyEntryWithoutAmount(Entry entryToCopy) { - Entry copiedEntry = new EntryImpl(); - - copiedEntry.setAccount(entryToCopy.getAccount()); - copiedEntry.setDescription(entryToCopy.getDescription()); - copiedEntry.setDetail(entryToCopy.getDetail()); - copiedEntry.setFinancialTransaction(entryToCopy.getFinancialTransaction()); - copiedEntry.setVoucher(entryToCopy.getVoucher()); - - return copiedEntry; - }*/ } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-14 07:58:24 UTC (rev 3605) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-14 13:05:05 UTC (rev 3606) @@ -54,4 +54,5 @@ log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG -log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler=DEBUG +log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel=DEBUG \ No newline at end of file

1 0

r3605 - trunk/lima-swing/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org 14 Aug '12

14 Aug '12

Author: echatellier Date: 2012-08-14 09:58:24 +0200 (Tue, 14 Aug 2012) New Revision: 3605 Url: http://chorem.org/repositories/revision/lima/3605 Log: Fix uncaught exception not displayed to user. Added: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2012-08-14 07:58:24 UTC (rev 3605) @@ -0,0 +1,81 @@ +/* + * #%L + * Lima Swing + * + * $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; + +import static org.nuiton.i18n.I18n._; + +import javax.swing.JOptionPane; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaBusinessException; +import org.chorem.lima.util.ErrorHelper; + +/** + * Lima global exception handler. + * + * Catch all application uncaught and display it in a custom JoptionPane + * or JXErrorPane. + * + * See http://stackoverflow.com/a/4448569/1165234 for details. + * + * @author echatellier + * @since 0.6 + */ +public class LimaExceptionHandler implements Thread.UncaughtExceptionHandler { + + private static final Log log = LogFactory.getLog(LimaExceptionHandler.class); + + @Override + public void uncaughtException(Thread t, Throwable ex) { + handleException(t.getName(), ex); + } + + public void handle(Throwable thrown) { + // for EDT exceptions + handleException(Thread.currentThread().getName(), thrown); + } + + protected void handleException(String tname, Throwable ex) { + if (log.isErrorEnabled()) { + log.error("Global application exception", ex); + } + + Throwable cause = ex; + while (ex != null && !(cause instanceof LimaBusinessException)) { + cause = cause.getCause(); + } + + if (cause instanceof LimaBusinessException) { + JOptionPane.showMessageDialog(null, cause.getMessage(), + _("lima.ui.common.error"), JOptionPane.ERROR_MESSAGE); + } else { + ErrorHelper errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper.showErrorDialog(null, ex.getMessage(), ex); + } + } + +} Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2012-08-13 15:03:37 UTC (rev 3604) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2012-08-14 07:58:24 UTC (rev 3605) @@ -30,21 +30,18 @@ import java.util.Arrays; import java.util.Date; -import javax.swing.JOptionPane; import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.HttpServerService; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; import org.chorem.lima.ui.opening.OpeningView; -import org.chorem.lima.util.ErrorHelper; /** * Lima GUI main class. @@ -52,7 +49,7 @@ * @author ore * @version $Revision$ */ -public class LimaMain implements Thread.UncaughtExceptionHandler { +public class LimaMain { /** Log. */ private static final Log log = LogFactory.getLog(LimaMain.class); @@ -85,32 +82,15 @@ // display main ui if (config.isLaunchui()) { + // override default exception management (after config init) - Thread.setDefaultUncaughtExceptionHandler(new LimaMain()); + Thread.setDefaultUncaughtExceptionHandler(new LimaExceptionHandler()); + System.setProperty("sun.awt.exception.handler", LimaExceptionHandler.class.getName()); launch(context); } } - public void uncaughtException(Thread t, Throwable ex) { - if (log.isErrorEnabled()) { - log.error("Global application exception", ex); - } - - Throwable cause = ex; - while (ex != null && !(cause instanceof LimaBusinessException)) { - cause = cause.getCause(); - } - - if (cause instanceof LimaBusinessException) { - JOptionPane.showMessageDialog(null, cause.getMessage(), - _("lima.ui.common.error"), JOptionPane.ERROR_MESSAGE); - } else { - ErrorHelper errorHelper = new ErrorHelper(config); - errorHelper.showErrorDialog(null, ex.getMessage(), ex); - } - } - /** * initialisation de l'application : * <p/>

1 0

r3604 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 13 Aug '12

13 Aug '12

Author: mallon Date: 2012-08-13 17:03:37 +0200 (Mon, 13 Aug 2012) New Revision: 3604 Url: http://chorem.org/repositories/revision/lima/3604 Log: refs #755 Correction sur le listener du filtre 'Date' Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-13 14:42:17 UTC (rev 3603) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-13 15:03:37 UTC (rev 3604) @@ -40,14 +40,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.ListCellRenderer; -import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; -import javax.swing.event.CaretEvent; -import javax.swing.event.CaretListener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Calendar; @@ -76,16 +70,18 @@ Date date = calendar.getTime(); date = DateUtils.truncate(date, Calendar.DATE); final JXDatePicker datePicker = new JXDatePicker(date); - ActionListener dateActionListener = new ActionListener() { + PropertyChangeListener datePCListener = new PropertyChangeListener() { @Override - public void actionPerformed(ActionEvent e) { + public void propertyChange(PropertyChangeEvent evt) { handler.setBeginDate(datePicker.getDate()); + handler.setEndDate(datePicker.getDate()); handler.refresh(); } }; handler.setBeginDate(datePicker.getDate()); + handler.setEndDate(datePicker.getDate()); handler.refresh(); - datePicker.addActionListener(dateActionListener); + datePicker.addPropertyChangeListener(datePCListener); removeAll(); add(datePicker); break;

1 0

r3603 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/combobox lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 13 Aug '12

13 Aug '12

Author: mallon Date: 2012-08-13 16:42:17 +0200 (Mon, 13 Aug 2012) New Revision: 3603 Url: http://chorem.org/repositories/revision/lima/3603 Log: fixes #761 Correction permettant d afficher une liste deroulante avec toutes les lettres utilisees pour les entrees. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -194,6 +194,21 @@ } @Override + public List<String> getAllLetters() throws LimaException { + List<String> letters; + try { + EntryDAO entryDAO = getDaoHelper().getEntryDAO(); + + letters = new ArrayList<String>(entryDAO.findLetters()); + + } catch (Exception ex) { + throw new LimaException("Can't get all letters", ex); + } + + return letters; + } + + @Override public Entry[] getEntriesFromEqualizing(Entry FirstEntrySelected, Entry SecondEntrySelected) throws LimaException{ Entry newSameAccountEntry = null; Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -76,8 +76,17 @@ void removeEntry(Entry entry) throws LimaException; + /** Find the last letter used + * and increment them + * @return a string representing the last letter + * */ String getNextLetters() throws LimaException; + /** Find all the letters used + * @return a list of string containing all the letters + * */ + List<String> getAllLetters() throws LimaException; + /** * From to selected entries, create one with same account and * difference between the amounts, and another one with 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-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -129,6 +129,11 @@ " order by E.lettering desc"; List<String> result = new ArrayList<String>(context.findAll(query)); + + if (log.isDebugEnabled()) { + log.debug("Size of result : " + result.size()); + } + return result; } 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-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -327,7 +327,10 @@ if (lettering != null) { query += " AND E.lettering = :lettering"; args.add("lettering"); - args.add("%" + lettering + "%"); + args.add(lettering); + if (log.isDebugEnabled()) { + log.debug("Lettering filter : -" + lettering + "-"); + } } // accounts Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2012-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -97,7 +97,7 @@ result = entryBookService.getAllEntryBooks(); } catch (LimaException eee) { if (log.isDebugEnabled()) { - log.debug("Can't get list accounts", eee); + log.debug("Can't get list entry books", eee); } } return result; Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -0,0 +1,91 @@ +package org.chorem.lima.ui.combobox; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.api.AccountService; +import org.chorem.lima.business.api.FinancialTransactionService; +import org.chorem.lima.business.api.ImportService; +import org.chorem.lima.entity.Account; +import org.chorem.lima.service.LimaServiceFactory; + +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; +import java.util.List; + +/** + * Date: 13/08/12 + * + * @author mallon <mallon(a)codelutin.com> + * @since 0.6-alpha-2 + */ +public class LetterComboBoxModel extends AbstractListModel implements ComboBoxModel, ServiceListener { + + private static final long serialVersionUID = 1L; + + private static final Log log = + LogFactory.getLog(AccountComboBoxModel.class); + + protected Object selectedAccount; + + protected List<String> datasCache; + + protected FinancialTransactionService financialTransactionService; + + public LetterComboBoxModel() { + financialTransactionService = + LimaServiceFactory.getService(FinancialTransactionService.class); + LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this); + datasCache = getDataList(); + } + + @Override + public Object getSelectedItem() { + return selectedAccount; + } + + @Override + public void setSelectedItem(Object anItem) { + selectedAccount = anItem; + fireContentsChanged(this, -1, -1); + } + + + @Override + public Object getElementAt(int index) { + return datasCache.get(index); + } + + @Override + public int getSize() { + return datasCache.size(); + } + + public List<String> getDataList() { + List<String> result = null; + try { + result = financialTransactionService.getAllLetters(); + } catch (LimaException eee) { + if (log.isDebugEnabled()) { + log.debug("Can't get list letters", eee); + } + } + return result; + + } + + public void refresh() { + datasCache = getDataList(); + fireContentsChanged(this, 0, datasCache.size()); + } + + @Override + public void notifyMethod(String serviceName, String methodeName) { + if (methodeName.contains("Letter") || + methodeName.contains("importAll")) { + refresh(); + } + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -43,7 +43,6 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; /** * Handler associated with financial transaction view. @@ -120,6 +119,10 @@ financialTransactionSearch.setLettering(lettering); } + public String getLetter() { + return financialTransactionSearch.getLettering(); + } + public String getAccountsList() { return financialTransactionSearch.getAccountList(); } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -0,0 +1,68 @@ +package org.chorem.lima.ui.financialtransactionsearch; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.combobox.LetterComboBoxModel; + +import javax.swing.JComboBox; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; + +/** + * Date: 13/08/12 + * + * @author mallon <mallon(a)codelutin.com> + * @since 0.6-alpha-2 + */ +public class LetterSearchComboBox extends JComboBox implements KeyListener { + + private static final long serialVersionUID = 1L; + + protected FinancialTransactionSearchViewHandler handler; + + public LetterSearchComboBox(FinancialTransactionSearchViewHandler handler) { + this.handler = handler; + LetterComboBoxModel letterComboBoxModel = new LetterComboBoxModel(); + setModel(letterComboBoxModel); + setEditable(true); + getEditor().getEditorComponent().addKeyListener(this); + addActionListener(this); + } + + @Override + public void actionPerformed(ActionEvent e) { + Object object = getSelectedItem(); + if (object instanceof String) { + handler.setLetter((String) getSelectedItem()); + } + } + + @Override + public void keyPressed(KeyEvent e) { + + } + + @Override + public void keyReleased(KeyEvent e) { + Object object = getSelectedItem(); + if (object instanceof String) { + String letter = (String) getSelectedItem(); + //to prevent useless call to service + if (!letter.equals(handler.getLetter())) { + handler.setLetter(letter); + } + + } + + // delegate popup list menu + if (e.getKeyChar() == KeyEvent.VK_ENTER) { + firePopupMenuCanceled(); + } + } + + @Override + public void keyTyped(KeyEvent e) { + + } +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java 2012-08-13 12:58:13 UTC (rev 3602) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java 2012-08-13 14:42:17 UTC (rev 3603) @@ -50,9 +50,9 @@ break; case SELECT_ONE: - /*LetterSearchComboBox comboBox = new LetterSearchComboBox(handler); + LetterSearchComboBox comboBox = new LetterSearchComboBox(handler); removeAll(); - add(comboBox);*/ + add(comboBox); break; }

1 0

r3602 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 13 Aug '12

13 Aug '12

Author: mallon Date: 2012-08-13 14:58:13 +0200 (Mon, 13 Aug 2012) New Revision: 3602 Url: http://chorem.org/repositories/revision/lima/3602 Log: refs #762 Correction sur le tableau de recherche et la possibilite de lettrer et de saisir un montant en debit / credit. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-08-13 12:48:18 UTC (rev 3601) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-08-13 12:58:13 UTC (rev 3602) @@ -73,7 +73,7 @@ addKeyListener(this); addMouseListener(this); - setEditable(false); + setEnabled(false); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor());

1 0

r3601 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 13 Aug '12

13 Aug '12

Author: mallon Date: 2012-08-13 14:48:18 +0200 (Mon, 13 Aug 2012) New Revision: 3601 Url: http://chorem.org/repositories/revision/lima/3601 Log: refs #762 Correction sur le tableau de saisie. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-13 12:31:11 UTC (rev 3600) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-13 12:48:18 UTC (rev 3601) @@ -147,10 +147,6 @@ fiscalPeriod.setRenderer(renderer); fiscalPeriod.setEditable(false); - if (log.isDebugEnabled()) { - log.debug("First fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); - log.debug("Second fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getEndDate() ); - } ActionListener fiscalPeriodActionListener = new ActionListener() { @Override @@ -178,11 +174,6 @@ financialPeriod.setRenderer(rendererFinancialPeriod); financialPeriod.setEditable(false); - if (log.isDebugEnabled()) { - log.debug("First financial period of combo box : " + ((FinancialPeriod)financialPeriod.getItemAt(0)).getBeginDate() + " - " + ((FinancialPeriod)financialPeriod.getItemAt(0)).getEndDate() ); - log.debug("Second financial period of combo box : " + ((FinancialPeriod)financialPeriod.getItemAt(1)).getBeginDate() + " - " + ((FinancialPeriod)financialPeriod.getItemAt(1)).getEndDate() ); - } - ActionListener financialPeriodActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-08-13 12:31:11 UTC (rev 3600) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-08-13 12:48:18 UTC (rev 3601) @@ -73,6 +73,7 @@ addKeyListener(this); addMouseListener(this); + setEditable(false); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor());

1 0

r3600 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 13 Aug '12

13 Aug '12

Author: mallon Date: 2012-08-13 14:31:11 +0200 (Mon, 13 Aug 2012) New Revision: 3600 Url: http://chorem.org/repositories/revision/lima/3600 Log: refs #705 Correction sur l editeur des cellules debit / credit. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-10 16:53:07 UTC (rev 3599) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-13 12:31:11 UTC (rev 3600) @@ -157,9 +157,15 @@ * @param e keyEvent starting control of decimalSeparator * */ protected void limitComma(KeyEvent e) { - if ( (String.valueOf(e.getKeyChar()).matches("[^0-9]") - && getComponent().getText().length() > 2) ) { + if ( (String.valueOf(e.getKeyChar()).matches(",") || String.valueOf(e.getKeyChar()).matches("\\.")) + && comma.equals(",")) { getComponent().setText(getComponent().getText().substring(0, getComponent().getText().length()-1)); + } else if( (String.valueOf(e.getKeyChar()).matches(",") || String.valueOf(e.getKeyChar()).matches("\\.")) + && comma.equals("")) { + comma = ","; + } else if(!getComponent().getText().matches(",") || !getComponent().getText().matches(".") && + (!String.valueOf(e.getKeyChar()).matches(",") || !String.valueOf(e.getKeyChar()).matches("\\."))) { + comma = ""; } }

1 0

r3599 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 10 Aug '12

10 Aug '12

Author: mallon Date: 2012-08-10 18:53:07 +0200 (Fri, 10 Aug 2012) New Revision: 3599 Url: http://chorem.org/repositories/revision/lima/3599 Log: refs #705 Correction sur l editeur des cellules debit / credit. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-10 16:31:26 UTC (rev 3598) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-10 16:53:07 UTC (rev 3599) @@ -141,9 +141,7 @@ @Override public BigDecimal getCellEditorValue() { String stringValue = super.getCellEditorValue().toString(); - if (StringUtils.isBlank(stringValue) - || stringValue.matches("[^0-9]*[0-9]*[^0-9]*") - || stringValue.matches("[^0-9]*")) { + if (StringUtils.isBlank(stringValue)) { stringValue = "0"; } stringValue=stringValue.replaceAll(",",".");

1 0