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

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

r3458 - trunk/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 16:45:12 +0200 (Tue, 19 Jun 2012) New Revision: 3458 Url: http://chorem.org/repositories/revision/lima/3458 Log: Correction concernant la gestion des boutons de suppression et de cloture des exercices ('onMouseClicked' supprim?\195?\169, et d?\195?\169placement de la m?\195?\169thode de gestion des boutons dans le handler.). 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/FiscalPeriodViewHandler.java 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:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) @@ -34,30 +34,7 @@ <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> - <script><![CDATA[ - import static org.nuiton.i18n.I18n._; - - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - int selectedRow = fiscalPeriodTable.getSelectedRow(); - - Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); - - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture - { - blockButton.setEnabled(false); - deleteButton.setEnabled(false); - } - else - { - blockButton.setEnabled(true); - deleteButton.setEnabled(true); - } - } - + <script><![CDATA[ void $afterCompleteSetup() { getHandler().init(); } @@ -72,11 +49,10 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> + onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </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:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:45:12 UTC (rev 3458) @@ -109,9 +109,20 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - if (fiscalPeriod != null) { - int response = JOptionPane.YES_OPTION; - if (response == checkTimeFiscalPeriod(fiscalPeriod)) { + if (fiscalPeriod != null) { + + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + if (response == JOptionPane.YES_OPTION) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -280,19 +291,26 @@ } } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton(){ - return response; - } - + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + + Object valueColumnClos = model.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + 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 + } + } + }

1 0

r3457 - trunk/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 16:15:41 +0200 (Tue, 19 Jun 2012) New Revision: 3457 Url: http://chorem.org/repositories/revision/lima/3457 Log: Gestion des boutons de suppression et de cloture d'exercice : les boutons n'appara?\195?\174ssent plus pour les exercices clots. 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/FiscalPeriodViewHandler.java 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 12:14:39 UTC (rev 3456) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:15:41 UTC (rev 3457) @@ -28,13 +28,36 @@ <import> javax.swing.ListSelectionModel org.chorem.lima.entity.FiscalPeriod - org.chorem.lima.entity.FinancialPeriod + org.chorem.lima.entity.FinancialPeriod </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> <script><![CDATA[ + import static org.nuiton.i18n.I18n._; + + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton() + { + int selectedRow = fiscalPeriodTable.getSelectedRow(); + + Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture + { + blockButton.setEnabled(false); + deleteButton.setEnabled(false); + } + else + { + blockButton.setEnabled(true); + deleteButton.setEnabled(true); + } + } + void $afterCompleteSetup() { getHandler().init(); } @@ -49,6 +72,7 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" + onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" 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 12:14:39 UTC (rev 3456) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:15:41 UTC (rev 3457) @@ -280,32 +280,6 @@ } } - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - System.out.println("reloadEnablingButton"); - - //get the fiscal period selected - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); - FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(fiscalPeriodeTable.getSelectedRow()); - - if (selectedFiscalPeriod.getLocked()) - { - System.out.println("Fiscal period closed"); - view.getBlockButton().setEnabled(false); - view.getDeleteButton().setEnabled(false); - } - else - { - System.out.println("Fiscal period opened"); - view.getBlockButton().setEnabled(true); - view.getDeleteButton().setEnabled(true); - } - } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ //check if fiscalperiod have 12 months, ask a confirmation int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(),

1 0

r3456 - 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 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 14:14:39 +0200 (Tue, 19 Jun 2012) New Revision: 3456 Url: http://chorem.org/repositories/revision/lima/3456 Log: Correction de la gestion des boutons des exercices (Modification, suppression) 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 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 08:57:25 UTC (rev 3455) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -131,6 +131,7 @@ addDays(dateLastFiscalPeriod, 1); dateLastFiscalPeriod = DateUtils.truncate(dateLastFiscalPeriod, Calendar.DATE); Date dateFiscalPeriod = fiscalPeriod.getBeginDate(); + if (dateLastFiscalPeriod.compareTo(dateFiscalPeriod) != 0) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.newfiscalperiodadjoiningerror")); } @@ -216,6 +217,7 @@ } + /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * <p/> 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 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -134,7 +134,7 @@ fiscalPeriods.remove(fiscalPeriod); fireTableRowsDeleted(row, row); } - + public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { /*List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); 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 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 12:14:39 UTC (rev 3456) @@ -47,9 +47,8 @@ <FiscalPeriodTable id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" - selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" + selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onActionPerformed="getHandler().reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" @@ -77,11 +76,4 @@ onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </row> - <row> - <cell fill="horizontal"> - <JButton id="modifyButton" text="lima.charts.fiscalperiod.delete" - enabled="{isSelectedPeriod()}" - onActionPerformed="getHandler().deleteFiscalPeriod()"/> - </cell> - </row> </Table> 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 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -109,19 +109,9 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - // null = cancel - if (fiscalPeriod != null) { - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } - if (response == JOptionPane.YES_OPTION) { + if (fiscalPeriod != null) { + int response = JOptionPane.YES_OPTION; + if (response == checkTimeFiscalPeriod(fiscalPeriod)) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -151,7 +141,7 @@ model.deleteFiscalPeriod(selectedFiscalPeriod); } } - + /** * Init add period view. * @@ -291,9 +281,44 @@ } /** - * manage + * Manage the differents buttons for fiscal period * */ - public void reloadEnablingButton(){ - + public void reloadEnablingButton() + { + System.out.println("reloadEnablingButton"); + + //get the fiscal period selected + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(fiscalPeriodeTable.getSelectedRow()); + + if (selectedFiscalPeriod.getLocked()) + { + System.out.println("Fiscal period closed"); + view.getBlockButton().setEnabled(false); + view.getDeleteButton().setEnabled(false); + } + else + { + System.out.println("Fiscal period opened"); + view.getBlockButton().setEnabled(true); + view.getDeleteButton().setEnabled(true); + } } + + private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + return response; + } + }

1 0

r3455 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 10:57:25 +0200 (Tue, 19 Jun 2012) New Revision: 3455 Url: http://chorem.org/repositories/revision/lima/3455 Log: L'ajout de plus de deux exercices avec des dates correctes est d?\195?\169sormais possible. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 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-18 16:31:34 UTC (rev 3454) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-19 08:57:25 UTC (rev 3455) @@ -83,7 +83,7 @@ */ public FiscalPeriod getLastFiscalPeriod() throws TopiaException { String query = "FROM " + FiscalPeriod.class.getName() + - " ORDER BY endDate"; + " ORDER BY endDate desc"; List<FiscalPeriod> fiscalPeriods = context.find(query); FiscalPeriod result = null;

1 0

r3454 - in trunk: lima-business/src/main/java/org/chorem/lima/business 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-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 18 Jun '12

18 Jun '12

Author: mallon Date: 2012-06-18 18:31:34 +0200 (Mon, 18 Jun 2012) New Revision: 3454 Url: http://chorem.org/repositories/revision/lima/3454 Log: La suppression des exercices(Ceux ouverts et vides) est d?\195?\169sormais possible, via un bouton de suppression, ajout?\195?\169 au panneau des gestion des exercices. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -73,6 +73,8 @@ List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; + + void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; /** * Entry rules 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -116,6 +116,12 @@ } + /** Rules to check before delete fiscals periods */ + @Override + public void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) + throws LimaException { + } + /** * Rules to check if an account and all his subaccount is not used * Recursive function @@ -401,4 +407,5 @@ throw new LimaException("Can't check financial transaction", ex); } } + } 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -37,6 +37,7 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodImpl; +import org.chorem.lima.entity.FinancialTransactionDAO; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.nuiton.topia.TopiaException; @@ -194,6 +195,28 @@ } /** + * Règles de vérification de supression d'un exercice, appliquées à la comptabilité française. + * + * On ne peut supprimer qu'une periode comptable ouverte vide. + */ + @Override + public void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaBusinessException { + + try { + + FinancialTransactionDAO financialTransactionDAO = getDaoHelper().getFinancialTransactionDAO(); + + //Check if the fiscal period to delete is empty + if (financialTransactionDAO.findAllByDates(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()).size() != 0) { + throw new LimaBusinessException(_("lima-business.franceaccountingrules.fiscalperiodnotempty")); + } + } 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/> * get all closedperiodicentrybook between the first financial period of fiscalperiod 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -58,6 +58,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; +import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryImpl; @@ -447,4 +449,49 @@ } } + @Override + /** + * to delete a fiscal period + * <p/> + * check localized rules before delete it + */ + public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) + throws LimaException { + + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + + try { + try { + //get entities with DAO + FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); + + // re-attach entities to current session + FiscalPeriod localFiscalPeriod = fiscalPeriodDAO.findByTopiaId(fiscalPeriod.getTopiaId()); + + //check rules + accountingRules.deleteFiscalPeriodRules(localFiscalPeriod); + + //all "ClosedPeriodicEntryBooks" for the fiscal period + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBookDAOList = closedPeriodicEntryBookDAO.findAllClosedPeriodicEntryBooksFromFiscalPeriod(localFiscalPeriod); + + //delete closedPeriodicEntryBook before fiscal period + for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookDAOList) { + // fix : ObjectDeletedException: deleted object would be re-saved by cascade (Need to delete association between entryBook and financial period via closedPeriodEntityBook) + closedPeriodicEntryBook.getEntryBook().removeFinancialPeriodClosedPeriodicEntryBook(closedPeriodicEntryBook); + closedPeriodicEntryBookDAO.delete(closedPeriodicEntryBook); + } + + fiscalPeriodDAO.delete(localFiscalPeriod); + + } catch (TopiaException ex) { + throw new LimaException("Can't find fiscal period", ex); + } + + } catch (Exception ex) { + throw new LimaException("Can't delete period", ex); + } + + } + } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -68,6 +68,7 @@ lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked +lima-business.franceaccountingrules.fiscalperiodnotempty=The fiscal period is not empty \! lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=The new fiscal period must adjoining the last lima-business.import.accountadded=SUCCES \: Account %s - %s added\n lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -67,8 +67,9 @@ lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de copte n'est pas numéric \: %s lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du copte général n'est pas compris entre 1 et 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=Les périodes financières précédentes pour ce journal doivent être bloquées avant -lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédante n'est pas bloquée -lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédante +lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédente n'est pas bloquée +lima-business.franceaccountingrules.fiscalperiodnotempty=La période fiscale à supprimer n'est pas vide \! +lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédente lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n lima-business.import.closedperiodicentrybookupdated=Succès \: La période financière %s - %s - %s est ajoutée \! \n Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -53,6 +53,8 @@ FiscalPeriod createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; + + void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; void addRetainedEarnings(FiscalPeriod fiscalPeriod, boolean newyear, Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -175,5 +175,23 @@ List<ClosedPeriodicEntryBook> result = context.find(query); return result; } + + /** + * Retourne les ClosedPeriodicEntryBook d'un exercice ouvert. + * + * @return les ClosedPeriodicEntryBook + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllClosedPeriodicEntryBooksFromFiscalPeriod(FiscalPeriod fiscalPeriod) throws TopiaException { + String query = "SELECT C FROM " + ClosedPeriodicEntryBook.class.getName() + " C" + + ", " + FiscalPeriod.class.getName() + " F" + + " WHERE C.financialPeriod IN ELEMENTS (F.financialPeriod)" + + " AND F = :fiscalPeriod" + + " ORDER BY C.financialPeriod.beginDate"; + + List<ClosedPeriodicEntryBook> result = context.find(query, "fiscalPeriod", fiscalPeriod); + return result; + } + } 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -112,5 +112,5 @@ } return result; - } + } } 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -129,6 +129,12 @@ fireTableRowsInserted(row, row); } + public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) { + int row = fiscalPeriods.indexOf(fiscalPeriod); + fiscalPeriods.remove(fiscalPeriod); + fireTableRowsDeleted(row, row); + } + public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { /*List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-18 16:31:34 UTC (rev 3454) @@ -48,7 +48,9 @@ id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" - columnControlVisible="true"/> + columnControlVisible="true" + onActionPerformed="getHandler().reloadEnablingButton()" + /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> @@ -68,4 +70,18 @@ onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> + <row> + <cell fill="horizontal"> + <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" + enabled="{isSelectedPeriod()}" + onActionPerformed="getHandler().deleteFiscalPeriod()"/> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JButton id="modifyButton" text="lima.charts.fiscalperiod.delete" + enabled="{isSelectedPeriod()}" + onActionPerformed="getHandler().deleteFiscalPeriod()"/> + </cell> + </row> </Table> Added: 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -129,6 +129,30 @@ } /** + * Undisplay period and perform delete. + */ + public void deleteFiscalPeriod() { + + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + + //check if the user want to delete the fiscal year + int response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.delete.confirmation"), + _("lima.ui.fiscalperiod.delete.title"), JOptionPane.YES_NO_OPTION, + JOptionPane.WARNING_MESSAGE); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); + + if (response == JOptionPane.YES_OPTION) { + fiscalPeriodService.deleteFiscalPeriod(selectedFiscalPeriod); + + model.deleteFiscalPeriod(selectedFiscalPeriod); + } + } + + /** * Init add period view. * * @param addPeriod view to init @@ -265,4 +289,11 @@ loadAllFiscalPeriod(); } } + + /** + * manage + * */ + public void reloadEnablingButton(){ + + } } 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-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -25,6 +25,7 @@ lima.charts.fiscalperiod.add=Add fiscalperiod lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod +lima.charts.fiscalperiod.delete=Delete fiscalperiod lima.charts.fiscalyear=Fiscal Years lima.charts.vatpdf=PDF structure lima.charts.vatstatement=VAT statement chart @@ -263,6 +264,8 @@ lima.ui.fiscalperiod.block.title= lima.ui.fiscalperiod.closed= lima.ui.fiscalperiod.closure= +lima.ui.fiscalperiod.delete.confirmation= +lima.ui.fiscalperiod.delete.title= lima.ui.fiscalperiod.fiscalperiod= lima.ui.fiscalperiod.open= lima.ui.home.account= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -25,6 +25,7 @@ lima.charts.fiscalperiod.add=Nouvel exercice lima.charts.fiscalperiod.block=Cloturer un exercice lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice +lima.charts.fiscalperiod.delete=Supprimer un exercice lima.charts.fiscalyear=Exercices lima.charts.vatpdf=Structure du pdf lima.charts.vatstatement=Plan TVA @@ -263,6 +264,8 @@ lima.ui.fiscalperiod.block.title=Cloture de l'exercice lima.ui.fiscalperiod.closed=Cloturé lima.ui.fiscalperiod.closure=Cloture +lima.ui.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! +lima.ui.fiscalperiod.delete.title=Suppression de l'exercice lima.ui.fiscalperiod.fiscalperiod=Exercice lima.ui.fiscalperiod.open=Ouvert lima.ui.home.account=Plan comptable

1 0

r3453 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by echatellier＠users.chorem.org 07 Jun '12

07 Jun '12

Author: echatellier Date: 2012-06-07 16:14:32 +0200 (Thu, 07 Jun 2012) New Revision: 3453 Url: http://chorem.org/repositories/revision/lima/3453 Log: Uncomment code (just for testing) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-07 08:04:04 UTC (rev 3452) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-07 14:14:32 UTC (rev 3453) @@ -187,16 +187,13 @@ } //shows error message to user if the fiscalPeriod is unblocked - //FIXME echatellier 20120605 why ? - // ui is only filled with non blocked periods, else case - // can NEVER happen - /*if (error) { + if (error) { JOptionPane.showMessageDialog( view, _("lima.entrybooksreports.documentcreationfiscalerror"), _("lima.entrybooksreports.documentcreationfiscaltitle"), JOptionPane.ERROR_MESSAGE); - } else {*/ + } else { int port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); @@ -222,7 +219,7 @@ } catch (URISyntaxException e) { log.error("Can't create news URI", e); } - //} + } } }

1 0