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

r3153 - in trunk/src/site/rst: . devel
by echatellier＠users.chorem.org May 30, 2011

May 30, 2011

Author: echatellier Date: 2011-05-30 14:40:22 +0200 (Mon, 30 May 2011) New Revision: 3153 Url: http://chorem.org/repositories/revision/lima/3153 Log: Fix redmine download links Modified: trunk/src/site/rst/devel/server.rst trunk/src/site/rst/importexport.rst trunk/src/site/rst/install.rst Modified: trunk/src/site/rst/devel/server.rst =================================================================== --- trunk/src/site/rst/devel/server.rst 2011-05-30 12:31:14 UTC (rev 3152) +++ trunk/src/site/rst/devel/server.rst 2011-05-30 12:40:22 UTC (rev 3153) @@ -29,7 +29,7 @@ ------- Télécharger et lancer le module serveur de lima : -http://www.chorem.org/projects/list_files/lima +http://www.chorem.org/projects/lima/files Client ------ Modified: trunk/src/site/rst/importexport.rst =================================================================== --- trunk/src/site/rst/importexport.rst 2011-05-30 12:31:14 UTC (rev 3152) +++ trunk/src/site/rst/importexport.rst 2011-05-30 12:40:22 UTC (rev 3153) @@ -78,7 +78,7 @@ Une sauvegarde de démonstration au format CSV est (..disponible_) au téléchargement. -.. _disponible: http://chorem.org/projects/list_files/lima +.. _disponible: http://chorem.org/projects/lima/files @@ -125,4 +125,4 @@ L'export est effectué ! - \ No newline at end of file + Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-05-30 12:31:14 UTC (rev 3152) +++ trunk/src/site/rst/install.rst 2011-05-30 12:40:22 UTC (rev 3153) @@ -37,4 +37,4 @@ .. image:: screens/lima_splashscreen.png -.. _download: http://chorem.org/projects/list_files/lima \ No newline at end of file +.. _download: http://chorem.org/projects/lima/files

1 0

r3152 - trunk/src/site
by echatellier＠users.chorem.org May 30, 2011

May 30, 2011

Author: echatellier Date: 2011-05-30 14:31:14 +0200 (Mon, 30 May 2011) New Revision: 3152 Url: http://chorem.org/repositories/revision/lima/3152 Log: Fix redmine download link Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-05-30 09:06:51 UTC (rev 3151) +++ trunk/src/site/site_fr.xml 2011-05-30 12:31:14 UTC (rev 3152) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -43,7 +43,7 @@ <item name="Présentation" href="presentation.html"/> <item name="Fonctionnalités" href="features.html"/> <item name="Lancer Lima en ligne" href="lima-main/jnlp/launch.jnlp" /> - <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> + <item name="Téléchargements" href="http://www.chorem.org/projects/lima/files" /> <item name="Contacts" href="contact.html" /> <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> </menu>

1 0

r3151 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 30, 2011

May 30, 2011

Author: vsalaun Date: 2011-05-30 11:06:51 +0200 (Mon, 30 May 2011) New Revision: 3151 Url: http://chorem.org/repositories/revision/lima/3151 Log: prevents illegal unicode characters to show up Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-30 08:55:09 UTC (rev 3150) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-30 09:06:51 UTC (rev 3151) @@ -53,7 +53,7 @@ // the editor should return a BigDecimal public Object getCellEditorValue() { String textValue = textField.getText().trim(); - //replace all comma by fullstop + //replace all comma by full stop textValue = textValue.replaceAll(",", "."); if (textValue.equals("")) { return BigDecimal.ZERO; @@ -116,8 +116,16 @@ @Override public void keyReleased(KeyEvent e) { if (keyPressed == false) { - textField.setText(String.valueOf(e.getKeyChar())); - keyPressed = true; + if ((e.getKeyCode() >= KeyEvent.VK_0 + && e.getKeyCode() <= KeyEvent.VK_9) + || e.getKeyCode() == KeyEvent.VK_COMMA + || e.getKeyCode() == KeyEvent.VK_PERIOD) { + textField.setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } else if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE){ + textField.setText(""); + keyPressed = true; + } } }

1 0

r3150 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 30, 2011

May 30, 2011

Author: vsalaun Date: 2011-05-30 10:55:09 +0200 (Mon, 30 May 2011) New Revision: 3150 Url: http://chorem.org/repositories/revision/lima/3150 Log: shortcut for dates Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-27 12:29:39 UTC (rev 3149) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-30 08:55:09 UTC (rev 3150) @@ -25,6 +25,7 @@ package org.chorem.lima.ui.celleditor; +import org.apache.commons.lang.time.DateUtils; import org.chorem.lima.LimaContext; import org.jdesktop.swingx.JXDatePicker; @@ -53,6 +54,7 @@ private static final long serialVersionUID = 1L; private static DateTableCellEditor editor; private boolean keyPressed; + private Date date; /** * constructor @@ -69,12 +71,34 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { if (value instanceof Date) { datePicker.setDate((Date) value); + date = (Date) value; } return datePicker; } @Override public Object getCellEditorValue() { + if (!datePicker.getEditor().getText().isEmpty()) { + String[] str = datePicker.getEditor().getText().split("/"); + //day + if (str.length > 0) { + if (str[0].contains(" ")) { + String[] string = str[0].split(" "); + date = DateUtils.setDays(date, Integer.valueOf(string[1])); + } else { + date = DateUtils.setDays(date, Integer.valueOf(str[0])); + } + } + //month + if (str.length > 1) { + date = DateUtils.setMonths(date, Integer.valueOf(str[1])-1); + } + //year + if (str.length > 2) { + date = DateUtils.setYears(date, Integer.valueOf(str[2])); + } + } + datePicker.setDate(date); return datePicker.getDate(); } @@ -139,7 +163,6 @@ keyPressed = true; } else if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE){ - datePicker.getEditor().setText(""); keyPressed = true; } }

1 0

r3149 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod
by vsalaun＠users.chorem.org May 27, 2011

May 27, 2011

Author: vsalaun Date: 2011-05-27 14:29:39 +0200 (Fri, 27 May 2011) New Revision: 3149 Url: http://chorem.org/repositories/revision/lima/3149 Log: #400 empeche la reorganisation automatique des periodes comptables Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2011-05-27 12:09:14 UTC (rev 3148) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2011-05-27 12:29:39 UTC (rev 3149) @@ -28,6 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; @@ -37,6 +38,7 @@ import org.chorem.lima.business.ImportServiceMonitorable; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.utils.FinancialPeriodComparator; import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; @@ -63,7 +65,7 @@ protected FinancialPeriodServiceMonitorable financialPeriodService; /** Datas cache */ - protected List<ClosedPeriodicEntryBook> cacheDataList; + protected List<Object> cacheDataList; public FinancialPeriodTableModel() { financialPeriodService = @@ -78,7 +80,13 @@ @Override public int getRowCount() { - return cacheDataList.size(); + int result = 0; + + if (cacheDataList != null) { + result = cacheDataList.size(); + } + + return result; } @@ -122,7 +130,7 @@ } public ClosedPeriodicEntryBook getFinancialPeriodAtRow(int row) throws LimaException { - return cacheDataList.get(row); + return (ClosedPeriodicEntryBook) cacheDataList.get(row); } @@ -138,7 +146,7 @@ Object result = null; ClosedPeriodicEntryBook closedPeriodicEntryBook - = cacheDataList.get(rowIndex); + = (ClosedPeriodicEntryBook) cacheDataList.get(rowIndex); if (closedPeriodicEntryBook != null){ EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); @@ -169,33 +177,38 @@ return result; } - public void getDataList(){ - List<ClosedPeriodicEntryBook> results = - new ArrayList<ClosedPeriodicEntryBook>(); + public List<Object> getDataList(){ + List<Object> results = + new ArrayList<Object>(); try { - results = financialPeriodService.//getAllClosedPeriodicEntryBooks(); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBook = financialPeriodService.//getAllClosedPeriodicEntryBooks(); getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); + Collections.sort(closedPeriodicEntryBook, new FinancialPeriodComparator()); + results.addAll(closedPeriodicEntryBook); } catch (LimaException eee){ if (log.isDebugEnabled()){ log.debug("Can't get closedperiodicentrybook list", eee ); } } - cacheDataList=results; + return results; } + public void refresh(){ + cacheDataList = getDataList(); + fireTableDataChanged(); + } + public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { financialPeriodService. blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - getDataList(); - fireTableDataChanged(); + refresh(); } @Override public void notifyMethod(String serviceName, String methodeName) { if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll")){ - getDataList(); - fireTableDataChanged(); + refresh(); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2011-05-27 12:09:14 UTC (rev 3148) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2011-05-27 12:29:39 UTC (rev 3149) @@ -25,20 +25,26 @@ <Table> <FinancialPeriodViewHandler id="handler" javaBean="new FinancialPeriodViewHandler(this)" /> - <org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel id="modelFinancialPeriodTable"/> - <Boolean id="selectedPeriod" javaBean="false" /> - <script> + + <script> <![CDATA[ - getModelFinancialPeriodTable().getDataList(); + import org.chorem.lima.entity.FiscalPeriod; + import org.chorem.lima.entity.FinancialPeriod; + + void $afterCompleteSetup() { + getHandler().refresh(); + } ]]> </script> <row> <cell fill="both" weightx="1" weighty="1"> <JScrollPane> + <org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel + id="modelFinancialPeriodTable"/> <org.chorem.lima.ui.financialperiod.FinancialPeriodTable - id="financialPeriodTable" rowHeight="24" + id="financialPeriodTable" sortable="false" rowHeight="24" constructorParams="getHandler()" model="{getModelFinancialPeriodTable()}" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" /> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2011-05-27 12:09:14 UTC (rev 3148) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2011-05-27 12:29:39 UTC (rev 3149) @@ -51,6 +51,10 @@ protected FinancialPeriodView view; + protected FinancialPeriodTable table; + + protected FinancialPeriodTableModel tableModel; + protected FinancialPeriodViewHandler(FinancialPeriodView view) { this.view = view; } @@ -80,4 +84,9 @@ public FinancialPeriodView getView() { return view; } + + public void refresh() { + tableModel = (FinancialPeriodTableModel)getView().getFinancialPeriodTable().getModel(); + tableModel.refresh(); + } }

1 0

r3148 - trunk/lima-business/src/main/java/org/chorem/lima/business/utils
by vsalaun＠users.chorem.org May 27, 2011

May 27, 2011

Author: vsalaun Date: 2011-05-27 14:09:14 +0200 (Fri, 27 May 2011) New Revision: 3148 Url: http://chorem.org/repositories/revision/lima/3148 Log: #400 adding FinancialPeriodComparator Added: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java Added: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java 2011-05-27 12:09:14 UTC (rev 3148) @@ -0,0 +1,30 @@ +package org.chorem.lima.business.utils; + +import java.io.Serializable; +import java.util.Comparator; + +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.apache.commons.logging.Log; + +public class FinancialPeriodComparator implements Serializable, Comparator<ClosedPeriodicEntryBook> { + + private static final long serialVersionUID = 1L; + + private static final Log log = + LogFactory.getLog(FinancialPeriodComparator.class); + + @Override + public int compare(ClosedPeriodicEntryBook o1, ClosedPeriodicEntryBook o2) { + if (o1.getFinancialPeriod().getBeginDate().compareTo(o2.getFinancialPeriod().getBeginDate()) == 0) { + if (o1.getEntryBook().getLabel().compareToIgnoreCase(o2.getEntryBook().getLabel()) == 0) { + return o1.getTopiaCreateDate().compareTo(o2.getTopiaCreateDate()); + } else { + return o1.getEntryBook().getCode().compareToIgnoreCase(o2.getEntryBook().getCode()); + } + } else { + return o1.getFinancialPeriod().getBeginDate().compareTo(o2.getFinancialPeriod().getBeginDate()); + } + } + +}

1 0

r3147 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by vsalaun＠users.chorem.org May 27, 2011

May 27, 2011

Author: vsalaun Date: 2011-05-27 12:19:10 +0200 (Fri, 27 May 2011) New Revision: 3147 Url: http://chorem.org/repositories/revision/lima/3147 Log: #400 empeche la reorganisation automatique des exercices 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 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 2011-05-26 12:49:51 UTC (rev 3146) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2011-05-27 10:19:10 UTC (rev 3147) @@ -27,6 +27,8 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; @@ -40,9 +42,11 @@ import org.chorem.lima.business.ImportServiceMonitorable; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.utils.FiscalPeriodComparator; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; import org.nuiton.util.Resource; /** @@ -64,6 +68,9 @@ protected FiscalPeriodServiceMonitorable fiscalPeriodService; protected FinancialTransactionServiceMonitorable financialTransactionService; + + /** data cache */ + protected List<Object> cacheDataList; public FiscalPeriodTableModel() { fiscalPeriodService = @@ -76,20 +83,39 @@ LimaServiceFactory.getInstance().getService( FinancialTransactionServiceMonitorable.class); financialTransactionService.addListener(this); + cacheDataList = null; } + + protected List<Object> getDataList() { + List<Object> results = new ArrayList<Object>(); + try { + List<FiscalPeriod> fiscalPeriod = + fiscalPeriodService.getAllFiscalPeriods(); + Collections.sort(fiscalPeriod, new FiscalPeriodComparator()); + results.addAll(fiscalPeriod); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get fiscal periods list", eee); + } + return results; + } + public void refresh(){ + cacheDataList = getDataList(); + fireTableDataChanged(); + } + @Override public int getRowCount() { + int result = 0; - int result = 0; - try { - result = fiscalPeriodService.getAllFiscalPeriods().size(); + if (cacheDataList != null) { + result = cacheDataList.size(); } - catch (LimaException eee) { - if(log.isDebugEnabled()){ - log.debug("Can't get row count",eee); - } - } + return result; } @@ -101,14 +127,12 @@ public Object getElementAt(int row){ - Object currentRow=null; - try { - currentRow = fiscalPeriodService.getAllFiscalPeriods().get(row); - } catch (LimaException eee) { - if(log.isDebugEnabled()){ - log.debug("Can't get elenment at table",eee); - } + Object currentRow = null; + + if (cacheDataList != null) { + currentRow = cacheDataList.get(row); } + return currentRow; } @@ -146,38 +170,29 @@ Object result = "n/a"; - List<FiscalPeriod> periods; - try { - periods = fiscalPeriodService.getAllFiscalPeriods(); - FiscalPeriod fiscalPeriod = periods.get(rowIndex); - - if (fiscalPeriod != null){ - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); + List<Object> periods; + periods = cacheDataList; + FiscalPeriod fiscalPeriod = (FiscalPeriod)periods.get(rowIndex); + + if (fiscalPeriod != null){ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); - switch (columnIndex) { - case 0: - result = simpleDateFormat. - format(fiscalPeriod.getBeginDate()) - + " - " + simpleDateFormat. - format(fiscalPeriod.getEndDate()); - break; - case 1: - if(fiscalPeriod.getLocked()){ - result = _("lima.common.closed"); - } - else{ - result = _("lima.common.open"); - } - break; + switch (columnIndex) { + case 0: + result = simpleDateFormat. + format(fiscalPeriod.getBeginDate()) + + " - " + simpleDateFormat. + format(fiscalPeriod.getEndDate()); + break; + case 1: + if(fiscalPeriod.getLocked()){ + result = _("lima.common.closed"); } + else{ + result = _("lima.common.open"); + } + break; } - - - - } catch (LimaException eee) { - if(log.isDebugEnabled()){ - log.debug("Can't update table",eee); - } } return result; @@ -185,7 +200,7 @@ public FiscalPeriod getFiscalPeriodAtRow(int row) throws LimaException { FiscalPeriod fiscalPeriod = null; - fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(row); + fiscalPeriod = (FiscalPeriod) cacheDataList.get(row); return fiscalPeriod; } @@ -193,12 +208,21 @@ * @param period */ public void addFiscalPeriod(FiscalPeriod period) throws LimaException { - - int currentRowCount = getRowCount(); - // Calling fiscal period service - fiscalPeriodService.createFiscalPeriod(period); - fireTableRowsInserted(currentRowCount, currentRowCount); + try { + // Calling fiscal period service + fiscalPeriodService.createFiscalPeriod(period); + //on recharge la liste + cacheDataList = getDataList(); + int row = getDataList().indexOf(period); + fireTableRowsInserted(row, row); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't create FiscalPeriod", eee); + } + ErrorHelper.showErrorDialog("Can't create fiscal periods ", eee); + } } public void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { @@ -215,7 +239,7 @@ f.dispose(); } else { fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); - fireTableDataChanged(); + refresh(); } } @@ -223,7 +247,7 @@ public void notifyMethod(String serviceName, String methodeName) { //refresh on import datas if (methodeName.contains("importAll")){ - fireTableDataChanged(); + refresh(); } } } 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 2011-05-26 12:49:51 UTC (rev 3146) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2011-05-27 10:19:10 UTC (rev 3147) @@ -27,18 +27,25 @@ <FiscalPeriodViewHandler id="handler" javaBean="new FiscalPeriodViewHandler(this)" /> <Boolean id="selectedPeriod" javaBean="false" /> - <org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel id="modelFiscalPeriodTable"/> <script> <![CDATA[ + import org.chorem.lima.entity.FiscalPeriod; + import org.chorem.lima.entity.FinancialPeriod; + + void $afterCompleteSetup() { + getHandler().refresh(); + } ]]> </script> <row> <cell fill="both" weightx="1" weighty="1" rows="4"> <JScrollPane> + <org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel + id="modelFiscalPeriodTable"/> <org.chorem.lima.ui.fiscalperiod.FiscalPeriodTable - id="fiscalPeriodTable" rowHeight="24" + id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getHandler()" model="{getModelFiscalPeriodTable()}" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" /> 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 2011-05-26 12:49:51 UTC (rev 3146) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-05-27 10:19:10 UTC (rev 3147) @@ -53,6 +53,10 @@ private FiscalPeriodView view; + protected FiscalPeriodTable table; + + protected FiscalPeriodTableModel tableModel; + protected FiscalPeriodViewHandler(FiscalPeriodView view) { this.view=view; } @@ -120,9 +124,14 @@ } DialogHelper.showMessageDialog(eee.getMessage()); } - } + } public FiscalPeriodView getView() { return view; } + + public void refresh(){ + tableModel = (FiscalPeriodTableModel)getView().getFiscalPeriodTable().getModel(); + tableModel.refresh(); + } }

1 0

r3146 - trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules
by vsalaun＠users.chorem.org May 26, 2011

May 26, 2011

Author: vsalaun Date: 2011-05-26 14:49:51 +0200 (Thu, 26 May 2011) New Revision: 3146 Url: http://chorem.org/repositories/revision/lima/3146 Log: #356 impossibilite de bloquer une periode comptable si une transaction n'a pas de journal Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 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 2011-05-26 10:31:37 UTC (rev 3145) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2011-05-26 12:49:51 UTC (rev 3146) @@ -196,12 +196,15 @@ /** * Check if all financial transactions of closedperiodicentrybook are equilibrate + * Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in + * Check if all financial transactions have EntryBooks */ @Override public void blockClosedPeriodicEntryBookRules(ClosedPeriodicEntryBook closedPeriodicEntryBook, TopiaContext topiaContext) throws LimaException { List<FinancialTransaction> result = null; + // Check if all financial transactions of closedperiodicentrybook are equilibrate try { FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); @@ -223,6 +226,7 @@ } result = null; + // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in try { FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); @@ -240,12 +244,36 @@ result = financialTransactionDAO.findAllByQuery(query); if (result.size()>0){ - throw new LimaBusinessException("Can't block financialperiod / missing elements in transactions"); + throw new LimaBusinessException("Can't block financialperiod / missing elements in transactions for this FinancialPeriod/EntryBook"); } } catch (TopiaException ex) { doCatch(topiaContext, ex, log); } + + result = null; + + // Check if all financial transactions have EntryBooks + try { + FinancialTransactionDAO financialTransactionDAO = + LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); + + TopiaQuery query = financialTransactionDAO.createQuery("T"); + query.addDistinct() + .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") + .addNull(FinancialTransaction.ENTRY_BOOK); + result = financialTransactionDAO.findAllByQuery(query); + + if (result.size()>0){ + throw new LimaBusinessException("Can't block financialperiod / missing EntryBook in transactions"); + } + } + catch (TopiaException ex) { + doCatch(topiaContext, ex, log); + } } /**

1 0

r3145 - trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules
by vsalaun＠users.chorem.org May 26, 2011

May 26, 2011

Author: vsalaun Date: 2011-05-26 12:31:37 +0200 (Thu, 26 May 2011) New Revision: 3145 Url: http://chorem.org/repositories/revision/lima/3145 Log: #356 empeche la cloture d'une periode comptable liee a un journal lorsqu'une transaction de ce journal a cette date n'est pas complete Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 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 2011-05-25 12:19:36 UTC (rev 3144) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2011-05-26 10:31:37 UTC (rev 3145) @@ -202,7 +202,7 @@ throws LimaException { List<FinancialTransaction> result = null; - try { + try { FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); @@ -220,7 +220,32 @@ } catch (TopiaException ex) { doCatch(topiaContext, ex, log); - } + } + result = null; + + try { + FinancialTransactionDAO financialTransactionDAO = + LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); + + TopiaQuery query = financialTransactionDAO.createQuery("T"); + query.addDistinct() + .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") + .addEquals(FinancialTransaction.ENTRY_BOOK, + closedPeriodicEntryBook.getEntryBook()) + .addEquals(FinancialTransaction.FINANCIAL_PERIOD, + closedPeriodicEntryBook.getFinancialPeriod()); + result = financialTransactionDAO.findAllByQuery(query); + + if (result.size()>0){ + throw new LimaBusinessException("Can't block financialperiod / missing elements in transactions"); + } + } + catch (TopiaException ex) { + doCatch(topiaContext, ex, log); + } } /** @@ -246,7 +271,7 @@ closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( entryOld.getFinancialTransaction().getEntryBook(), financialPeriod); if (closedPeriodicEntryBook.getLocked()){ - throw new LimaBusinessException("2 - Can't update entry : financialperiod of this entrybook is closed"); + throw new LimaBusinessException("Can't update entry : financialperiod of this entrybook is closed"); } //third case @@ -256,7 +281,7 @@ // Check 2 & 3 cases if (closedPeriodicEntryBook2.getLocked()){ - throw new LimaBusinessException("3 - Can't update entry : financialperiod of this entrybook is closed"); + throw new LimaBusinessException("Can't update entry : financialperiod of this entrybook is closed"); } }

1 0

r3144 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by vsalaun＠users.chorem.org May 25, 2011

May 25, 2011

Author: vsalaun Date: 2011-05-25 14:19:36 +0200 (Wed, 25 May 2011) New Revision: 3144 Url: http://chorem.org/repositories/revision/lima/3144 Log: #356 ne pas autoriser la cloture d'un exercice s'il possede au moins une ecriture non conforme Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.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 2011-05-25 08:31:44 UTC (rev 3143) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2011-05-25 12:19:36 UTC (rev 3144) @@ -28,15 +28,22 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; import java.util.List; + + +import javax.swing.JFrame; +import javax.swing.JOptionPane; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.FinancialTransactionServiceMonitorable; import org.chorem.lima.business.FiscalPeriodServiceMonitorable; import org.chorem.lima.business.ImportServiceMonitorable; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.Resource; /** * TODO add comment here. @@ -55,6 +62,8 @@ private static final Log log = LogFactory.getLog(FiscalPeriodTableModel.class); protected FiscalPeriodServiceMonitorable fiscalPeriodService; + + protected FinancialTransactionServiceMonitorable financialTransactionService; public FiscalPeriodTableModel() { fiscalPeriodService = @@ -63,6 +72,10 @@ fiscalPeriodService.addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); + financialTransactionService = + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class); + financialTransactionService.addListener(this); } @Override @@ -189,9 +202,21 @@ } public void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - - fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); - fireTableDataChanged(); + 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, + "Fiscal Period has unbalanced transactions", + _("lima.common.error"), + JOptionPane.ERROR_MESSAGE); + f.dispose(); + } else { + fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); + fireTableDataChanged(); + } } @Override

1 0