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

r3398 - trunk
by echatellier＠users.chorem.org 02 May '12

02 May '12

Author: echatellier Date: 2012-05-02 14:33:54 +0200 (Wed, 02 May 2012) New Revision: 3398 Url: http://chorem.org/repositories/revision/lima/3398 Log: Udpate h2, openejb and jdom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-25 12:49:56 UTC (rev 3397) +++ trunk/pom.xml 2012-05-02 12:33:54 UTC (rev 3398) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.3.1</version> </parent> <groupId>org.chorem</groupId> @@ -166,7 +166,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>2.0.0</version> + <version>2.0.1</version> <scope>compile</scope> </dependency> @@ -202,7 +202,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.2.v20120308</version> + <version>8.1.3.v20120416</version> </dependency>  @@ -317,7 +317,7 @@ <topiaVersion>2.6.9</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <openEjbVersion>4.0.0-beta-2</openEjbVersion> + <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.4</slf4jVersion>

1 0

r3397 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 14:49:56 +0200 (Wed, 25 Apr 2012) New Revision: 3397 Url: http://chorem.org/repositories/revision/lima/3397 Log: Fix transaction entry book modification Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-04-25 12:25:38 UTC (rev 3396) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-04-25 12:49:56 UTC (rev 3397) @@ -247,7 +247,7 @@ boolean editableCell = false; Object currentRow = transactionAndEntries.get(rowIndex); // cells editable for the financialtransaction row, no cells exclude the date - if (currentRow instanceof FinancialTransaction && (columnIndex == 0 /*|| columnIndex == 1*/)) { + if (currentRow instanceof FinancialTransaction && (columnIndex == 0 || columnIndex == 1)) { editableCell = true; } // cells editable for the entry row, all cells exclude the date @@ -309,14 +309,13 @@ //update currentFinancialTransaction.setTransactionDate((Date) value); break; - /* FIXME echatellier 20120413 : ca devrait carrement pas être editable case 1: - if (selectedEntryBook != null) { + if (currentFinancialTransaction.getEntry() != null) { // not authorized to change the value return; } currentFinancialTransaction.setEntryBook((EntryBook) value); - break;*/ + break; } // update transaction

1 0

r3396 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 14:25:38 +0200 (Wed, 25 Apr 2012) New Revision: 3396 Url: http://chorem.org/repositories/revision/lima/3396 Log: Begin unbalanced transaction refactoring Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2012-04-25 11:39:33 UTC (rev 3395) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2012-04-25 12:25:38 UTC (rev 3396) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 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 @@ -48,7 +48,6 @@ import java.math.BigDecimal; import java.util.Date; - /** * Table des transaction qui ajoute des comportement (keys). * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-04-25 11:39:33 UTC (rev 3395) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-04-25 12:25:38 UTC (rev 3396) @@ -49,7 +49,6 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.DialogHelper; /** * Basic transaction table model. @@ -388,10 +387,7 @@ financialTransactionService. updateFinancialTransaction(currentFinancialTransaction); } catch (LimaException eee) { - if (log.isDebugEnabled()) { - log.debug("Can't update financial transaction", eee); - } - DialogHelper.showMessageDialog(eee.getMessage()); + throw new LimaRuntimeException("Can't update financial transaction", eee); } //update the financial transaction in entire // financialTransactionRow = @@ -423,10 +419,7 @@ try { financialTransactionService.updateEntry(currentEntry); } catch (LimaException eee) { - if (log.isDebugEnabled()) { - log.debug("Can't update entry", eee); - } - DialogHelper.showMessageDialog(eee.getMessage()); + throw new LimaRuntimeException("Can't update entry", eee); } //update the financial transaction in entire // financialTransactionRow = Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2012-04-25 11:39:33 UTC (rev 3395) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2012-04-25 12:25:38 UTC (rev 3396) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 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 @@ -28,7 +28,6 @@ javax.swing.ListSelectionModel org.chorem.lima.entity.FiscalPeriod org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel - org.chorem.lima.ui.LimaRendererUtil </import> <FinancialTransactionUnbalancedViewHandler id="handler" javaBean="new FinancialTransactionUnbalancedViewHandler(this)"/> @@ -42,26 +41,17 @@ ]]> </script> -  - <row weightx="1" weighty="0" anchor="center"> <cell anchor="west"> - <JButton text="lima.refresh" onActionPerformed="getHandler().refresh()"/> + <JButton text="lima.ui.common.refresh" onActionPerformed="getHandler().refresh()"/> </cell> <cell anchor="east"> - <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> + <JLabel id="fiscalPeriodLabel" text="lima.ui.financialtransaction.fiscalyear"/> </cell> <cell anchor="west"> <JComboBox id="fiscalPeriodComboBox" model="{modelFiscalPeriod}" - renderer="{LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class)}" + renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); getHandler().refresh()" editable="false"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2012-04-25 11:39:33 UTC (rev 3395) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2012-04-25 12:25:38 UTC (rev 3396) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 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 @@ -25,18 +25,18 @@ package org.chorem.lima.ui.financialtransactionunbalanced; +import static org.nuiton.i18n.I18n._; + +import javax.swing.JOptionPane; +import javax.swing.ListSelectionModel; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.LimaRuntimeException; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; -import org.chorem.lima.util.DialogHelper; -import javax.swing.JOptionPane; -import javax.swing.ListSelectionModel; - -import static org.nuiton.i18n.I18n._; - /** * Handler associated with financial transaction view. * @@ -54,12 +54,6 @@ protected FinancialTransactionUnbalancedView view; - protected FinancialTransactionUnbalancedTable table; - - protected FinancialTransactionUnbalancedTableModel tableModel; - - protected FiscalPeriodComboBoxModel comboBoxModel; - protected FinancialTransactionUnbalancedViewHandler(FinancialTransactionUnbalancedView view) { this.view = view; } @@ -68,8 +62,8 @@ //add a new entry to the selected transaction public void addEmptyEntry() { - table = view.getFinancialTransactionUnbalancedTable(); - tableModel = view.getFinancialTransactionUnbalancedTableModel(); + FinancialTransactionUnbalancedTable table = view.getFinancialTransactionUnbalancedTable(); + FinancialTransactionUnbalancedTableModel tableModel = view.getFinancialTransactionUnbalancedTableModel(); int indexSelectedRow = table.getSelectedRow(); if (indexSelectedRow != -1) { @@ -86,11 +80,7 @@ table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't add emptyentry", eee); - } - DialogHelper.showErrorMessageDialog(view, eee); - + throw new LimaRuntimeException("Can't add emptyentry", eee); } } else { if (log.isWarnEnabled()) { @@ -103,13 +93,11 @@ * Delete selected row in table (could be transaction or entry). * * Called by tableModel. - * - * @throws LimaException */ public void deleteSelectedRow() { - table = view.getFinancialTransactionUnbalancedTable(); - tableModel = view.getFinancialTransactionUnbalancedTableModel(); + FinancialTransactionUnbalancedTable table = view.getFinancialTransactionUnbalancedTable(); + FinancialTransactionUnbalancedTableModel tableModel = view.getFinancialTransactionUnbalancedTableModel(); int indexSelectedRow = table.getSelectedRow(); if (indexSelectedRow != -1) { @@ -134,10 +122,7 @@ table.getSelectionModel(); selectionModel.setSelectionInterval(indexSelectedRow - 1, indexSelectedRow - 1); } catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't remove transaction or entry", eee); - } - DialogHelper.showErrorMessageDialog(view, eee); + throw new LimaRuntimeException("Can't remove transaction or entry", eee); } } } else { @@ -148,10 +133,10 @@ } public void refresh() { - tableModel = view.getFinancialTransactionUnbalancedTableModel(); + FinancialTransactionUnbalancedTableModel tableModel = view.getFinancialTransactionUnbalancedTableModel(); tableModel.refresh(); - comboBoxModel = view.getModelFiscalPeriod(); + FiscalPeriodComboBoxModel comboBoxModel = view.getModelFiscalPeriod(); comboBoxModel.refresh(); } }

1 0

r3395 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/importexport java/org/chorem/lima/ui/opening resources/i18n
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 13:39:33 +0200 (Wed, 25 Apr 2012) New Revision: 3395 Url: http://chorem.org/repositories/revision/lima/3395 Log: Update init database wizard Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-04-25 11:39:33 UTC (rev 3395) @@ -54,20 +54,27 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.LimaRuntimeException; import org.chorem.lima.business.api.ExportService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.utils.ImportExportEntityEnum; import org.chorem.lima.enums.EncodingEnum; import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.account.AccountViewHandler; -import org.chorem.lima.util.DialogHelper; import org.jdesktop.swingx.painter.BusyPainter; +/** + * Import export helper. + * Calling service with specified file to import and displaying wait view to user. + * + * @author echatellier + * Date : 24 avr. 2012 + */ public class ImportExport { - private static final Log log = LogFactory.getLog(AccountViewHandler.class); + private static final Log log = LogFactory.getLog(ImportExport.class); + /** Parent view. */ protected Component viewComponent; protected EncodingEnum encodingEnum; @@ -95,13 +102,13 @@ } /** - * Call the appropriate methode in business service. + * Call the appropriate method in business service. * * @param importExportMethode * @param file * @param verbose */ - public void importExport(ImportExportEnum importExportMethode, String file, Boolean verbose) { + public void importExport(ImportExportEnum importExportMethode, String file, boolean verbose) { final ImportExportEnum importExportMethodeF = importExportMethode; encodingEnum = EncodingEnum.UTF8; if (file.equals("")) { @@ -199,28 +206,30 @@ if (verboseMode) { String result = get(); if (!result.equals("")) { - DialogHelper.showReportDialog(result, _("lima.importexport.import"), viewComponent); + JOptionPane.showMessageDialog(viewComponent, _("lima.ui.importexport.importerror"), + _("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE); + } else { if (importMode) { //special message when importing a VAT PDF if (importExportMethodeF.equals(ImportExportEnum.PDF_VAT_IMPORT)) { JOptionPane.showMessageDialog( waitView, - _("lima.importexport.import.vatpdfimport"), - _("lima.importexport.import"), + _("lima.ui.importexport.import.vatpdfimport"), + _("lima.ui.importexport.import"), JOptionPane.INFORMATION_MESSAGE); } else { JOptionPane.showMessageDialog( waitView, - _("lima.importexport.import.terminated"), - _("lima.importexport.import"), + _("lima.ui.importexport.import.terminated"), + _("lima.ui.importexport.import"), JOptionPane.INFORMATION_MESSAGE); } } else { JOptionPane.showMessageDialog( waitView, - _("lima.importexport.export.terminated"), - _("lima.importexport.export"), + _("lima.ui.importexport.export.terminated"), + _("lima.ui.importexport.export"), JOptionPane.INFORMATION_MESSAGE); } } @@ -229,11 +238,8 @@ if (log.isErrorEnabled()) { log.error("Can't get result message", eee); } - } catch (ExecutionException eee) { - DialogHelper.showErrorMessageDialog(viewComponent, eee.getCause()); - if (log.isErrorEnabled()) { - log.error("Error on import", eee); - } + } catch (ExecutionException ex) { + throw new LimaRuntimeException("Error during import", ex); } } }.execute(); @@ -281,32 +287,38 @@ } - /** Get csv datas in string and write file + /** + * Get csv datas in string and write file. + * * @param filePath * @param charset - * @param datas*/ + * @param datas + */ public void createFile(String filePath, String charset, String datas) { File file = new File(filePath); + BufferedWriter out = null; try { - BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), charset)); - try { - out.write(datas); - out.flush(); - out.close(); - } finally { - out.close(); - } + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), charset)); + out.write(datas); + out.flush(); + out.close(); } catch (IOException eee) { if (log.isErrorEnabled()) { log.error("Can't write file " + filePath, eee); } + } finally { + IOUtils.closeQuietly(out); } + } - /** Open csv file and get his datas on a string. + /** + * Open csv file and get his datas on a string. + * * @param filePath * @param charset - * @return*/ + * @return + */ public String extractFile(String filePath, String charset) { StringWriter sw = new StringWriter(); BufferedReader in = null; @@ -322,11 +334,7 @@ } in = new BufferedReader(new InputStreamReader(is, charset)); - try { - IOUtils.copy(in, sw); - } finally { - in.close(); - } + IOUtils.copy(in, sw); in.close(); } catch (IOException eee) { if (log.isErrorEnabled()) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx 2012-04-25 11:39:33 UTC (rev 3395) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 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 @@ -23,22 +23,15 @@ #L% --> -<JDialog modal="true" id="waitDialog"> - - <script> - <![CDATA[ - - ]]> - </script> - +<JDialog modal="true" id="waitDialog" title="lima.ui.importexport.waittitle"> <Table> <row> <cell> <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/> </cell> <cell> - <JLabel text='lima.importexport.wait'/> + <JLabel text='lima.ui.importexport.wait'/> </cell> </row> </Table> -</JDialog> \ No newline at end of file +</JDialog> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx 2012-04-25 11:39:33 UTC (rev 3395) @@ -32,7 +32,7 @@ <Table> <row> <cell> - <JLabel text='lima.opening.accounts'/> + <JLabel text='lima.ui.opening.accounts'/> </cell> </row> <row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2012-04-25 11:39:33 UTC (rev 3395) @@ -26,13 +26,13 @@ <Table> <row> <cell> - <JLabel text='lima.opening.entrybook'/> + <JLabel text='lima.ui.opening.entrybook'/> </cell> </row> <row> <cell> <JCheckBox id='importEntryBook' - text='lima.importexport.defaultentrybooks' selected='true'/> + text='lima.ui.importexport.defaultentrybooks' selected='true'/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx 2012-04-25 11:39:33 UTC (rev 3395) @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> +<JDialog modal="true" title="lima.ui.opening.title"> -<JDialog modal="true"> - <import> javax.swing.BorderFactory javax.swing.ImageIcon @@ -56,8 +55,8 @@ </cell> <cell weightx="0.9" rows="4" fill="both"> <JPanel id='panel'> - <JLabel text='lima.opening.welcome'/> - <JButton text='lima.opening.import' + <JLabel text='lima.ui.opening.welcome'/> + <JButton text='lima.ui.opening.import' onActionPerformed="handler.importSave()"/> </JPanel> </cell> @@ -85,10 +84,10 @@ <JLabel text=''/> </cell> <cell weightx="0.1" fill="none"> - <JButton text="lima.common.close" onActionPerformed="performCancel()"/> + <JButton text="lima.ui.opening.close" onActionPerformed="performCancel()"/> </cell> <cell weightx="0.1" fill="none"> - <JButton id="ok" text="lima.common.next" + <JButton id="ok" text="lima.ui.opening.next" onActionPerformed="handler.next()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-04-25 11:39:33 UTC (rev 3395) @@ -182,7 +182,7 @@ view.getFiscalperiodsIcon().setBorder(BorderFactory.createLineBorder(green, 2)); panel.add(fsPanel); panel.validate(); - view.getOk().setText(_("lima.common.fin")); + view.getOk().setText(_("lima.ui.opening.end")); view.repaint(); step++; break; 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-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-04-25 11:39:33 UTC (rev 3395) @@ -183,24 +183,8 @@ lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code -lima.importexport.accountcharts=Accounts chart -lima.importexport.all=All -lima.importexport.choiceencoding=Choice encoding -lima.importexport.csv=Import/Export CSV -lima.importexport.defaultentrybooks=Defaults entrybooks -lima.importexport.ebp=Import/Export EBP -lima.importexport.entries=Entries -lima.importexport.export=Export -lima.importexport.export.terminated=Export terminated -lima.importexport.financialstatements=FinancialStatements chart -lima.importexport.import=Import -lima.importexport.import.terminated=Import terminated -lima.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory -lima.importexport.importcsv=Import CSV -lima.importexport.importebp=Import EBP -lima.importexport.usevatpdf=Would you like to use this PDF when editing the VAT document ? -lima.importexport.vatstatements=VAT chart -lima.importexport.wait=Job in progress… +lima.importexport.importcsv= +lima.importexport.importebp= lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close lima.ledger.documentcreationerror=Enable to create document @@ -216,10 +200,6 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Support email lima.openejb.remotemode.description= -lima.opening.accounts=<html><center>Select a default, import your personnal or cancel to create your own account chart.</center></html> -lima.opening.entrybook=<html>Tick box to import default accounts chart\: Achats, Ventes, Trésorerie, Opération diverses</html> -lima.opening.import=Import a CSV Save -lima.opening.welcome=<html><center>Welcome to Lima this assistant help you to start your business accounting in the blink of an eye OR import instantanly your already existing save in CSV format </center></html> lima.preferences=Preferences lima.refresh=↻ lima.reports=Reports @@ -354,9 +334,32 @@ lima.ui.home.transaction.modifiy.unbalanced= lima.ui.home.transaction.nothing= lima.ui.home.transaction.unbalanced= +lima.ui.importexport.accountcharts=Accounts chart +lima.ui.importexport.all=All +lima.ui.importexport.choiceencoding=Choice encoding +lima.ui.importexport.csv=Import/Export CSV +lima.ui.importexport.defaultentrybooks=Defaults entrybooks +lima.ui.importexport.ebp=Import/Export EBP +lima.ui.importexport.entries=Entries +lima.ui.importexport.export=Export +lima.ui.importexport.export.terminated=Export terminated +lima.ui.importexport.financialstatements=FinancialStatements chart lima.ui.importexport.import= +lima.ui.importexport.import.terminated=Import terminated +lima.ui.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory lima.ui.importexport.importcsv= lima.ui.importexport.importebp= +lima.ui.importexport.usevatpdf=Would you like to use this PDF when editing the VAT document ? +lima.ui.importexport.vatstatements=VAT chart +lima.ui.importexport.wait=Job in progress… +lima.ui.importexport.waittitle= +lima.ui.opening.accounts=<html><center>Select a default, import your personnal or cancel to create your own account chart.</center></html> +lima.ui.opening.close= +lima.ui.opening.entrybook=<html>Tick box to import default accounts chart\: Achats, Ventes, Trésorerie, Opération diverses</html> +lima.ui.opening.import=Import a CSV Save +lima.ui.opening.next= +lima.ui.opening.title= +lima.ui.opening.welcome=<html><center>Welcome to Lima this assistant help you to start your business accounting in the blink of an eye OR import instantanly your already existing save in CSV format </center></html> lima.vatreport.listerror=Can't get entries list lima.vatstatement.accounts=List of accounts lima.vatstatement.boxname=PDF BoxName @@ -366,4 +369,3 @@ lima.vatstatement.movement.add=Add movement lima.warning.nimbus.landf=Could not find Numbus Look&Feel limma.config.thousandseparator.description= -nuitonutil.error.applicationconfig.save= 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-04-25 10:18:26 UTC (rev 3394) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-04-25 11:39:33 UTC (rev 3395) @@ -163,24 +163,8 @@ lima.identity.phoneNumber=n° Tel lima.identity.vatNumber=n° TVA lima.identity.zipCode=Code Postal -lima.importexport.accountcharts=Plan des comptes -lima.importexport.all=Tout -lima.importexport.choiceencoding=Choisir encodage \: -lima.importexport.csv=Import/Export CSV -lima.importexport.defaultentrybooks=Journaux par défaut -lima.importexport.ebp=Import/Export EBP -lima.importexport.entries=Écritures -lima.importexport.export=Export -lima.importexport.export.terminated=Export terminé -lima.importexport.financialstatements=Plan BCR -lima.importexport.import=Import -lima.importexport.import.terminated=Import terminé -lima.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima -lima.importexport.importcsv=Import CSV -lima.importexport.importebp=Import EBP -lima.importexport.usevatpdf=Voulez-vous utilser ce PDF pour la déclaration de TVA ? -lima.importexport.vatstatements=Plan TVA -lima.importexport.wait=Traitement en cours … +lima.importexport.importcsv= +lima.importexport.importebp= lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture lima.ledger.documentcreationerror=Erreur lors de la création du document @@ -196,10 +180,6 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Adresse email de support lima.openejb.remotemode.description= -lima.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, importer un plan personnalisé ou annuler pour créer votre propre plan.</center></html> -lima.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \: Achats, Ventes, Trésorerie, Opération diverses</html> -lima.opening.import=Importer une sauvegarde CSV -lima.opening.welcome=<html><center>Bienvenue dans Lima Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV </center></html> lima.preferences=Préférences lima.refresh=↻ lima.reports=Rapports @@ -333,9 +313,32 @@ lima.ui.home.transaction.modifiy.unbalanced=Modifier les écritures incorrectes lima.ui.home.transaction.nothing=Aucune écriture lima.ui.home.transaction.unbalanced=transactions ne sont pas équilibrées \! +lima.ui.importexport.accountcharts=Plan des comptes +lima.ui.importexport.all=Tout +lima.ui.importexport.choiceencoding=Choisir encodage \: +lima.ui.importexport.csv=Import/Export CSV +lima.ui.importexport.defaultentrybooks=Journaux par défaut +lima.ui.importexport.ebp=Import/Export EBP +lima.ui.importexport.entries=Écritures +lima.ui.importexport.export=Export +lima.ui.importexport.export.terminated=Export terminé +lima.ui.importexport.financialstatements=Plan BCR lima.ui.importexport.import=Importer +lima.ui.importexport.import.terminated=Import terminé +lima.ui.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima lima.ui.importexport.importcsv=Import/Export CSV lima.ui.importexport.importebp=Import/Export EBP +lima.ui.importexport.usevatpdf=Voulez-vous utilser ce PDF pour la déclaration de TVA ? +lima.ui.importexport.vatstatements=Plan TVA +lima.ui.importexport.wait=Traitement en cours… +lima.ui.importexport.waittitle=Traitement en cours +lima.ui.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, importer un plan personnalisé ou annuler pour créer votre propre plan.</center></html> +lima.ui.opening.close=Fermer +lima.ui.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \: Achats, Ventes, Trésorerie, Opération diverses</html> +lima.ui.opening.import=Importer une sauvegarde CSV +lima.ui.opening.next=Suivant +lima.ui.opening.title=Initialisation +lima.ui.opening.welcome=<html><center>Bienvenue dans Lima Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV </center></html> lima.vatreport.listerror=Erreur lors de la récupération des données de la liste lima.vatstatement.accounts=Liste des comptes lima.vatstatement.boxname=PDF BoxName @@ -345,4 +348,3 @@ lima.vatstatement.movement.add=Ajouter un regrouprement lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description= -nuitonutil.error.applicationconfig.save=

1 0

r3394 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 12:18:26 +0200 (Wed, 25 Apr 2012) New Revision: 3394 Url: http://chorem.org/repositories/revision/lima/3394 Log: Corrections dans la saisie des transactions (maj de l'ui) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-04-25 10:04:03 UTC (rev 3393) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-04-25 10:18:26 UTC (rev 3394) @@ -51,7 +51,6 @@ import java.math.BigDecimal; import java.util.Date; - /** * Table des transaction qui ajoute des comportement (keys). * @@ -113,9 +112,6 @@ addHighlighter(colorTransaction); // highlight unbalanced financial transactions -// if (colorBalance != null) { -// removeHighlighter(colorBalance); -// } predicate = new HighlightPredicate() { @Override public boolean isHighlighted(Component renderer, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-04-25 10:04:03 UTC (rev 3393) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-04-25 10:18:26 UTC (rev 3394) @@ -300,9 +300,10 @@ try { Object currentRow = transactionAndEntries.get(row); - + + FinancialTransaction currentFinancialTransaction = null; if (currentRow instanceof FinancialTransaction) { - FinancialTransaction currentFinancialTransaction = (FinancialTransaction) currentRow; + currentFinancialTransaction = (FinancialTransaction) currentRow; switch (column) { case 0: //update @@ -323,8 +324,7 @@ } else if (currentRow instanceof Entry) { Entry currentEntry = (Entry) currentRow; - FinancialTransaction financialTransaction = - currentEntry.getFinancialTransaction(); + currentFinancialTransaction = currentEntry.getFinancialTransaction(); boolean updateTransaction = false; switch (column) { case 2: @@ -336,7 +336,7 @@ // let's update the voucher of all entries of // the transaction - for (Entry entry : financialTransaction.getEntry()) { + for (Entry entry : currentFinancialTransaction.getEntry()) { entry.setVoucher(voucher); } updateTransaction = true; @@ -356,7 +356,7 @@ // let's update the description of all entries of // the transaction - for (Entry entry : financialTransaction.getEntry()) { + for (Entry entry : currentFinancialTransaction.getEntry()) { entry.setDescription(description1); } updateTransaction = true; @@ -373,7 +373,7 @@ // let's update the description of all entries of // the transaction - for (Entry entry : financialTransaction.getEntry()) { + for (Entry entry : currentFinancialTransaction.getEntry()) { entry.setDescription(description); } updateTransaction = true; @@ -400,7 +400,7 @@ // first row modification update following rows if (updateTransaction) { // FIXME echatellier 20120413 make a single service call - for (Entry entry : financialTransaction.getEntry()) { + for (Entry entry : currentFinancialTransaction.getEntry()) { financialTransactionService.updateEntry(entry); } } else { @@ -410,7 +410,8 @@ // FIXME echatellier 20120413 une modification des dates fait que l'ordre // devient faux - fireTableRowsUpdated(row, row); + int trIndex = indexOf(currentFinancialTransaction); + fireTableRowsUpdated(trIndex, trIndex + currentFinancialTransaction.getEntry().size() - 1); } catch (LimaException ex) { throw new LimaRuntimeException("Can't propagate data modification to service", ex); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-04-25 10:04:03 UTC (rev 3393) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-04-25 10:18:26 UTC (rev 3394) @@ -360,18 +360,18 @@ int firstentryBookrow = tableModel.getFirstEntry(indexSelectedRow); String defaultVoucher = null; - String dafaultDescription = null; + String defaultDescription = null; if (firstentryBookrow != -1) { // there is no first entry, grab the voucher and defaultVoucher = (String) tableModel.getValueAt(firstentryBookrow, 2); - dafaultDescription = (String) tableModel.getValueAt(firstentryBookrow, 4); + defaultDescription = (String) tableModel.getValueAt(firstentryBookrow, 4); } try { // creates the new entry Entry entry = new EntryImpl(); entry.setVoucher(defaultVoucher); - entry.setDescription(dafaultDescription); + entry.setDescription(defaultDescription); // check if current row is a transaction or an entry FinancialTransaction currentTransaction = null; Object currentRow = tableModel.getElementAt(indexSelectedRow); @@ -388,13 +388,15 @@ currentTransaction.addEntry(newEntry); // add it in ui - tableModel.addRow(newEntry, indexSelectedRow + currentTransaction.getEntry().size()); + int addIndex = tableModel.indexOf(currentTransaction) + + currentTransaction.getEntry().size(); + tableModel.addRow(newEntry, addIndex); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( - indexSelectedRow + 1, indexSelectedRow + 1); - table.changeSelection(indexSelectedRow + 1, 1, false, false); + addIndex, addIndex); + table.changeSelection(addIndex, 1, false, false); } catch (LimaException ex) { throw new LimaRuntimeException("Can't add emptyentry", ex); @@ -442,6 +444,7 @@ } else if (selectedValue instanceof Entry) { Entry currentEntry = (Entry) selectedValue; financialTransactionService.removeEntry(currentEntry); + currentEntry.getFinancialTransaction().removeEntry(currentEntry); } tableModel.deleteRow(indexSelectedRow);

1 0

r3393 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 12:04:03 +0200 (Wed, 25 Apr 2012) New Revision: 3393 Url: http://chorem.org/repositories/revision/lima/3393 Log: Fix bigdecimal addition Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2012-04-25 09:14:11 UTC (rev 3392) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2012-04-25 10:04:03 UTC (rev 3393) @@ -45,12 +45,15 @@ */ @Override public BigDecimal getAmountDebit() { - BigDecimal result = new BigDecimal(0); - for (Entry entryFT : getEntry()) { - if (entryFT.isDebit()) { - result.add(entryFT.getAmount()); + BigDecimal result = BigDecimal.ZERO; + if (getEntry() != null) { + for (Entry entryFT : getEntry()) { + if (entryFT.isDebit()) { + result = result.add(entryFT.getAmount()); + } } } + return result; } @@ -59,10 +62,12 @@ */ @Override public BigDecimal getAmountCredit() { - BigDecimal result = new BigDecimal(0); - for (Entry entryFT : getEntry()) { - if (!entryFT.isDebit()) { - result.add(entryFT.getAmount()); + BigDecimal result = BigDecimal.ZERO; + if (getEntry() != null) { + for (Entry entryFT : getEntry()) { + if (!entryFT.isDebit()) { + result = result.add(entryFT.getAmount()); + } } } return result;

1 0

r3392 - 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-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 11:14:11 +0200 (Wed, 25 Apr 2012) New Revision: 3392 Url: http://chorem.org/repositories/revision/lima/3392 Log: Move queries to dao Modified: 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/ejb/FinancialPeriodServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java 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-04-25 08:28:20 UTC (rev 3391) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-04-25 09:14:11 UTC (rev 3392) @@ -95,5 +95,12 @@ */ void checkFinancialPeriodBlockedWithFinancialTransaction(FinancialTransaction financialTransaction, TopiaContext topiaContext) throws LimaException; + /** + * Check if a financial period can be closed. + * + * @param closedPeriodicEntryBook + * @param topiaContext + * @throws LimaException + */ void blockClosedPeriodicEntryBookRules(ClosedPeriodicEntryBook closedPeriodicEntryBook, TopiaContext topiaContext) throws LimaException; } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-04-25 08:28:20 UTC (rev 3391) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-04-25 09:14:11 UTC (rev 3392) @@ -68,9 +68,6 @@ protected static final Log log = LogFactory.getLog(DefaultAccountingRules.class); - /** DAO helper not injected by EJB. */ - protected LimaDaoHelper daoHelper = new LimaDaoHelper(); - /** * Rules to check before create accounts. */ @@ -117,7 +114,7 @@ @Override public void removeAccountRules(Account account) throws LimaException { try { - EntryDAO entryDAO = daoHelper.getEntryDAO(); + EntryDAO entryDAO = LimaDaoHelper.getEntryDAO(); // Check if account have entries int nbentries = entryDAO.findAllByAccount(account).size(); if (nbentries != 0) { @@ -192,72 +189,33 @@ @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); - TopiaQuery query = financialTransactionDAO.createQuery("E"); - query.addWhere("E.amountCredit != E.amountDebit") - .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, - closedPeriodicEntryBook.getEntryBook()) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, - closedPeriodicEntryBook.getFinancialPeriod()); - result = financialTransactionDAO.findAllByQuery(query); - + // Check if all financial transactions of closedperiodicentrybook are equilibrate + List<FinancialTransaction> result = financialTransactionDAO.getAllUnbalancedTransaction(closedPeriodicEntryBook.getFinancialPeriod(), + closedPeriodicEntryBook.getEntryBook()); if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.blockerrorequillibrate")); } - } catch (TopiaException ex) { - doCatch(topiaContext, ex, log); - } - result = null; + + // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in + result = financialTransactionDAO.getAllUnfilledTransaction(closedPeriodicEntryBook.getFinancialPeriod(), + closedPeriodicEntryBook.getEntryBook()); - // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in - 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.PROPERTY_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.PROPERTY_ENTRY_BOOK, - closedPeriodicEntryBook.getEntryBook()) - .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, - closedPeriodicEntryBook.getFinancialPeriod()); - result = financialTransactionDAO.findAllByQuery(query); - if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.missingelements")); } - } catch (TopiaException ex) { - doCatch(topiaContext, ex, log); - } + + // Check if all financial transactions have EntryBooks + result = financialTransactionDAO.getAllTransactionWithoutEntryBook(); - 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.PROPERTY_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.PROPERTY_ENTRY_BOOK); - result = financialTransactionDAO.findAllByQuery(query); - if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.missingentrybook")); } + } catch (TopiaException ex) { doCatch(topiaContext, ex, log); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-04-25 08:28:20 UTC (rev 3391) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-04-25 09:14:11 UTC (rev 3392) @@ -210,19 +210,19 @@ AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { - //check rules before create the account + // check rules before create the account accountingRules.blockClosedPeriodicEntryBookRules( closedPeriodicEntryBook, topiaContext); ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(topiaContext); - ClosedPeriodicEntryBook closedPeriodicEntryBook2 = - closedPeriodicEntryBookDAO.findByTopiaId( - closedPeriodicEntryBook.getTopiaId()); + //ClosedPeriodicEntryBook closedPeriodicEntryBook2 = + // closedPeriodicEntryBookDAO.findByTopiaId( + // closedPeriodicEntryBook.getTopiaId()); - closedPeriodicEntryBook2.setLocked(true); - closedPeriodicEntryBookDAO.update(closedPeriodicEntryBook2); + closedPeriodicEntryBook.setLocked(true); + closedPeriodicEntryBookDAO.update(closedPeriodicEntryBook); commitTransaction(topiaContext); } catch (TopiaException ex) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java 2012-04-25 08:28:20 UTC (rev 3391) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAO.java 2012-04-25 09:14:11 UTC (rev 3392) @@ -25,7 +25,10 @@ package org.chorem.lima.entity; +import java.util.List; + import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; /** * Ajout de requetes specifiques aux financial transaction sur le DAO. @@ -51,4 +54,65 @@ return count.longValue(); } + /** + * Find all unbalanced transactions. + * + * @param period period + * @param entryBook entry book + * @return unbalanced transactions + * @throws TopiaException + */ + public List<FinancialTransaction> getAllUnbalancedTransaction(FinancialPeriod period, + EntryBook entryBook) throws TopiaException { + TopiaQuery query = createQuery("E"); + query.addWhere("E.amountCredit != E.amountDebit") + .addEquals(FinancialTransaction.PROPERTY_ENTRY_BOOK, entryBook) + .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + + /** + * Find all transaction where some field are not filled in. + * + * @param period period + * @param entryBook entry book + * @return unfilled transaction + * @throws TopiaException + */ + public List<FinancialTransaction> getAllUnfilledTransaction(FinancialPeriod period, + EntryBook entryBook) throws TopiaException { + TopiaQuery query = createQuery("T"); + query.addDistinct() + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T." + FinancialTransaction.PROPERTY_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.PROPERTY_ENTRY_BOOK, entryBook) + .addEquals(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD, period); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + + /** + * Find all transaction without entry book. + * + * TODO echatellier 20120425 same method as getAllUnfilledTransaction ? + * doesn't concern a period ? + * + * @return + * @throws TopiaException + */ + public List<FinancialTransaction> getAllTransactionWithoutEntryBook() throws TopiaException { + TopiaQuery query = createQuery("T"); + query.addDistinct() + .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) + .addFrom(FiscalPeriod.class, "F") + .addLeftJoin("T." + FinancialTransaction.PROPERTY_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.PROPERTY_ENTRY_BOOK); + List<FinancialTransaction> result = findAllByQuery(query); + return result; + } + } //FinancialTransactionDAO

1 0

r3391 - trunk/lima-business/src/test/java/org/chorem/lima/business
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 10:28:20 +0200 (Wed, 25 Apr 2012) New Revision: 3391 Url: http://chorem.org/repositories/revision/lima/3391 Log: Fix import, exceptions Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -31,7 +31,6 @@ import org.junit.Before; import org.junit.Test; -import java.text.ParseException; import java.util.List; /** @@ -47,7 +46,7 @@ public class AccountServiceImplTest extends AbstractLimaTest { @Before - public void initTest() throws LimaException, ParseException { + public void initTest() throws Exception { initTestDatabase(); } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -25,18 +25,12 @@ package org.chorem.lima.business; -import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; -import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.text.ParseException; - -import javax.ejb.TransactionAttribute; - /** * Tests pour la gestion des journaux. * @@ -50,7 +44,7 @@ protected static final String JOURNAL_DES_VENTES = "Journal des ventes"; @Before - public void initTest() throws LimaException, ParseException { + public void initTest() throws Exception { initTestDatabase(); } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -25,17 +25,13 @@ package org.chorem.lima.business; -import java.text.ParseException; - -import junit.framework.Assert; - import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; /** * Tests pour la gestion des timespans @@ -52,7 +48,7 @@ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { @Before - public void initTest() throws LimaException, ParseException { + public void initTest() throws Exception { initTestDatabase(); } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -27,18 +27,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.ejb.FiscalPeriodServiceImpl; import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; -import java.text.ParseException; - /** * Tests pour la gestion des périodes * @@ -56,31 +48,11 @@ private static final Log log = LogFactory .getLog(FiscalPeriodServiceImplTest.class); - private static FiscalPeriodServiceImpl instance; - - private TopiaContext rootContext; - @Before - public void initTest() throws LimaException, ParseException { + public void initTest() throws Exception { initTestDatabase(); } - public FiscalPeriodServiceImplTest() { - LimaConfig config = LimaConfig.getInstance(); - try { - rootContext = TopiaContextFactory.getContext(config.getOptions()); - } catch (TopiaNotFoundException ex) { - if (log.isErrorEnabled()) { - log.error("Can't init topia context", ex); - } - } - } - - @BeforeClass - public static void setUpClass() throws Exception { - //LimaConfigTest.getInstance(); - } - /** * On nettoie la base de données * @@ -303,14 +275,4 @@ // Nombre 12 timeSpans mensuels Assert.assertEquals(12, listTimeSpanDTO.size());*/ } - - protected TopiaContext beginTransaction() throws TopiaException { - // basic check done, make check in database - // TODO move it into JTA - TopiaContext topiaTransaction; - topiaTransaction = rootContext.beginTransaction(); - log.trace("beginTransaction" + topiaTransaction); - return topiaTransaction; - } - } \ No newline at end of file Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -25,10 +25,11 @@ package org.chorem.lima.business; -import org.apache.commons.io.FileUtils; +import java.io.IOException; +import java.io.InputStream; +import java.text.ParseException; + import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.pdfbox.util.StringUtil; import org.chorem.lima.business.utils.ImportExportEntityEnum; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.FiscalPeriod; @@ -36,10 +37,6 @@ import org.junit.Assert; import org.junit.Test; -import java.io.IOException; -import java.io.InputStream; -import java.text.ParseException; - /** * Test du service d'import en faisant des import/export EBP et xml. * Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-04-25 08:28:20 UTC (rev 3391) @@ -39,7 +39,6 @@ import org.junit.Test; import java.math.BigDecimal; -import java.text.ParseException; import java.util.Date; /** @@ -52,18 +51,17 @@ public class ReportServiceImplTest extends AbstractLimaTest { @Before - public void initTest() throws LimaException, ParseException { + public void initTest() throws Exception { initTestDatabase(); } /** * Test de génération du rapport des comptes. * - * @throws LimaException - * @throws ParseException + * @throws Exception */ @Test - public void testGenerateAccountsReports() throws LimaException, ParseException { + public void testGenerateAccountsReports() throws Exception { Account accountBefa = accountService.getAccountByNumber("51"); Assert.assertNotNull(accountBefa); @@ -84,11 +82,10 @@ * Test de génération du rapport des comptes, en verifiant que les transactions * non équilibrées ne sont pas présentes (modification 0.6). * - * @throws LimaException - * @throws ParseException + * @throws Exception */ @Test - public void testGenerateAccountsReportsUnlalanced() throws LimaException, ParseException { + public void testGenerateAccountsReportsUnlalanced() throws Exception { EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); Account accountVmpVae = accountService.getAccountByNumber("511");

1 0

r3390 - trunk/lima-business/src/test/java/org/chorem/lima/business
by echatellier＠users.chorem.org 25 Apr '12

25 Apr '12

Author: echatellier Date: 2012-04-25 10:23:08 +0200 (Wed, 25 Apr 2012) New Revision: 3390 Url: http://chorem.org/repositories/revision/lima/3390 Log: Add test to block financial period (failing test) Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-04-24 16:25:00 UTC (rev 3389) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-04-25 08:23:08 UTC (rev 3390) @@ -25,11 +25,18 @@ package org.chorem.lima.business; +import java.text.ParseException; + +import junit.framework.Assert; + +import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; +import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.junit.Before; import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; -import java.text.ParseException; - /** * Tests pour la gestion des timespans * @@ -50,39 +57,29 @@ } /** - * Permet de tester l'ajout d'un timespan. + * Test de la fermeture d'une periode comptable pour un journal donné. + * + * @throws Exception */ @Test - public void createTimeSpanTest() { - /*// debut 1 janvier 2011 - Date beginTimeSpan = df.parse("Junary 1, 2011"); - // fin 15 janvier 2011 - Date endTimeSpan = df.parse("Junary 15, 2011"); + public void blockClosedPeriodicEntryBookTest() throws Exception { - // Création du timespan du 1 janvier au 31 janvier. - // Malgre la date de fin du 15 janvier, elle ne prend en compte que la - // date de début. La période a pour valeur nulle, et le timepsan est - // non bloqué. - result = financialPerdiodService.createTimeSpan(beginTimeSpan, endTimeSpan, null, - false); - Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS, result);*/ - } + // find one closed to close + TopiaContext context = getTestContext().beginTransaction(); + ClosedPeriodicEntryBookDAO dao = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(context); + ClosedPeriodicEntryBook closedPeriodic = dao.findAll().get(0); + context.closeContext(); - /** - * Permet de tester la fonction rechercher pour un timespan. Si ce dernier - * n'est pas trouvé, l'objet de retour est nul. - */ - @Test - public void findTimeSpanByMonthYearTest() { - /*// Il existe déja une période du 1 jan 2011 au 31 jan 2011 (createTimeSpanTest) - // debut 1 janvier 2011 - Date dateSearch = new Date(111, 0, 1); - TimeSpan timespan = instance.searchTimeSpanByDate(dateSearch); - assertTrue(timespan != null); // Trouve bien le timespan - // debut 1 mai 2011 - dateSearch = new Date(111, 4, 1); - timespan = instance.searchTimeSpanByDate(dateSearch); - assertTrue(timespan == null); // Ne le trouve pas */ + // block it + Assert.assertFalse(closedPeriodic.isLocked()); + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); + + // check it's blocked + context = getTestContext().beginTransaction(); + dao = LimaCallaoDAOHelper.getClosedPeriodicEntryBookDAO(context); + closedPeriodic = dao.findAll().get(0); + context.closeContext(); + Assert.assertFalse(closedPeriodic.isLocked()); } }

1 0

r3389 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/test/java/org/chorem/lima/business lima-business/src/test/java/org/chorem/lima/business/accountingrules lima-business/src/test/java/org/chorem/lima/entity lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 24 Apr '12

24 Apr '12

Author: echatellier Date: 2012-04-24 18:25:00 +0200 (Tue, 24 Apr 2012) New Revision: 3389 Url: http://chorem.org/repositories/revision/lima/3389 Log: Test may be now fixed, but styll unstable between maven and IDE :( Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.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-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -66,13 +66,13 @@ String accountNumber = account.getAccountNumber(); // ledger account must be located in 411 account - if (!StringUtils.isNumeric(accountNumber) && accountNumber.startsWith("4")) { + if (!StringUtils.isNumeric(accountNumber) && !accountNumber.startsWith("4")) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.accountnumbernotnumeric", account.getAccountNumber())); } // Check root account starts with 1 to 8 - if (accountNumber.length() == 1 && accountNumber.matches("[1-8]")) { + if (accountNumber.length() == 1 && !accountNumber.matches("[1-8]")) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.accountstartnumbererror", account.getAccountNumber())); } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -35,6 +35,7 @@ import org.chorem.lima.entity.FinancialTransactionImpl; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.math.BigDecimal; @@ -43,7 +44,11 @@ /** * Test le service de génération des reports. + * + * FIXME echatellier 20120424 les tests sont désactivés car le code qui genere + * les rapports dans ReportService est commenté. */ +@Ignore public class ReportServiceImplTest extends AbstractLimaTest { @Before Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -67,10 +67,9 @@ * @throws LimaException */ @Test(expected=LimaException.class) - @Override - public void testCreateAccountWrongNumber() throws LimaException { + public void testCreateAccountWrongStart() throws LimaException { Account myAccount = new AccountImpl(); - myAccount.setAccountNumber("42"); + myAccount.setAccountNumber("10TEST"); accountService.createAccount(myAccount); } } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2012-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -27,6 +27,7 @@ import org.chorem.lima.business.ReportServiceImplTest; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** @@ -41,7 +42,10 @@ * * Last update : $Date$ * By : $Author$ + * + * FIXME echatellier 20120424 fix parent test first */ +@Ignore public class ReportServiceRuleFrTest extends ReportServiceImplTest { @BeforeClass Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2012-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -27,7 +27,9 @@ import org.chorem.lima.business.AbstractLimaTest; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import java.util.List; @@ -43,18 +45,30 @@ */ public class AccountDAOTest extends AbstractLimaTest { + @Before + public void initTest() throws Exception { + initTestDatabase(); + } + /** * Test la recherche de compte par interval. * @throws TopiaException */ @Test public void testStringToListAccounts() throws TopiaException { - AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(getTestContext()); + TopiaContext tx = getTestContext().beginTransaction(); + AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(tx); + List<Account> accounts = accountDAO.stringToListAccounts("50..511", false); - Assert.assertEquals(3, accounts.size()); + for (Account account : accounts) { + System.out.println(account.getAccountNumber()); + } + Assert.assertEquals(5, accounts.size()); accounts = accountDAO.stringToListAccounts("60..99", false); Assert.assertEquals(0, accounts.size()); + + tx.closeContext(); } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-04-24 14:50:09 UTC (rev 3388) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAO.java 2012-04-24 16:25:00 UTC (rev 3389) @@ -88,8 +88,9 @@ */ protected List<Account> findIntervalAccountByNumber(String accountNumberLow, String accountNumberHigh) throws TopiaException { - String query = "FROM " + Account.class.getName() + " WHERE ? < accountNumber AND accountNumber > ?"; - return (List<Account>) context.find(query, accountNumberLow, accountNumberHigh); + String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; + return (List<Account>) context.find(query, "accountNumberLow", + accountNumberLow, "accountNumberHigh", accountNumberHigh); } /**

1 0