Author: jpepin Date: 2010-05-14 14:45:50 +0200 (Fri, 14 May 2010) New Revision: 2898 Url: http://chorem.org/repositories/revision/lima/2898 Log: Ajout entr?\195?\169e, ajout transaction, suppression : v?\195?\169rification si les journaux de la p?\195?\169riode courante sont tous ferm?\195?\169s. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.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/FinancialPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/FinancialTransactionViewHandler.java 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/FinancialPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java 2010-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/FinancialPeriodService.java 2010-05-14 12:45:50 UTC (rev 2898) @@ -47,6 +47,7 @@ /** Methodes for closedperiodicentrybook */ + ClosedPeriodicEntryBook getClosedPeriodicEntryBook(EntryBook entryBook, FinancialPeriod financialPeriod) throws LimaException; 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-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2010-05-14 12:45:50 UTC (rev 2898) @@ -19,6 +19,9 @@ package org.chorem.lima.business.accountingrules; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,6 +36,7 @@ import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryBookDAO; import org.chorem.lima.entity.EntryDAO; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodDAO; @@ -173,14 +177,32 @@ /** * check if financial period of a financial transaction is blocked + * check if all entrybook of his financial period are blocked */ @Override public void checkFinancialPeriodBlockedWithFinancialTransaction(FinancialTransaction financialTransaction, TopiaContext topiaContext) throws LimaException { - - if (financialTransaction.getFinancialPeriod().getLocked()){ throw new LimaBusinessException("The financial period is blocked"); } + + List<EntryBook> entryBooks = new ArrayList<EntryBook>(); + List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); + try { + EntryBookDAO entryBookDAO = LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); + FinancialPeriod financialPeriod = financialTransaction.getFinancialPeriod(); + entryBooks = entryBookDAO.findAll(); + for (EntryBook entryBook : entryBooks) { + if(financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod).getLocked()){ + closedEntryBooks.add(entryBook); + } + } + } + catch (TopiaException eee) { + doCatch(topiaContext, eee, log); + } + if (entryBooks.size() == closedEntryBooks.size()){ + throw new LimaBusinessException("All EntryBook of this financialperiod are closed"); + } } /** Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2010-05-14 12:45:50 UTC (rev 2898) @@ -242,6 +242,7 @@ @Override public void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { + TopiaContext topiaContext = null; try { topiaContext = rootContext.beginTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-05-14 12:45:50 UTC (rev 2898) @@ -27,6 +27,7 @@ import javax.swing.table.AbstractTableModel; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.Nestable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.EntryBookService; @@ -34,6 +35,7 @@ import org.chorem.lima.business.FiscalPeriodService; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; @@ -221,10 +223,10 @@ } public void blockFinancialPeriod(FinancialPeriodEntryBook financialPeriodEntryBook) throws LimaException { - ClosedPeriodicEntryBook closedPeriodicEntryBook - = financialPeriodService.getClosedPeriodicEntryBook( - financialPeriodEntryBook.entryBook, - financialPeriodEntryBook.financialPeriod); + ClosedPeriodicEntryBook closedPeriodicEntryBook = + financialPeriodService.getClosedPeriodicEntryBook( + financialPeriodEntryBook.entryBook, + financialPeriodEntryBook.financialPeriod); financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); fireTableDataChanged(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/FinancialTransactionViewHandler.java 2010-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/transaction/FinancialTransactionViewHandler.java 2010-05-14 12:45:50 UTC (rev 2898) @@ -62,8 +62,11 @@ try { model.addFinancialTransaction(); } catch (LimaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't add financialtransaction", ex); + } JOptionPane.showMessageDialog(view, - _("lima.warning.financialtransaction.noselect")); + _("lima.warning.entrybookscloded")); } } @@ -82,9 +85,11 @@ try { model.addEmptyEntry(selectedValue, indexSelectedRow); } catch (LimaException ex){ - if (log.isWarnEnabled()) { - log.warn("Can't add empty entry"); + if (log.isErrorEnabled()) { + log.error("Can't add emptyentry", ex); } + JOptionPane.showMessageDialog(view, + _("lima.warning.entrybookscloded")); } } else { @@ -130,7 +135,8 @@ if (log.isErrorEnabled()) { log.error("Can't remove transaction or entry", ex); } - ErrorHelper.showErrorDialog("Can't remove transaction or entry", ex); + JOptionPane.showMessageDialog(view, + _("lima.warning.entrybookscloded")); } } } 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-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-05-14 12:45:50 UTC (rev 2898) @@ -358,6 +358,6 @@ lima.view=View lima.view.flatten=Flatten view lima.voucher=Voucher -lima.warning.financialtransaction.noselect=No Financial Period or EntryBook are selectionned +lima.warning.entrybookscloded=All EntryBook of this financial period are blocked lima.warning.nimbus.landf=Could not find Numbus Look&Feel lima.warning.no.ui=No ui display detected 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-05-14 11:22:26 UTC (rev 2897) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-05-14 12:45:50 UTC (rev 2898) @@ -337,6 +337,6 @@ lima.view=Vue lima.view.flatten=Vue aplatie lima.voucher=Document -lima.warning.financialtransaction.noselect=Aucune p\u00E9riode et/ou aucun journal s\u00E9lectionn\u00E9 +lima.warning.entrybookscloded=Impossible tous les journaux de cette p\u00E9riode sont ferm\u00E9s lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 lima.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9.