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

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

r3462 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-callao/src/main/java/org/chorem/lima/entity 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:20:05 +0200 (Wed, 20 Jun 2012) New Revision: 3462 Url: http://chorem.org/repositories/revision/lima/3462 Log: Si deux exercices sont ouverts, la r?\195?\168gle indiquant que le dernier ne doit pas ?\195?\170tre cl?\195?\180t avant le pr?\195?\169c?\195?\169dent est maintenant respect?\195?\169e. Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.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/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 12:43:59 UTC (rev 3461) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -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. + * On ne peut pas clore la dernière period comptable ouverte, si la précédente ne l'est pas. */ @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-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-20 12:43:59 UTC (rev 3461) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -103,7 +103,7 @@ public FiscalPeriod getLastUnlockedFiscalPeriod() throws TopiaException { String query = "FROM " + FiscalPeriod.class.getName() + " WHERE locked = false" + - " ORDER BY endDate"; + " ORDER BY endDate desc"; List<FiscalPeriod> fiscalPeriods = context.find(query); FiscalPeriod result = null; Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml =================================================================== 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 12:43:59 UTC (rev 3461) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -202,9 +202,10 @@ * Block selected fiscal period after user confirmation. */ public void blockFiscalPeriod() { - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + int selectedRow = fiscalPeriodeTable.getSelectedRow(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); //check if the user want to block the fiscal year @@ -212,6 +213,7 @@ _("lima.ui.fiscalperiod.block.confirmation"), _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + if (response == JOptionPane.YES_OPTION) { //use to tell if the user wants to create a new fiscal year boolean newyear = false;

1 0

r3461 - 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 14:43:59 +0200 (Wed, 20 Jun 2012) New Revision: 3461 Url: http://chorem.org/repositories/revision/lima/3461 Log: Suppression d'affichages console inutiles. Modified: 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/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:38:11 UTC (rev 3460) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:43:59 UTC (rev 3461) @@ -36,7 +36,6 @@ import java.util.List; import javax.swing.JOptionPane; -import javax.swing.text.View; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -321,19 +320,13 @@ //no action possible for fiscal period closed if (!selectedFiscalPeriod.getLocked()){ enableBlock = true; - - System.out.println(" ! selectedFiscalPeriod.getLocked()"); - + //only an empty and open fiscal period may be deleted if (financialTransactionList.size() <= 0){ enableDelete = true; - System.out.println("open and financialTransactionList.size() <= 0"); - }else{ - enableDelete = false; - - System.out.println("open and financialTransactionList.size() > 0"); + enableDelete = false; } } }

1 0

r3460 - 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 14:38:11 +0200 (Wed, 20 Jun 2012) New Revision: 3460 Url: http://chorem.org/repositories/revision/lima/3460 Log: Un mod?\195?\168le d'UI pour la gestion des boutons des exercices (Cloture, suppression) a ?\195?\169t?\195?\169 rajout?\195?\169. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.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/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -0,0 +1,94 @@ +package org.chorem.lima.ui.fiscalperiod; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +import javax.swing.DefaultListSelectionModel; + +import org.chorem.lima.entity.FiscalPeriod; + +public class FiscalPeriodModelUI extends DefaultListSelectionModel { + + public static final String SELECTED_FISCAL_PERIOD_PROPERTY = "selectedFiscalPeriod"; + + public static final String BLOCK_ENABLED_PROPERTY = "blockEnabled"; + + public static final String DELETE_ENABLED_PROPERTY = "deleteEnabled"; + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + protected FiscalPeriodTableModel model; + + protected FiscalPeriod selectedFiscalPeriod; + protected boolean blockEnabled; + protected boolean deleteEnabled; + + public FiscalPeriodModelUI(FiscalPeriodTableModel model) { + this.model = model; + } + + public boolean isDeleteEnabled() { + return deleteEnabled; + } + + public boolean isBlockEnabled() { + return blockEnabled; + } + + public FiscalPeriod getSelectedFiscalPeriod() { + return selectedFiscalPeriod; + } + + public void setBlockEnabled(boolean blockEnabled) { + Boolean oldValue = isBlockEnabled(); + this.blockEnabled = blockEnabled; + firePropertyChange(BLOCK_ENABLED_PROPERTY, oldValue, blockEnabled); + } + + public void setDeleteEnabled(boolean deleteEnabled) { + Boolean oldValue = isDeleteEnabled(); + this.deleteEnabled = deleteEnabled; + firePropertyChange(DELETE_ENABLED_PROPERTY, oldValue, deleteEnabled); + } + + public void setSelectedFiscalPeriod(FiscalPeriod selectedFiscalPeriod) { + FiscalPeriod oldValue = getSelectedFiscalPeriod(); + this.selectedFiscalPeriod = selectedFiscalPeriod; + firePropertyChange(SELECTED_FISCAL_PERIOD_PROPERTY, oldValue, selectedFiscalPeriod); + + int rowToSelect = model.getRow(selectedFiscalPeriod); + super.setSelectionInterval(rowToSelect, rowToSelect); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + super.setSelectionInterval(index0, index1); + setSelectedFiscalPeriod(model.getFiscalPeriodAt(index0)); + } + + @Override + public int getSelectionMode() { + return SINGLE_SELECTION; + } + +} 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-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -71,10 +71,20 @@ } public FiscalPeriod getFiscalPeriodAt(int row) { + if (row == -1) { + return null; + } FiscalPeriod result = fiscalPeriods.get(row); return result; } + public int getRow(FiscalPeriod period) { + if (period == null) { + return -1; + } + return fiscalPeriods.indexOf(period); + } + @Override public String getColumnName(int columnIndex) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-20 12:38:11 UTC (rev 3460) @@ -32,7 +32,8 @@ </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> - <Boolean id="selectedPeriod" javaBean="false"/> + <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> + <FiscalPeriodModelUI id='model' constructorParams='fiscalPeriodTableModel'/> <script><![CDATA[ void $afterCompleteSetup() { @@ -43,16 +44,12 @@ <row> <cell fill="both" weightx="1" weighty="1" rows="5"> <JScrollPane> - <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> <FiscalPeriodTable id="fiscalPeriodTable" sortable="false" rowHeight="24" - constructorParams="getFiscalPeriodTableModel()" - selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" + constructorParams="getFiscalPeriodTableModel()" columnControlVisible="true" + selectionModel='{model}' /> - <ListSelectionModel - javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </cell> </row> @@ -65,12 +62,14 @@ <row> <cell fill="horizontal"> <JButton id="blockButton" text="lima.charts.fiscalperiod.block" + enabled="{getModel().isBlockEnabled()}" onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> <row> <cell fill="horizontal"> <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" + enabled="{getModel().isDeleteEnabled()}" onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </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-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -27,6 +27,8 @@ 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; @@ -34,6 +36,7 @@ import java.util.List; import javax.swing.JOptionPane; +import javax.swing.text.View; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -87,6 +90,15 @@ public void init() { loadAllFiscalPeriod(); + FiscalPeriodModelUI model = view.getModel(); + model.addPropertyChangeListener(FiscalPeriodModelUI.SELECTED_FISCAL_PERIOD_PROPERTY, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + FiscalPeriodModelUI model = (FiscalPeriodModelUI)evt.getSource(); + FiscalPeriod selectedFiscalPeriod = (FiscalPeriod)evt.getNewValue(); + reloadEnablingButton(model, selectedFiscalPeriod); + } + }); } /** @@ -294,39 +306,39 @@ /** * Manage the differents buttons for fiscal period * */ - public void reloadEnablingButton(){ + protected void reloadEnablingButton(FiscalPeriodModelUI model, FiscalPeriod selectedFiscalPeriod){ - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); - int selectedRow = fiscalPeriodeTable.getSelectedRow(); + boolean enableBlock = false; + boolean enableDelete = false; + - //when a fiscal period is deleted, no row is selected ('-1') - if (selectedRow != -1){ - FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); - - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); - List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); - - //no action possible for fiscal period closed - if (selectedFiscalPeriod.getLocked()){ - view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); - }else{ - view.blockButton.setEnabled(true); - - //only an empty fiscal period may be deleted - if (financialTransactionList.size() <= 0){ - view.deleteButton.setEnabled(true); - }else{ - view.deleteButton.setEnabled(false); - } - } - }else{ - //after an action (delete or closure), reinitialization at false - view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); + //when a fiscal period is deleted, no row is selected ('-1') + if (selectedFiscalPeriod != null){ + + //no action possible for fiscal period closed + if (!selectedFiscalPeriod.getLocked()){ + enableBlock = true; + + System.out.println(" ! selectedFiscalPeriod.getLocked()"); + + //only an empty and open fiscal period may be deleted + if (financialTransactionList.size() <= 0){ + enableDelete = true; + + System.out.println("open and financialTransactionList.size() <= 0"); + + }else{ + enableDelete = false; + + System.out.println("open and financialTransactionList.size() > 0"); + } + } } + model.setBlockEnabled(enableBlock); + model.setDeleteEnabled(enableDelete); } }

1 0

r3459 - 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
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 17:49:11 +0200 (Tue, 19 Jun 2012) New Revision: 3459 Url: http://chorem.org/repositories/revision/lima/3459 Log: Gestion des boutons de suppression et de cloture d'exercices : d?\195?\169sormais, les boutons apparaissent selon l'etat de l'exercie selectionn?\195?\169 (Clot / Ouvert et vide / Ouvert) 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/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.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-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -213,11 +213,9 @@ } } catch (TopiaException ex) { throw new LimaException("Can't check rule", ex); - } - - } + } + } - /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * <p/> 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-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -126,7 +126,24 @@ FinancialPeriod period) throws LimaException { return getAllFinancialTransactions(period, null); } + + /** + * Return the list of all financial transaction of a fiscal period. + */ + @Override + public List<FinancialTransaction> getAllFinancialTransactions( + FiscalPeriod period) throws LimaException { + List<FinancialTransaction> financialTransactions = null; + try { + FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); + financialTransactions = transactionDAO.findAllByDates(period.getBeginDate(), period.getEndDate()); + } catch (Exception ex) { + throw new LimaException("Can't get financial transactions", ex); + } + return financialTransactions; + } + /** * Return the list of all financial transaction of a financial period and an entrybook. */ 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-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -211,7 +211,7 @@ return result; } - + /** * to block a fiscal period * <p/> 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-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -55,7 +55,7 @@ void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException; - List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException; List<FinancialTransaction> getAllFinancialTransactions(Date beginDate, Date endDate) throws LimaException; @@ -65,6 +65,8 @@ List<FinancialTransaction> getAllFinancialTransactionsBalanced(FiscalPeriod fiscalPeriod) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactions(FiscalPeriod period) throws LimaException; + List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException; Entry createEntry(Entry entry) throws LimaException; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 15:49:11 UTC (rev 3459) @@ -65,14 +65,12 @@ <row> <cell fill="horizontal"> <JButton id="blockButton" text="lima.charts.fiscalperiod.block" - enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> <row> <cell fill="horizontal"> <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" - enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </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-19 14:45:12 UTC (rev 3458) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -300,17 +300,33 @@ FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); int selectedRow = fiscalPeriodeTable.getSelectedRow(); - - Object valueColumnClos = model.getValueAt(selectedRow, 1 ); - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + //when a fiscal period is deleted, no row is selected ('-1') + if (selectedRow != -1){ + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); + + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); + + //no action possible for fiscal period closed + if (selectedFiscalPeriod.getLocked()){ + view.blockButton.setEnabled(false); + view.deleteButton.setEnabled(false); + }else{ + view.blockButton.setEnabled(true); + + //only an empty fiscal period may be deleted + if (financialTransactionList.size() <= 0){ + view.deleteButton.setEnabled(true); + }else{ + view.deleteButton.setEnabled(false); + } + } + }else{ + //after an action (delete or closure), reinitialization at false view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); - }else{ - view.blockButton.setEnabled(true); - view.deleteButton.setEnabled(true); - //TODO : si l'exercice est non-vide, suppression reste a false - } + view.deleteButton.setEnabled(false); + } } }

1 0