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

r3472 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/fiscalperiod java/org/chorem/lima/ui/home resources
by mallon＠users.chorem.org 25 Jun '12

25 Jun '12

Author: mallon Date: 2012-06-25 15:16:58 +0200 (Mon, 25 Jun 2012) New Revision: 3472 Url: http://chorem.org/repositories/revision/lima/3472 Log: Mise ?\195?\160 jour du panneau d'accueil : du code inutile a ?\195?\169t?\195?\169 supprim?\195?\169 (Acc?\195?\168s ?\195?\160 la saisie des ?\195?\169critures), et la mise ?\195?\160 jour du panneau se fait selon la suppression d'un exercice / d'un journal et la cl?\195?\180ture d'un exercice. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/resources/log4j.properties 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-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -50,6 +50,7 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.home.FinancialTransactionsPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -78,6 +78,8 @@ public void refresh() { + log.debug("Rafraîchissement accounts pane"); + String htmlBegin = "" + ""; String htmlEnd = ""; @@ -110,6 +112,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("Account") || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -81,6 +81,8 @@ public void refresh() { + log.debug("Rafraîchissement entry books pane"); + String htmlBegin = "" + ""; String htmlEnd = ""; @@ -133,6 +135,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("EntryBook") || methodeName.contains("importAll") || methodeName.contains("importAs") || methodeName.contains("importEntries")) { refresh(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -36,14 +36,18 @@ import org.chorem.lima.LimaContext; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; +import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; +import com.google.common.collect.Multiset.Entry; + /** * Home view pane that display statistics about unbalanced transactions. * @@ -62,12 +66,15 @@ protected FinancialTransactionService financialTransactionService; protected FiscalPeriodService fiscalPeriodService; + + protected EntryBookService entryBookService; public FinancialTransactionsPane(HomeView view) { super(view); financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); + entryBookService = LimaServiceFactory.getService(EntryBookService.class); LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); @@ -90,7 +97,9 @@ } public void refresh() { - + + log.debug("Rafraîchissement financial transaction pane"); + String htmlBegin = "" + ""; String htmlEnd = ""; @@ -99,7 +108,10 @@ List<FiscalPeriod> unblockedFiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - if (unblockedFiscalPeriods.size() != 0) { + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + + //Au moins un exercice ouvert et un journal ouvert + if (unblockedFiscalPeriods.size() != 0 && entryBooks.size() != 0) { List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService. getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); @@ -121,20 +133,19 @@ + " " + _("lima.ui.home.transaction.balanced") + " <a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.modifiy.balanced") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { setBackground(RED_BACKGROUND); String transactionsString = _("lima.ui.home.transaction.nothing") + " <a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.create") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } } - } else { + }else { setBackground(RED_BACKGROUND); + setText(""); } } catch (LimaException eee) { @@ -143,10 +154,11 @@ } @Override - public void notifyMethod(String serviceName, String methodeName) { + public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("FinancialTransaction") || methodeName.contains("Entry") || methodeName.contains("importEntries") - || methodeName.contains("importAll") || methodeName.contains("importAs")) { + || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -87,6 +87,8 @@ public void refresh() { + log.debug("Rafraîchissement fiscal periods pane"); + String htmlBegin = "" + ""; String htmlEnd = ""; @@ -130,6 +132,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll") || methodeName.contains("importAs")) { Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 13:16:58 UTC (rev 3472) @@ -40,4 +40,5 @@ log4j.logger.org.chorem.lima=INFO log4j.logger.org.chorem.lima.business.ejb=DEBUG log4j.logger.org.chorem.lima.ui.account=DEBUG +log4j.logger.org.chorem.lima.ui.home=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG \ No newline at end of file

1 0

r3471 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransaction resources/i18n
by mallon＠users.chorem.org 25 Jun '12

25 Jun '12

Author: mallon Date: 2012-06-25 12:13:27 +0200 (Mon, 25 Jun 2012) New Revision: 3471 Url: http://chorem.org/repositories/revision/lima/3471 Log: Suppression du code grisant l'interface d'ajout d'?\195?\169criture (Quand il n'existe aucun journal), et ce pour des raisons d'omptimisation, mais aussi afin d'?\195?\170tre sur la m?\195?\170me logique d'ui que lorsqu'il n'y a pas d'exercie ouvert. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/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-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 10:13:27 UTC (rev 3471) @@ -52,8 +52,7 @@ <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onItemStateChanged="handler.fiscalPeriodSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.fiscalPeriodSelected(event)"/> </cell> <cell anchor="east"> <JLabel text="lima.ui.financialtransaction.financialperiod" labelFor='{financialPeriodComboBox}'/> @@ -64,14 +63,11 @@ <JComboBox id="financialPeriodComboBox" model="{financialPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" - onItemStateChanged="handler.financialPeriodSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.financialPeriodSelected(event)"/> <JButton id="back" text="lima.ui.financialtransaction.buttonback" - onActionPerformed="handler.back(financialPeriodComboBox)" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.back(financialPeriodComboBox)"/> <JButton id="next" text="lima.ui.financialtransaction.buttonnext" - onActionPerformed="handler.next(financialPeriodComboBox)" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.next(financialPeriodComboBox)"/> </JPanel> </cell> <cell anchor="east"> @@ -81,8 +77,7 @@ <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" - onItemStateChanged="handler.entryBookSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.entryBookSelected(event)"/> </cell> </row> <row> @@ -94,8 +89,7 @@ <JButton text="lima.common.paste" enabled="{isSelectedRow()}" onActionPerformed="handler.pasteRow(financialTransactionTable.getSelectedRow())"/> <JButton text="lima.entries.addTransaction" - onActionPerformed="handler.addFinancialTransaction()" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.addFinancialTransaction()"/> <JButton text="lima.entries.addEntry" enabled="{isSelectedRow()}" onActionPerformed="handler.addEntry()"/> <JButton text="lima.common.remove" enabled="{isSelectedRow()}" 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-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 10:13:27 UTC (rev 3471) @@ -93,30 +93,11 @@ LimaServiceFactory.addServiceListener(FinancialPeriodService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); - } - - //impossible to add transaction without entrybook - public boolean controlEntryBook(){ - boolean result = true; - - if (entryBookService.getAllEntryBooks().isEmpty()){ - JOptionPane.showMessageDialog(view, _("lima.ui.financialtransaction.messagenoentrybooks"), - _("lima.ui.financialtransaction.titlenoentrybooks"), JOptionPane.ERROR_MESSAGE); - result = false; - }else{ - result=true; - } - - view.setNoEntryBooks(result); - return result; - } - + } /** * Init all combo box in view. */ public void init() { - - if (controlEntryBook()){ // fiscal periods List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); @@ -135,7 +116,6 @@ if (log.isDebugEnabled()) { log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); } - } } /** 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-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-25 10:13:27 UTC (rev 3471) @@ -250,10 +250,8 @@ lima.ui.financialtransaction.financialperiod= lima.ui.financialtransaction.fiscalyear= lima.ui.financialtransaction.letter= -lima.ui.financialtransaction.messagenoentrybooks=At least one entry books must to be opened to create the corresponding transactions lima.ui.financialtransaction.messageremoveentry= lima.ui.financialtransaction.messageremovetransaction= -lima.ui.financialtransaction.titlenoentrybooks=No entry books opened lima.ui.financialtransaction.titleremoveentry= lima.ui.financialtransaction.titleremovetransaction= lima.ui.financialtransaction.voucher= 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-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-25 10:13:27 UTC (rev 3471) @@ -250,10 +250,8 @@ lima.ui.financialtransaction.financialperiod=Périodes comptables lima.ui.financialtransaction.fiscalyear=Exercices lima.ui.financialtransaction.letter=Lettre -lima.ui.financialtransaction.messagenoentrybooks=Au moins un journal doit être ouvert pour créer les transactions correspondantes lima.ui.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? lima.ui.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? -lima.ui.financialtransaction.titlenoentrybooks=Aucun journal ouvert lima.ui.financialtransaction.titleremoveentry=Suppression lima.ui.financialtransaction.titleremovetransaction=Suppression lima.ui.financialtransaction.voucher=Pièce comptable

1 0

r3470 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/resources
by mallon＠users.chorem.org 22 Jun '12

22 Jun '12

Author: mallon Date: 2012-06-22 15:03:22 +0200 (Fri, 22 Jun 2012) New Revision: 3470 Url: http://chorem.org/repositories/revision/lima/3470 Log: Correction sur la gestion des dates des transactions : - Probl?\195?\168me sur l'enregistrement de la date mise ?\195?\160 jour par l'user (Du point de vue fonctionnelle, car du point de vue technique, reste le probl?\195?\168me de rattachement de session et d'utilisation de deux objets.) - Correction de l'interface, en ce qui concerne le changement de la liste d?\195?\169roulante des p?\195?\169riodes comptables en fonction du changement de celle des exercices. - Suppression des tests sur les entr?\195?\169es, puisque ceux-ci sont d?\195?\169j?\195?\160 effectu?\195?\169s lors de la mise ?\195?\160 jour des entr?\195?\169es. - Un utilisateur peut donc entrer n'importe quelle date de transaction, mais elle n'est pas enregistr?\195?\169e et un message avertit l'utilisateur dans deux cas : si la date est en-dehors de tout exercice, ou bien si l'exercice est bloqu?\195?\169. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/log4j.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 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -290,119 +290,69 @@ /** * Check : - * 1. if old financialtransaction date are on periodblocked - * 2. if new financialtransaction date are on periodblocked - * 3. if the actual entrybook belong to a blocked closedPeriodicEntryBook - * 4. if the new entrybook belong to a blocked closedPeriodicEntryBook - * 5. if date are on fiscal period - * 6. if all closedperiod are open + * 1. if date are on fiscal period + * 2. if old financialtransaction date are on periodblocked + * 3. if new financialtransaction date are on periodblocked */ @Override public void updateFinancialTransactionDateRules( FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld) throws LimaException { - 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 = getDaoHelper().getClosedPeriodicEntryBookDAO(); - - //3. the actual entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBookOld = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransactionOld.getEntryBook(), financialPeriod); - if (closedPeriodicEntryBookOld.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updateentryerror")); - } - - //4. the new entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransaction.getEntryBook(), financialPeriod); - if (closedPeriodicEntryBook.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatenewentryerror")); - } - - //5. the actual entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBookOld2 = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransactionOld.getEntryBook(), financialPeriodOld); - if (closedPeriodicEntryBookOld2.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror")); - } - - //6. the new entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBook2 = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransaction.getEntryBook(), financialPeriodOld); - if (closedPeriodicEntryBook2.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror")); - } - - - //7. check if date are on fiscal period + try { + + Date financialTransactionDate = financialTransaction.getTransactionDate(); FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); - - //search fiscalperiod have financialperiod in params - FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByFinancialPeriod(financialPeriod); - - Date beginDateFiscalPeriod = fiscalPeriod.getBeginDate(); - Date endDateFiscalPeriod = fiscalPeriod.getEndDate(); - Date financialTransactionDate = - financialTransaction.getTransactionDate(); - if (financialTransactionDate.before(beginDateFiscalPeriod)) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.datebeforeerror")); - } - if (financialTransactionDate.after(endDateFiscalPeriod)) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.dateaftererror")); - } - - /* - //6. check all entrybook of old and new financial period are blocked - //FIXME Make this check by topia query ? - List<EntryBook> entryBooks = new ArrayList<EntryBook>(); - List<EntryBook> newClosedEntryBooks = new ArrayList<EntryBook>(); - List<EntryBook> oldClosedEntryBooks = new ArrayList<EntryBook>(); + FiscalPeriod lastFiscalPeriod = fiscalPeriodDAO.getLastFiscalPeriod(); + FiscalPeriod firstFiscalPeriod = fiscalPeriodDAO.getFirstFiscalPeriod(); + Date beginDateFirstFiscalPeriod = firstFiscalPeriod.getBeginDate(); + Date endDateLastFiscalPeriod = lastFiscalPeriod.getEndDate(); + + //check if date are on fiscal period (test if date is after begindate of first f.p. and before enddate of last f.p.) - EntryBookDAO entryBookDAO = - LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); + if (log.isDebugEnabled()) { + log.debug("Date de transaction modifiée sur l'ui " + financialTransactionDate); + log.debug("Date de début du premier exercice : " + beginDateFirstFiscalPeriod); + log.debug("Date de fin du dernier exercice : " + endDateLastFiscalPeriod); + } - entryBooks = entryBookDAO.findAll(); - - for (EntryBook entryBook : entryBooks) { - ClosedPeriodicEntryBook newClosedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findbyEntryBookAndFinancialPeriod( - entryBook, financialPeriod); - ClosedPeriodicEntryBook oldClosedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findbyEntryBookAndFinancialPeriod( - entryBook, financialPeriodOld); - if(newClosedPeriodicEntryBook.getLocked()){ - newClosedEntryBooks.add(entryBook); + //1-date not on a fiscal period + if (financialTransactionDate.before(beginDateFirstFiscalPeriod) || financialTransactionDate.after(endDateLastFiscalPeriod)){ + if (financialTransactionDate.before(beginDateFirstFiscalPeriod)) { + if (log.isDebugEnabled()) { + log.debug("Date de la transaction avant (antérieure) la date de début du premier exercice"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.datebeforeerror")); } - if(oldClosedPeriodicEntryBook.getLocked()){ - oldClosedEntryBooks.add(entryBook); + + if (financialTransactionDate.after(endDateLastFiscalPeriod)) { + if (log.isDebugEnabled()) { + log.debug("Date de la transaction après (postérieure) la date de fin du dernier exercice"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.dateaftererror")); } + }else{ //date on a fiscal period (and consequently on a financial), now test if financial is open + + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); + FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(financialTransaction.getTransactionDate()); + FinancialPeriod financialPeriodOld = financialPeriodDAO.findByDate(financialTransactionOld.getTransactionDate()); + + //2. check old financial period locked + if (financialPeriodOld.getLocked()) { + if (log.isDebugEnabled()) { + log.debug("Periode (Old) financière bloquée"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialtransactionblocked")); + } + + //3. check new financial period locked + if (financialPeriod.getLocked()) { + if (log.isDebugEnabled()) { + log.debug("Periode (New) financière bloquée"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialnewdateblocked")); + } } - if (oldClosedEntryBooks.size() >0){ - throw new LimaBusinessException("All EntryBook of this financialperiod are not open"); - } - if (newClosedEntryBooks.size() >0){ - throw new LimaBusinessException("All EntryBook of old financialperiod are not open"); - }*/ - - } catch (TopiaException ex) { throw new LimaException("Can't check financial transaction", ex); } 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-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -227,23 +227,32 @@ * Method used by update entry and remove entry for update amounts. */ @Override - public void updateFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { + public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { + + //FIXME mallon 22/06/2012 : Revoir l'utilisation du rattachement à la session et celle des deux objets 'financialTransactionOld' + //et 'financialTransaction' FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - FinancialTransaction financialTransactionOld = - transactionDAO.findByTopiaId(financialtransaction.getTopiaId()); + FinancialTransaction financialTransactionOld = transactionDAO.findByTopiaId(financialTransaction.getTopiaId()); - // 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); - - financialTransactionOld.setEntryBook( - financialtransaction.getEntryBook()); + accountingRules.updateFinancialTransactionDateRules(financialTransaction, financialTransactionOld); + + Date financialTransactionOldDate = financialTransactionOld.getTransactionDate(); + Date financialTransactionDate = financialTransaction.getTransactionDate(); + + if (log.isDebugEnabled()) { + log.debug("Date de la transaction (Old) : " + financialTransactionOldDate); + } + if (log.isDebugEnabled()) { + log.debug("Date de la transaction (New) : " + financialTransactionDate); + } + + financialTransactionOld.setEntryBook(financialTransaction.getEntryBook()); + financialTransactionOld.setTransactionDate(financialTransactionDate); + transactionDAO.update(financialTransactionOld); } catch (TopiaException ex) { throw new LimaException("Can't update financial transaction", ex); Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-22 13:03:22 UTC (rev 3470) @@ -6,8 +6,8 @@ lima-business.common.failed=Échec \: %s \n lima-business.defaultaccountingrules.allentrybookclosed=Tous les journaux de cette période financière sont fermés lima-business.defaultaccountingrules.blockerrorequillibrate=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées -lima-business.defaultaccountingrules.dateaftererror=La date est antérieure à la période fiscale -lima-business.defaultaccountingrules.datebeforeerror=La date est postérieure à la période fiscale +lima-business.defaultaccountingrules.dateaftererror=La date est postérieure à la période fiscale +lima-business.defaultaccountingrules.datebeforeerror=La date est antérieure à la période fiscale lima-business.defaultaccountingrules.deleteaccounterror=Impossible de supprimer un comte contenant des entrées lima-business.defaultaccountingrules.deleteentrybookerror=Impossible de supprimer un journal contenant des transactions lima-business.defaultaccountingrules.enddateerror=La date de fin est antérieure à la date de début 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-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -33,6 +33,7 @@ import org.apache.commons.collections.CollectionUtils; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; +import org.hibernate.HibernateException; import org.nuiton.topia.TopiaException; /** @@ -47,6 +48,20 @@ public class FinancialTransactionDAOImpl<E extends FinancialTransaction> extends FinancialTransactionDAOAbstract<FinancialTransaction> { /** + * FIXME echatellier, remove this method when implemented in topia + * just overriden to use merge() instead of saveOrUpdate() + */ + public FinancialTransaction merge(FinancialTransaction e) throws TopiaException { + try { + e = (FinancialTransaction)getContext().getHibernate().merge(e); + getContext().getFiresSupport().warnOnUpdateEntity(e); + return e; + } catch (HibernateException ex) { + throw new TopiaException(ex); + } + } + + /** * Return how many transaction are found with specified entryBook. * * @param entryBook entry book Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -95,6 +95,24 @@ } /** + * Get first fiscal period (higher end date). + * + * @return last fiscal period + * @throws TopiaException + */ + public FiscalPeriod getFirstFiscalPeriod() throws TopiaException { + String query = "FROM " + FiscalPeriod.class.getName() + + " ORDER BY endDate"; + + List<FiscalPeriod> fiscalPeriods = context.find(query); + FiscalPeriod result = null; + if (!fiscalPeriods.isEmpty()) { + result = fiscalPeriods.get(0); + } + return result; + } + + /** * Get last non locked fiscal period (higher end date). * * @return last fiscal period 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-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -154,7 +154,8 @@ log.debug(String.format("Loaded %d financial periods", financialPeriods.size())); } view.getFinancialPeriodComboBoxModel().setObjects(financialPeriods); - + view.getFinancialPeriodComboBoxModel().setSelectedItem(financialPeriods.get(0)); + // update transactions updateFinancialTransactions(); } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-06-22 13:03:22 UTC (rev 3470) @@ -39,4 +39,5 @@ # package level log4j.logger.org.chorem.lima=INFO log4j.logger.org.chorem.lima.business.ejb=DEBUG -log4j.logger.org.chorem.lima.ui.account=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.account=DEBUG +log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG \ No newline at end of file

1 0

r3469 - 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/financialtransaction
by mallon＠users.chorem.org 21 Jun '12

21 Jun '12

Author: mallon Date: 2012-06-21 16:38:23 +0200 (Thu, 21 Jun 2012) New Revision: 3469 Url: http://chorem.org/repositories/revision/lima/3469 Log: La suppression d'une transaction ne g?\195?\169n?\195?\168re plus d'erreurs, et les entr?\195?\169es correspondantes sont bien supprim?\195?\169es. Modified: 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/financialtransaction/FinancialTransactionViewHandler.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-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -255,15 +255,18 @@ * call accounting rules */ @Override - public void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { + public void removeFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { // check if the financial period is blocked AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); - accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialtransaction); + accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction); try { + FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - transactionDAO.delete(financialtransaction); + FinancialTransaction financialTransactionOld = transactionDAO.findByTopiaId(financialTransaction.getTopiaId()); + transactionDAO.delete(financialTransactionOld); + } catch (Exception ex) { throw new LimaException("Can't remove financial transaction", ex); } 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-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -163,7 +163,7 @@ "endDate", endDate, "entryBook", entryBook); return entries; } - + /** * Retourne la somme des entrées des transaction entre * deux dates pour un journal donné. 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-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -246,7 +246,7 @@ return result; } - + /** * Search financial transaction. * 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-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -30,6 +30,7 @@ import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -426,8 +427,14 @@ if (response == JOptionPane.YES_OPTION) { if (selectedValue instanceof FinancialTransaction) { - FinancialTransaction currentTransaction = - (FinancialTransaction) selectedValue; + FinancialTransaction currentTransaction = (FinancialTransaction) selectedValue; + + //must delete the entries of the deleted transaction + Collection<Entry> entries = currentTransaction.getEntry(); + for (Entry entry : entries){ + tableModel.deleteRow(tableModel.indexOf(entry)); + } + financialTransactionService.removeFinancialTransaction(currentTransaction); } else if (selectedValue instanceof Entry) {

1 0

r3468 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: common financialtransaction
by mallon＠users.chorem.org 21 Jun '12

21 Jun '12

Author: mallon Date: 2012-06-21 14:49:13 +0200 (Thu, 21 Jun 2012) New Revision: 3468 Url: http://chorem.org/repositories/revision/lima/3468 Log: Une transaction ne peut maintenant plus ?\195?\170tre ajout?\195?\169e sans avoir s?\195?\169lectionn?\195?\169e de p?\195?\169riode comptable (P?\195?\169riode comptable par d?\195?\169faut.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java 2012-06-21 12:36:51 UTC (rev 3467) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java 2012-06-21 12:49:13 UTC (rev 3468) @@ -37,4 +37,17 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6991293987668268456L; + + + /*By default, selection of the first financial period (Because a + * transaction concern one financial period) + */ + @Override + public Object getElementAt(int index) { + if (getSelectedItem() == null){ + setSelectedItem(objects.get(0)); + return objects.get(0); + } + return objects.get(index); + } } 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-06-21 12:36:51 UTC (rev 3467) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 12:49:13 UTC (rev 3468) @@ -283,16 +283,16 @@ /** * Add new transaction. */ - public void addFinancialTransaction() { - FinancialTransactionTable table = view.getFinancialTransactionTable(); - ListSelectionModel selectionModel = table.getSelectionModel(); - addFinancialTransactionAfterService(); - //select the new line - int numberRow = table.getRowCount(); - selectionModel.setSelectionInterval(numberRow - 1, numberRow - 1); - //focus on first column - table.changeSelection(numberRow, 0, false, false); - table.scrollCellToVisible(numberRow, 0); + public void addFinancialTransaction() { + FinancialTransactionTable table = view.getFinancialTransactionTable(); + ListSelectionModel selectionModel = table.getSelectionModel(); + addFinancialTransactionAfterService(); + //select the new line + int numberRow = table.getRowCount()-1; + selectionModel.setSelectionInterval(numberRow, numberRow); + //focus on first column + table.changeSelection(numberRow, 0, false, false); + table.scrollCellToVisible(numberRow, 0); } /** @@ -302,8 +302,8 @@ FinancialPeriod financialPeriod = (FinancialPeriod)view.getFinancialPeriodComboBox().getSelectedItem(); EntryBook entryBook = (EntryBook)view.getEntryBookComboBox().getSelectedItem(); - FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); - + FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransaction financialTransaction = new FinancialTransactionImpl(); // can be defined later by user if (entryBook != null) {

1 0

r3467 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/common
by mallon＠users.chorem.org 21 Jun '12

21 Jun '12

Author: mallon Date: 2012-06-21 14:36:51 +0200 (Thu, 21 Jun 2012) New Revision: 3467 Url: http://chorem.org/repositories/revision/lima/3467 Log: Correction concernant la s?\195?\169lection par d?\195?\169faut du premier journal ouvert. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 12:28:00 UTC (rev 3466) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 12:36:51 UTC (rev 3467) @@ -43,7 +43,7 @@ */ @Override public Object getElementAt(int index) { - if (selectedObject == null){ + if (getSelectedItem() == null){ setSelectedItem(objects.get(0)); return objects.get(0); }

1 0

r3466 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/common
by mallon＠users.chorem.org 21 Jun '12

21 Jun '12

Author: mallon Date: 2012-06-21 14:28:00 +0200 (Thu, 21 Jun 2012) New Revision: 3466 Url: http://chorem.org/repositories/revision/lima/3466 Log: Correction concernant la s?\195?\169lection par d?\195?\169faut du premier journal dans la saisie des ?\195?\169critures Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 12:28:00 UTC (rev 3466) @@ -45,7 +45,6 @@ private static final long serialVersionUID = 4778917695588663498L; protected List<E> objects; - protected Object selectedObject = super.getSelectedItem(); @Override public int getSize() {

1 0

r3465 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/common java/org/chorem/lima/ui/financialtransaction resources/i18n
by mallon＠users.chorem.org 21 Jun '12

21 Jun '12

Author: mallon Date: 2012-06-21 13:45:00 +0200 (Thu, 21 Jun 2012) New Revision: 3465 Url: http://chorem.org/repositories/revision/lima/3465 Log: D?\195?\169sormais, au sein du panneau de saisie des ?\195?\169critures, si aucun journal n'est ouvert, il est impossible d'ajouter une transaction; et un message indique ?\195?\160 l'utilisateur qu'il doit d'abord cr?\195?\169er un journal. De plus, lorsqu'au moins un journal est ouvert, celui-ci est s?\195?\169lectionn?\195?\169 par d?\195?\169faut au sein de la liste d?\195?\169roulante. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/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-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -37,4 +37,16 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6991293987668268456L; + + /*By default, selection of the first entryBook (Because a + * transaction without an entrybook is forbidden) + */ + @Override + public Object getElementAt(int index) { + if (selectedObject == null){ + setSelectedItem(objects.get(0)); + return objects.get(0); + } + return objects.get(index); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -45,7 +45,8 @@ private static final long serialVersionUID = 4778917695588663498L; protected List<E> objects; - + protected Object selectedObject = super.getSelectedItem(); + @Override public int getSize() { int result = 0; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-21 11:45:00 UTC (rev 3465) @@ -34,6 +34,7 @@ <FinancialTransactionViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedRow" javaBean="false"/> + <Boolean id="noEntryBooks" javaBean="false"/> <script> <![CDATA[ @@ -51,7 +52,8 @@ <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onItemStateChanged="handler.fiscalPeriodSelected(event)"/> + onItemStateChanged="handler.fiscalPeriodSelected(event)" + enabled="{isNoEntryBooks()}"/> </cell> <cell anchor="east"> <JLabel text="lima.ui.financialtransaction.financialperiod" labelFor='{financialPeriodComboBox}'/> @@ -62,11 +64,14 @@ <JComboBox id="financialPeriodComboBox" model="{financialPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" - onItemStateChanged="handler.financialPeriodSelected(event)"/> + onItemStateChanged="handler.financialPeriodSelected(event)" + enabled="{isNoEntryBooks()}"/> <JButton id="back" text="lima.ui.financialtransaction.buttonback" - onActionPerformed="handler.back(financialPeriodComboBox)"/> + onActionPerformed="handler.back(financialPeriodComboBox)" + enabled="{isNoEntryBooks()}"/> <JButton id="next" text="lima.ui.financialtransaction.buttonnext" - onActionPerformed="handler.next(financialPeriodComboBox)"/> + onActionPerformed="handler.next(financialPeriodComboBox)" + enabled="{isNoEntryBooks()}"/> </JPanel> </cell> <cell anchor="east"> @@ -76,7 +81,8 @@ <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" - onItemStateChanged="handler.entryBookSelected(event)"/> + onItemStateChanged="handler.entryBookSelected(event)" + enabled="{isNoEntryBooks()}"/> </cell> </row> <row> @@ -88,7 +94,8 @@ <JButton text="lima.common.paste" enabled="{isSelectedRow()}" onActionPerformed="handler.pasteRow(financialTransactionTable.getSelectedRow())"/> <JButton text="lima.entries.addTransaction" - onActionPerformed="handler.addFinancialTransaction()"/> + onActionPerformed="handler.addFinancialTransaction()" + enabled="{isNoEntryBooks()}"/> <JButton text="lima.entries.addEntry" enabled="{isSelectedRow()}" onActionPerformed="handler.addEntry()"/> <JButton text="lima.common.remove" enabled="{isSelectedRow()}" 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-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -94,27 +94,47 @@ LimaServiceFactory.addServiceListener(ImportService.class, this); } + //impossible to add transaction without entrybook + public boolean controlEntryBook(){ + boolean result = true; + + if (entryBookService.getAllEntryBooks().isEmpty()){ + JOptionPane.showMessageDialog(view, _("lima.ui.financialtransaction.messagenoentrybooks"), + _("lima.ui.financialtransaction.titlenoentrybooks"), JOptionPane.ERROR_MESSAGE); + result = false; + }else{ + result=true; + } + + view.setNoEntryBooks(result); + return result; + } + /** * Init all combo box in view. */ public void init() { - // fiscal periods - List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); + if (controlEntryBook()){ + + // fiscal periods + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); + view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); + } + if (!fiscalPeriods.isEmpty()) { + view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); + } + + // entry books + List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); + view.getEntryBookComboBoxModel().setObjects(allEntryBooks); + + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); + } } - if (!fiscalPeriods.isEmpty()) { - view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); - } - - // entry books - List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); - view.getEntryBookComboBoxModel().setObjects(allEntryBooks); - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); - } } /** @@ -266,8 +286,7 @@ public void addFinancialTransaction() { FinancialTransactionTable table = view.getFinancialTransactionTable(); ListSelectionModel selectionModel = table.getSelectionModel(); - - addFinancialTransaction2(); + addFinancialTransactionAfterService(); //select the new line int numberRow = table.getRowCount(); selectionModel.setSelectionInterval(numberRow - 1, numberRow - 1); @@ -279,7 +298,7 @@ /** * Add new transaction after calling service. */ - public void addFinancialTransaction2() { + public void addFinancialTransactionAfterService() { FinancialPeriod financialPeriod = (FinancialPeriod)view.getFinancialPeriodComboBox().getSelectedItem(); EntryBook entryBook = (EntryBook)view.getEntryBookComboBox().getSelectedItem(); 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-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-21 11:45:00 UTC (rev 3465) @@ -250,8 +250,10 @@ lima.ui.financialtransaction.financialperiod= lima.ui.financialtransaction.fiscalyear= lima.ui.financialtransaction.letter= +lima.ui.financialtransaction.messagenoentrybooks=At least one entry books must to be opened to create the corresponding transactions lima.ui.financialtransaction.messageremoveentry= lima.ui.financialtransaction.messageremovetransaction= +lima.ui.financialtransaction.titlenoentrybooks=No entry books opened lima.ui.financialtransaction.titleremoveentry= lima.ui.financialtransaction.titleremovetransaction= lima.ui.financialtransaction.voucher= 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-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-21 11:45:00 UTC (rev 3465) @@ -250,8 +250,10 @@ lima.ui.financialtransaction.financialperiod=Périodes comptables lima.ui.financialtransaction.fiscalyear=Exercices lima.ui.financialtransaction.letter=Lettre +lima.ui.financialtransaction.messagenoentrybooks=Au moins un journal doit être ouvert pour créer les transactions correspondantes lima.ui.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? lima.ui.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? +lima.ui.financialtransaction.titlenoentrybooks=Aucun journal ouvert lima.ui.financialtransaction.titleremoveentry=Suppression lima.ui.financialtransaction.titleremovetransaction=Suppression lima.ui.financialtransaction.voucher=Pièce comptable

1 0

r3464 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 20 Jun '12

20 Jun '12

Author: mallon Date: 2012-06-20 17:14:10 +0200 (Wed, 20 Jun 2012) New Revision: 3464 Url: http://chorem.org/repositories/revision/lima/3464 Log: Lorsqu'un exercice est clot, la table est maintenant correctement mise ?\195?\160 jour. 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/FiscalPeriodViewHandler.java 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-06-20 14:45:14 UTC (rev 3463) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 15:14:10 UTC (rev 3464) @@ -147,6 +147,7 @@ public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { int row = fiscalPeriods.indexOf(fiscalPeriod); + fiscalPeriods.set(row, fiscalPeriod); fireTableRowsInserted(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-06-20 14:45:14 UTC (rev 3463) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 15:14:10 UTC (rev 3464) @@ -203,7 +203,7 @@ */ public void blockFiscalPeriod() { JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTableModel(); int selectedRow = fiscalPeriodeTable.getSelectedRow(); FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow);

1 0

r3463 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 20 Jun '12

20 Jun '12

Author: mallon Date: 2012-06-20 16:45:14 +0200 (Wed, 20 Jun 2012) New Revision: 3463 Url: http://chorem.org/repositories/revision/lima/3463 Log: Correction concernant la cl?\195?\180ture d'un exercice. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.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-06-20 14:20:05 UTC (rev 3462) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 14:45:14 UTC (rev 3463) @@ -176,7 +176,7 @@ /** * Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française. * - * On ne peut pas clore la dernière period comptable ouverte, si la précédente ne l'est pas. + * On ne peut pas clore la dernière periode comptable ouverte. */ @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException { @@ -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-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-06-20 14:20:05 UTC (rev 3462) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 14:45:14 UTC (rev 3463) @@ -146,21 +146,6 @@ } public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - /*List<FinancialTransaction> financialTransactionsUnbal = - financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); - if (financialTransactionsUnbal.size() > 0) { - JFrame f = new JFrame(); - f.setIconImage(Resource.getIcon("icons/lima.png").getImage()); - JOptionPane.showMessageDialog( - f, - _("lima.fiscalperiod.unbalancedtransactions"), - _("lima.common.error"), - JOptionPane.ERROR_MESSAGE); - f.dispose(); - } else { - fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); - refresh(); - }*/ int row = fiscalPeriods.indexOf(fiscalPeriod); fireTableRowsInserted(row, row); }

1 0