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

r3622 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 17:40:24 +0200 (Mon, 20 Aug 2012) New Revision: 3622 Url: http://chorem.org/repositories/revision/lima/3622 Log: fixes #725 Correction du modele de selection, afin de deselectionner les lignes venant d etre lettrees, lors de la selection d une ligne non-lettree. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java 2012-08-20 15:25:30 UTC (rev 3621) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java 2012-08-20 15:40:24 UTC (rev 3622) @@ -71,14 +71,16 @@ } } } - letteringEntrySelected = true; } else { //unlettred entries //To clear the selection when it changes from lettered entry to unlettered - if (letteringEntrySelected) { - clearSelection(); + for(Entry entry : getEntries()){ + if (!StringUtils.isBlank(entry.getLettering())) { + int entryToSelect = letteringTableModel.getIndexOfEntry(entry); + super.removeSelectionInterval(entryToSelect, entryToSelect); + } } if (isSelectionEmpty() || !isSelectedIndex(row)){

1 0

r3621 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 17:25:30 +0200 (Mon, 20 Aug 2012) New Revision: 3621 Url: http://chorem.org/repositories/revision/lima/3621 Log: fixes #705 Correction pour la prise en compte de la configuration, concernant le nombre de decimales. 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 2012-08-20 14:34:31 UTC (rev 3620) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-20 15:25:30 UTC (rev 3621) @@ -27,11 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaContext; import javax.swing.DefaultCellEditor; import javax.swing.JTextField; import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import java.awt.event.FocusEvent; @@ -41,12 +41,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.ParseException; -import java.text.ParsePosition; -import java.util.Locale; /** * @author sletellier <letellier(a)codelutin.com> @@ -145,10 +139,19 @@ stringValue = "0"; } stringValue=stringValue.replaceAll(",","."); - BigDecimal cellEditorValue = new BigDecimal(stringValue); - if (super.getCellEditorValue() != BigDecimal.ZERO) { - return cellEditorValue.setScale(2, RoundingMode.HALF_UP); + + BigDecimal cellEditorValue; + int pointIndex = stringValue.indexOf("."); + if (pointIndex != -1) { + LimaConfig config = LimaContext.getContext().getConfig(); + int decimal = config.getScale() + pointIndex + 1; + String roundedStringValue = stringValue.substring(0, pointIndex) + + stringValue.substring(pointIndex, decimal); + cellEditorValue = new BigDecimal(roundedStringValue); + } else { + cellEditorValue = new BigDecimal(stringValue); } + return cellEditorValue; }

1 0

r3620 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 16:34:31 +0200 (Mon, 20 Aug 2012) New Revision: 3620 Url: http://chorem.org/repositories/revision/lima/3620 Log: fixes #783 Correction sur la requete de selection des ecritures incorrectes et l affichage de la valeur de la clef d internationalisation du bouton de rafraichissement. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-20 14:23:18 UTC (rev 3619) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-20 14:34:31 UTC (rev 3620) @@ -187,7 +187,7 @@ */ public List<FinancialTransaction> getAllIncorrectTransaction(Date beginDate, Date endDate, EntryBook entryBook) throws TopiaException { - String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ + String query = "SELECT distinct T FROM " + FinancialTransaction.class.getName() + " T"+ " LEFT JOIN T.entry AS E" + " WHERE ((SELECT sum(amount) FROM " + Entry.class.getName() + " WHERE debit = true AND financialTransaction = T) != " +

1 0

r3619 - trunk/lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 16:23:18 +0200 (Mon, 20 Aug 2012) New Revision: 3619 Url: http://chorem.org/repositories/revision/lima/3619 Log: Correction de l affichage des clefs d internationalisation sur le panneau des entrees incorrectes, ainsi que dans celui de creation de journaux. Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 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-08-20 14:04:19 UTC (rev 3618) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-20 14:23:18 UTC (rev 3619) @@ -228,7 +228,7 @@ lima.ui.common.cancel=Annuler lima.ui.common.error=Erreur lima.ui.common.ok=Ok -lima.ui.common.refresh= +lima.ui.common.refresh=Rafraîchir lima.ui.common.remove=Supprimer lima.ui.common.solde=Solde lima.ui.common.update=Modifier

1 0

r3618 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/importexport resources resources/i18n
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 16:04:19 +0200 (Mon, 20 Aug 2012) New Revision: 3618 Url: http://chorem.org/repositories/revision/lima/3618 Log: Correction de l affichage des messages et des clefs d internationalisation, lors des imports pour les plans BCR et TVA. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties trunk/lima-swing/src/main/resources/log4j.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-08-20 13:21:25 UTC (rev 3617) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-08-20 14:04:19 UTC (rev 3618) @@ -202,25 +202,39 @@ @Override protected void done() { try { + + if (log.isDebugEnabled()) { + log.debug("importMode : " + importMode); + } + //hidde wait dialog panel waitView.setVisible(false); // display result dialog if (verboseMode) { String result = get(); - if (!result.equals("")) { + if (result.equals("")) { JOptionPane.showMessageDialog(viewComponent, _("lima.ui.importexport.importerror"), _("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE); } else { if (importMode) { + if (log.isDebugEnabled()) { + log.debug("importMode"); + } //special message when importing a VAT PDF if (importExportMethodeF.equals(ImportExportEnum.PDF_VAT_IMPORT)) { + if (log.isDebugEnabled()) { + log.debug("PDF_VAT_IMPORT"); + } JOptionPane.showMessageDialog( waitView, _("lima.ui.importexport.import.vatpdfimport"), _("lima.ui.importexport.import"), JOptionPane.INFORMATION_MESSAGE); } else { + if (log.isDebugEnabled()) { + log.debug("import.terminated"); + } JOptionPane.showMessageDialog( waitView, _("lima.ui.importexport.import.terminated"), @@ -228,6 +242,9 @@ JOptionPane.INFORMATION_MESSAGE); } } else { + if (log.isDebugEnabled()) { + log.debug("export.terminated"); + } JOptionPane.showMessageDialog( waitView, _("lima.ui.importexport.export.terminated"), 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-08-20 13:21:25 UTC (rev 3617) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-20 14:04:19 UTC (rev 3618) @@ -326,8 +326,8 @@ 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.importerror= -lima.ui.importexport.importtitle= +lima.ui.importexport.importerror=Echec de l'import +lima.ui.importexport.importtitle=Erreur d'import lima.ui.importexport.vatstatements=Plan TVA lima.ui.importexport.wait=Traitement en cours… lima.ui.importexport.waittitle=Traitement en cours Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-20 13:21:25 UTC (rev 3617) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-20 14:04:19 UTC (rev 3618) @@ -61,4 +61,5 @@ log4j.logger.org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler=DEBUG log4j.logger.org.chorem.lima.business.ejb.ReportServiceImpl=DEBUG log4j.logger.org.chorem.lima.ui.MainViewHandler=DEBUG -log4j.logger.org.chorem.lima.business.ejb.FinancialStatementServiceImpl=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.business.ejb.FinancialStatementServiceImpl=DEBUG +log4j.logger.org.chorem.lima.ui.importexport.ImportExport=DEBUG \ No newline at end of file

1 0

r3617 - trunk/lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 15:21:25 +0200 (Mon, 20 Aug 2012) New Revision: 3617 Url: http://chorem.org/repositories/revision/lima/3617 Log: fixes #775 Correction de la valeur de la clef d'import du pdf de la d?\195?\169claration de tva. Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 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-08-20 13:15:52 UTC (rev 3616) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-20 13:21:25 UTC (rev 3617) @@ -30,7 +30,7 @@ lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice lima.charts.fiscalperiod.delete=Supprimer un exercice lima.charts.fiscalyear=Exercices -lima.charts.vatpdf=Structure du pdf +lima.charts.vatpdf=Import du pdf lima.charts.vatstatement=Plan TVA lima.charts.vatstatement.base=Plan TVA de base lima.charts.vatstatement.deleteparent=Veuillez supprimer les sous-catégories de cette ligne

1 0

r3616 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/importexport resources/i18n
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 15:15:52 +0200 (Mon, 20 Aug 2012) New Revision: 3616 Url: http://chorem.org/repositories/revision/lima/3616 Log: fixes #773 Correction sur les clefs d'internationalisation, et les titres du JFileChooser et de son bouton de s?\195?\169lection, aussi bien pour l'import que pour l'export. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 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-08-20 12:52:54 UTC (rev 3615) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-08-20 13:15:52 UTC (rev 3616) @@ -274,10 +274,17 @@ ((Container) chooser.getComponent(2)).add(panel, BorderLayout.SOUTH); } + String approveButtonText; if (importMode) { chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); + approveButtonText = _("lima.ui.importexport.import"); + chooser.setDialogTitle(approveButtonText); + chooser.setApproveButtonText(approveButtonText); } else { + approveButtonText = _("lima.ui.importexport.export"); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + chooser.setDialogTitle(approveButtonText); + chooser.setApproveButtonText(approveButtonText); } if (chooser.showOpenDialog(viewComponent) == JFileChooser.APPROVE_OPTION) { filePath = chooser.getSelectedFile().getAbsolutePath(); 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-08-20 12:52:54 UTC (rev 3615) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-20 13:15:52 UTC (rev 3616) @@ -150,7 +150,7 @@ lima.identity.phoneNumber=n° Tel lima.identity.vatNumber=n° TVA lima.identity.zipCode=Code Postal -lima.importexport.choiceencoding= +lima.importexport.choiceencoding=Choix de l'encodage lima.importexport.export= lima.importexport.export.terminated= lima.importexport.usevatpdf= @@ -317,7 +317,7 @@ lima.ui.importexport.ebp=Import/Export EBP lima.ui.importexport.entries=Écritures lima.ui.importexport.entrybooks=Journaux -lima.ui.importexport.export=Export +lima.ui.importexport.export=Exporter lima.ui.importexport.export.terminated=Export terminé lima.ui.importexport.financialstatements=Plan BCR lima.ui.importexport.financialtransactions=Écritures

1 0

r3615 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/common lima-swing/src/main/java/org/chorem/lima/ui/vatreports
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 14:52:54 +0200 (Mon, 20 Aug 2012) New Revision: 3615 Url: http://chorem.org/repositories/revision/lima/3615 Log: refs #769 Modification du jaxx, et mise en place de l affichage html des donnees filtrees, pour l edition de la d?\195?\169claration de TVA - Reste ?\195?\160 revoir l'autocompl?\195?\169tion du document, Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportPeriodSearchPanel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-08-20 11:59:56 UTC (rev 3614) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-08-20 12:52:54 UTC (rev 3615) @@ -213,7 +213,7 @@ } catch (ParseException eeePE) { log.error("Can't parse date", eeePE); } - + // FIXME echatellier 20120606 on connait le fichier // ou sera généré le rapport, et on peut donc le relire // après génération Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java 2012-08-20 11:59:56 UTC (rev 3614) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java 2012-08-20 12:52:54 UTC (rev 3615) @@ -139,7 +139,7 @@ GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); - JLabel endLabel = new JLabel(_("lima.common.begindate")); + JLabel endLabel = new JLabel(_("lima.common.enddate")); periodPanel.add(endLabel, new GridBagConstraints(2, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportPeriodSearchPanel.java 2012-08-20 11:59:56 UTC (rev 3614) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportPeriodSearchPanel.java 2012-08-20 12:52:54 UTC (rev 3615) @@ -1,168 +0,0 @@ -/* - * #%L - * Lima :: Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2011 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package org.chorem.lima.ui.vatreports; - -import org.apache.commons.lang3.time.DateUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.enums.ComboBoxDatesEnum; -import org.chorem.lima.ui.LimaRendererUtil; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel; -import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; -import org.jdesktop.swingx.JXDatePicker; - -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ListCellRenderer; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.Calendar; -import java.util.Date; - -import static org.nuiton.i18n.I18n._; - -public class VatReportPeriodSearchPanel extends JPanel { - - private static final long serialVersionUID = 1L; - - private static final Log log = - LogFactory.getLog(VatReportPeriodSearchPanel.class); - - protected VatReportViewHandler handler; - - public VatReportPeriodSearchPanel(VatReportViewHandler handler) { - - this.handler = handler; - - //init date - refresh(ComboBoxDatesEnum.FISCAL_PERIOD); - } - - public void refresh(ComboBoxDatesEnum comboBoxPeriodEnum) { - - switch (comboBoxPeriodEnum) { - case PERIOD: - // get begin date - Calendar calendarBegin = Calendar.getInstance(); - // set begindate to JAN 1 - 0:00.000 of this years - Date beginDate = calendarBegin.getTime(); - beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); - //handler().setBeginDate(beginDate); - - // get end date - Calendar calendarEnd = Calendar.getInstance(); - Date endDate = calendarEnd.getTime(); - //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); - final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); - final VatReportTableModel tableModel = handler.getTableModel(); - - ActionListener beginDateActionListener = new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - - tableModel.setBeginDate(beginDatePicker.getDate()); - handler.refresh(); - } - }; - tableModel.setBeginDate(beginDatePicker.getDate()); - beginDatePicker.addActionListener(beginDateActionListener); - - JLabel endDateLabel = new JLabel(_("lima.common.enddate")); - final JXDatePicker endDatePicker = new JXDatePicker(endDate); - ActionListener endDateActionListener = new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - tableModel.setEndDate(endDatePicker.getDate()); - handler.refresh(); - } - }; - tableModel.setEndDate(endDatePicker.getDate()); - endDatePicker.addActionListener(endDateActionListener); - handler.refresh(); - - removeAll(); - add(beginDateLabel); - add(beginDatePicker); - add(endDateLabel); - add(endDatePicker); - break; - - case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = - new FiscalPeriodComboBoxModel(true); - ListCellRenderer renderer = - LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class); - final JComboBox fiscalPeriod = new JComboBox(fiscalModel); - fiscalPeriod.setRenderer(renderer); - fiscalPeriod.setEditable(false); - ActionListener fiscalPeriodActionListener = new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - FiscalPeriod fPeriod = (FiscalPeriod) fiscalPeriod.getSelectedItem(); - if (fPeriod != null) { - handler.getTableModel().setBeginDate(fPeriod.getBeginDate()); - handler.getTableModel().setEndDate(fPeriod.getEndDate()); - handler.refresh(); - } - } - }; - fiscalPeriod.addActionListener(fiscalPeriodActionListener); - - removeAll(); - add(fiscalPeriod); - break; - - case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = - new FinancialPeriodComboBoxModel(true); - renderer = - LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class); - final JComboBox financialPeriod = new JComboBox(financialModel); - financialPeriod.setRenderer(renderer); - financialPeriod.setEditable(false); - ActionListener financialPeriodActionListener = new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - FinancialPeriod fPeriod = (FinancialPeriod) financialPeriod.getSelectedItem(); - if (fPeriod != null) { - handler.getTableModel().setBeginDate(fPeriod.getBeginDate()); - handler.getTableModel().setEndDate(fPeriod.getEndDate()); - handler.refresh(); - } - } - }; - financialPeriod.addActionListener(financialPeriodActionListener); - removeAll(); - add(financialPeriod); - break; - } - - } - -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx 2012-08-20 11:59:56 UTC (rev 3614) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx 2012-08-20 12:52:54 UTC (rev 3615) @@ -29,9 +29,7 @@ <import> javax.swing.ListSelectionModel org.jdesktop.swingx.JXTable - org.chorem.lima.entity.FiscalPeriod - org.chorem.lima.entity.FinancialPeriod - org.chorem.lima.enums.ComboBoxDatesEnum + org.chorem.lima.ui.common.IntervalPanel </import> <Boolean id="autoComplete" javaBean="false"/> @@ -45,18 +43,8 @@ </script> <row weightx="1" weighty="0" anchor="center"> - <cell anchor="east"> - <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> - </cell> - <cell anchor="west"> - <JComboBox id="periodComboBox" - javaBean="new JComboBox(ComboBoxDatesEnum.descriptions())" - onActionPerformed="periodSearchPanel.refresh(ComboBoxDatesEnum.valueOfDescription((String) periodComboBox.getSelectedItem())); - validate(); repaint()"/> - </cell> <cell> - <VatReportPeriodSearchPanel id="periodSearchPanel" - constructorParams="handler"/> + <IntervalPanel id="intervalPanel"/> </cell> <cell> <JCheckBox id='autocompleteCheckBox' text='lima.common.autocomplete' @@ -68,17 +56,4 @@ onActionPerformed="getHandler().editVat()"/> </cell> </row> - <row> - <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> - <JScrollPane> -  - <JXTable id="vatReportTable" sortable="false" rowHeight="22" - model="{new VatReportTableModel()}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> -  -  -  - </JScrollPane> - </cell> - </row> </Table> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2012-08-20 11:59:56 UTC (rev 3614) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2012-08-20 12:52:54 UTC (rev 3615) @@ -26,20 +26,22 @@ import java.awt.Desktop; import java.io.IOException; -import java.math.BigDecimal; import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; import org.chorem.lima.business.api.DocumentService; +import org.chorem.lima.business.api.FinancialPeriodService; +import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.HttpServerService; import org.chorem.lima.business.utils.DocumentsEnum; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; public class VatReportViewHandler { /** log. */ @@ -47,12 +49,11 @@ LogFactory.getLog(VatReportViewHandler.class); protected VatReportView view; - protected DocumentService documentService; - + protected FiscalPeriodService fiscalPeriodService; + protected FinancialPeriodService financialPeriodService; private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - protected int port; protected VatReportViewHandler(VatReportView view) { @@ -61,37 +62,28 @@ port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); documentService = LimaServiceFactory.getService(DocumentService.class); + fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); + financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); } + /** + * Init data models and displayed objects. + */ public void init() { - //Get new BigDecimal editor - view.getVatReportTable().setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); - - //Get new BigDecimal renderer - view.getVatReportTable().setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); - - // do refresh (TODO check if required...) - refresh(); + List<FiscalPeriod> blockedFiscalPeriods = fiscalPeriodService.getAllBlockedFiscalPeriods(); + List<FinancialPeriod> financialPeriod = financialPeriodService.getUnblockedFinancialPeriods(); + view.getIntervalPanel().init(blockedFiscalPeriods, financialPeriod); } - /** @return VatView */ - public VatReportView getView() { - return view; - } - public VatReportTableModel getTableModel() { - return (VatReportTableModel) view.getVatReportTable().getModel(); - } - /** Edit VAT document */ public void editVat() { - VatReportTableModel tableModel = getTableModel(); - if (tableModel.getBeginDate() != null || tableModel.getEndDate() != null) { + if (view.getIntervalPanel().getBeginDate() != null || view.getIntervalPanel().getEndDate() != null) { String address = LimaConfig.getInstance().getHostAdress(); try { String url = "http://" + address + ":" + port + "/?beginDate=" - + dateFormat.format(tableModel.getBeginDate()) - + "&endDate=" + dateFormat.format(tableModel.getEndDate()) + + dateFormat.format(view.getIntervalPanel().getBeginDate()) + + "&endDate=" + dateFormat.format(view.getIntervalPanel().getEndDate()) + "&format=.pdf&model=" + DocumentsEnum.VAT.getFileName() + "&autocomplete=" + view.getAutoComplete(); Desktop.getDesktop().browse(new URI(url)); @@ -103,10 +95,4 @@ } } - /** Refresh VatTableModel */ - public void refresh() { - VatReportTableModel tableModel = getTableModel(); - tableModel.refresh(); - } - }

1 0

r3614 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/test/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/financialperiod
by echatellier＠users.chorem.org 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 13:59:56 +0200 (Mon, 20 Aug 2012) New Revision: 3614 Url: http://chorem.org/repositories/revision/lima/3614 Log: Corection de la mise ?\195?\160 jour de la liste des periodes comptables apr?\195?\168s fermeture. Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 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-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -153,9 +153,10 @@ } @Override - public void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { + public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + ClosedPeriodicEntryBook result = null; try { // check rules before create the account accountingRules.blockClosedPeriodicEntryBookRules(closedPeriodicEntryBook); @@ -164,16 +165,17 @@ getDaoHelper().getClosedPeriodicEntryBookDAO(); // reload object in current transaction - ClosedPeriodicEntryBook closedPeriodicEntryBook2 = - closedPeriodicEntryBookDAO.findByTopiaId( + result = closedPeriodicEntryBookDAO.findByTopiaId( closedPeriodicEntryBook.getTopiaId()); - closedPeriodicEntryBook2.setLocked(true); - closedPeriodicEntryBookDAO.update(closedPeriodicEntryBook2); + result.setLocked(true); + result = closedPeriodicEntryBookDAO.update(result); } catch (TopiaException ex) { throw new LimaException("Can't block period", ex); } + + return result; } @Override Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -1124,9 +1124,8 @@ .findByEntryBookAndFinancialPeriod(entryBook, financialPeriod); try { - financialPeriodService - .blockClosedPeriodicEntryBook( - closedPeriodicEntryBook); + closedPeriodicEntryBook = financialPeriodService + .blockClosedPeriodicEntryBook(closedPeriodicEntryBook); result.append(_("lima-business.import.closedperiodicentrybookupdated", beginDateFinancialPeriod, endDateFinancialPeriod, codeEntryBook)); } catch (LimaException eee) { 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-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -68,7 +68,7 @@ // block it Assert.assertFalse(closedPeriodic.isLocked()); - financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); + closedPeriodic = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); // check it's blocked context = getTestContext().beginTransaction(); Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -55,7 +55,7 @@ List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod() throws LimaException; - void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; + ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; 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 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -118,11 +118,16 @@ return currentRow; } + public void setElementAt(int row, ClosedPeriodicEntryBook closedPeriodicEntryBook) { + closedPeriodicEntryBooks.set(row, closedPeriodicEntryBook); + fireTableRowsUpdated(row, row); + } + @Override public Object getValueAt(int rowIndex, int columnIndex) { Object result = null; - ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBooks.get(rowIndex); + ClosedPeriodicEntryBook closedPeriodicEntryBook = getElementAt(rowIndex); switch (columnIndex) { case 0: @@ -147,11 +152,4 @@ return result; } - - /*public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { - financialPeriodService. - blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - refresh(); - }*/ - } 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 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -100,8 +100,8 @@ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { - financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - model.fireTableRowsUpdated(selectedRow, selectedRow); + closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + model.setElementAt(selectedRow, closedPeriodicEntryBook); } }

1 0

r3613 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport lima-swing/src/main/resources
by mallon＠users.chorem.org 20 Aug '12

20 Aug '12

Author: mallon Date: 2012-08-20 13:38:22 +0200 (Mon, 20 Aug 2012) New Revision: 3613 Url: http://chorem.org/repositories/revision/lima/3613 Log: refs #769 Modification du jaxx, et mise en place de l affichage html des donnees filtrees, pour l edition du bilan et du r?\195?\169sultat (Reste le calcul ?\195?\160 revoir.) Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties 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-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -188,7 +188,7 @@ //Check if the fiscal period to block is the oldest if (oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { - throw new LimaBusinessException(_("lima-business.franceaccountingrules.antefiscalperiodnotblocked")); + throw new LimaBusinessException(_("lima-business.franceaccountingrules.lastFiscalPeriodCantBlocked")); } } catch (TopiaException ex) { throw new LimaException("Can't check rule", ex); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -27,18 +27,12 @@ import com.lowagie.text.BadElementException; import com.lowagie.text.Cell; -import com.lowagie.text.Chapter; -import com.lowagie.text.Document; -import com.lowagie.text.DocumentException; import com.lowagie.text.Element; import com.lowagie.text.Font; -import com.lowagie.text.PageSize; import com.lowagie.text.Paragraph; import com.lowagie.text.Phrase; import com.lowagie.text.Rectangle; import com.lowagie.text.Table; -import com.lowagie.text.html.HtmlWriter; -import com.lowagie.text.pdf.PdfWriter; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -81,7 +75,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.InputStream; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -234,229 +227,124 @@ } @Override - public void createFinancialStatementsDocuments(Date beginDate, - Date endDate, - FormatsEnum format) throws LimaException { - Document document = new Document(PageSize.A4, 8, 8, 8, 8); + public String createFinancialStatementsDocuments(Date beginDate, + Date endDate) throws LimaException { + String financialStatementReport = null; - List<FinancialStatementAmounts> financialStatementAmounts = - financialStatementService.financialStatementReport(beginDate, endDate); - - Date newDate = new Date(); - String filePath = path + File.separator + DocumentsEnum.FINANCIALSTATEMENT.getFileName(); - try { - FileOutputStream fileOut = new FileOutputStream(filePath + format.getExtension()); - switch (format) { - case HTML: - HtmlWriter htmlWriter = HtmlWriter.getInstance(document, fileOut); - break; - case PDF: - PdfWriter pdfWriter = PdfWriter.getInstance(document, fileOut); - break; - } - document.open(); - int nbpages = 1; + financialStatementReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + + "<html>\n"; + financialStatementReport += constructHeadHtml(_("lima.reports.financialstatement")); + financialStatementReport += "<body>\n"; - Identity identity = identityService.getIdentity(); + if (beginDate != null && endDate != null) { - //Split list by financialstatement type - List<List<FinancialStatementAmounts>> listList = - new ArrayList<List<FinancialStatementAmounts>>(); - Boolean first = true; - int min = 0; - int size = financialStatementAmounts.size(); - for (int i = 0; i < size; i++) { - FinancialStatementAmounts fStatementAmounts = - financialStatementAmounts.get(i); - if (fStatementAmounts.getLevel() == 1 && !fStatementAmounts.getSubAmount()) { - if (first) { - first = false; - } else { - listList.add(financialStatementAmounts.subList(min, i - 1)); + List<FinancialStatementAmounts> financialStatementAmounts = + financialStatementService.financialStatementReport(beginDate, endDate); + //Split list by financialstatement type + List<List<FinancialStatementAmounts>> listList = + new ArrayList<List<FinancialStatementAmounts>>(); + Boolean first = true; + int min = 0; + int size = financialStatementAmounts.size(); + for (int i = 0; i < size; i++) { + FinancialStatementAmounts fStatementAmounts = + financialStatementAmounts.get(i); + if (fStatementAmounts.getLevel() == 1 && !fStatementAmounts.getSubAmount()) { + if (first) { + first = false; + } else { + listList.add(financialStatementAmounts.subList(min, i - 1)); + } + min = i; } - min = i; } - } - listList.add(financialStatementAmounts.subList(min, size)); + listList.add(financialStatementAmounts.subList(min, size)); - //create pages - for (List<FinancialStatementAmounts> list : listList) { - String title = list.get(0).getLabel(); - int i = 0; - int n = list.size(); - int max = n; - // alloc nb rows max for pdf documents on one page - if (format == FormatsEnum.PDF) { - max = 35; - } - while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } - List<FinancialStatementAmounts> subFinancialStatementAmounts = - list.subList(i, j); - //create page : header + table + footer - Table headerTable = createFinancialStatementsHeaderTable(); - Table table = createFinancialStatementsTable( - subFinancialStatementAmounts); - //new page - Chapter chapter = new Chapter(0); - //headerPage - chapter.add(createHeaderPage(title, identity, beginDate, endDate)); - //n° page - chapter.add(createNumberPage(nbpages, newDate)); - //headerTable - Paragraph paragraphHeaderTable = new Paragraph(); - paragraphHeaderTable.add(headerTable); - chapter.add(paragraphHeaderTable); - //table - Paragraph paragraphTable = new Paragraph(); - paragraphTable.add(table); - chapter.add(paragraphTable); - //add page - document.add(chapter); - i = i + max; - nbpages++; - } - } + String boldBegin = "<b>"; + String boldEnd = "</b>"; + //create pages + for (List<FinancialStatementAmounts> list : listList) { + String subTitle = list.get(0).getLabel(); + financialStatementReport += constructSubTitleHtml(boldBegin + subTitle + boldEnd, ""); + int i = 0; + int n = list.size(); + int max = n; + while (i < n) { + int j = i + max; + if (j > n) { + j = n; + } - document.close(); + financialStatementReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + + "<tr align=\"center\">\n"; - } catch (FileNotFoundException eeFNFE) { - log.error("Can't create pdf file", eeFNFE); - } catch (DocumentException eeDE) { - log.error("Can't create document", eeDE); - } - } + String columnNames [] = {_("lima-business.document.label"), _("lima-business.document.grossamount"), + _("lima-business.document.provisiondeprecationamount"), _("lima-business.document.netamount")}; + financialStatementReport += constructColumnsHtml(columnNames); - protected Table createFinancialStatementsHeaderTable() { - Table t = null; - try { - t = new Table(4, 1); - float[] widths = {0.4f, 0.2f, 0.2f, 0.2f}; - t.setWidths(widths); - t.setWidth(100f); - t.setPadding(3f); - //defaut cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.LEFT); - cell.setHorizontalAlignment(Element.ALIGN_CENTER); - t.setDefaultCell(cell); - t.setOffset(8); - t.addCell(new Phrase(_("lima-business.document.label"), - boldFont)); - t.addCell(new Phrase(_("lima-business.document.grossamount"), - boldFont)); - t.addCell(new Phrase(_("lima-business.document.provisiondeprecationamount"), - boldFont)); - t.addCell(new Phrase(_("lima-business.document.netamount"), - boldFont)); + String tabLabel = ""; + String bigAmountString = "0"; + String provisionDeprecationAmountString = "0"; + String soldeString = "0"; + List<FinancialStatementAmounts> subFinancialStatementAmounts = list.subList(i, j); + for (FinancialStatementAmounts financialStatementAmount : subFinancialStatementAmounts) { - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); - } - return t; + String label = financialStatementAmount.getLabel(); + int level = financialStatementAmount.getLevel(); + BigDecimal bigAmount = + financialStatementAmount.getGrossAmount(); + if (bigAmount == null) { + bigAmount = new BigDecimal(0); + } + BigDecimal provisionDeprecationAmount = + financialStatementAmount.getProvisionDeprecationAmount(); + if (provisionDeprecationAmount == null) { + provisionDeprecationAmount = new BigDecimal(0); + } - } + StringBuffer tab = new StringBuffer(); + for (int k = 0; k < level; k++) { + tab.append("\t"); + } - protected Table createFinancialStatementsTable(List<FinancialStatementAmounts> financialStatementAmounts) { - int nbrow = financialStatementAmounts.size(); - Table t = null; - try { - //define table - t = new Table(4, nbrow); - t.setWidth(100f); - float[] widths = {0.4f, 0.2f, 0.2f, 0.2f}; - t.setWidths(widths); - t.setPadding(1.5f); - t.setBorderWidth(1); - t.setOffset(0); - //define default cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.LEFT); - cell.setHorizontalAlignment(Element.ALIGN_RIGHT); - t.setDefaultCell(cell); + if (financialStatementAmount.getHeader()) { + tabLabel = boldBegin + tab + label + boldEnd; + } else { + tabLabel = tab + label; + } + if (bigAmount != BigDecimal.ZERO) { + bigAmountString = bigAmount.toString(); + } + if (provisionDeprecationAmount != BigDecimal.ZERO) { + provisionDeprecationAmountString = provisionDeprecationAmount.toString(); + } + BigDecimal solde = bigAmount; + solde = solde.subtract(provisionDeprecationAmount); + if (solde != BigDecimal.ZERO) { + soldeString = solde.toString(); + } + } - for (FinancialStatementAmounts financialStatementAmount : financialStatementAmounts) { - - String label = financialStatementAmount.getLabel(); - int level = financialStatementAmount.getLevel(); - BigDecimal grossAmount = - financialStatementAmount.getGrossAmount(); - if (grossAmount == null) { - grossAmount = new BigDecimal(0); - } - BigDecimal provisionDeprecationAmount = - financialStatementAmount.getProvisionDeprecationAmount(); - if (provisionDeprecationAmount == null) { - provisionDeprecationAmount = new BigDecimal(0); - } - - if (financialStatementAmount.getSubAmount() && level == 1) { - cell.setGrayFill(0.88f); - } else if (financialStatementAmount.getSubAmount()) { - cell.setGrayFill(0.94f); - } else { - cell.setGrayFill(1f); - } - if (label == null) { - t.addCell(""); - t.addCell(""); - t.addCell(""); - t.addCell(""); - } else { - //cell1 - StringBuffer tab = new StringBuffer(); - for (int i = 0; i < level; i++) { - tab.append("\t"); + String columnData [] = {(StringUtils.isBlank(tabLabel)?"": tabLabel), bigAmountString, + provisionDeprecationAmountString, soldeString}; + financialStatementReport += constructColumnsHtml(columnData); + i = i + max; + financialStatementReport += "</table>" + + "<p>"; } - Phrase phrase; - if (financialStatementAmount.getHeader()) { - phrase = new Phrase(tab + label, boldFont); - } else { - phrase = new Phrase(tab + label, normalFont); - } - Cell c = new Cell(phrase); - c.setHorizontalAlignment(Element.ALIGN_LEFT); - t.addCell(c); - //cell2 - if (grossAmount != BigDecimal.ZERO) { - phrase = new Phrase(String.valueOf( - grossAmount), normalFont); - } else { - phrase = new Phrase(""); - } - t.addCell(phrase); - //cell 3 - if (provisionDeprecationAmount != BigDecimal.ZERO) { - phrase = new Phrase(String.valueOf( - provisionDeprecationAmount), normalFont); - } else { - phrase = new Phrase(""); - } - t.addCell(phrase); - //cell 4 - BigDecimal solde = grossAmount; - solde = solde.subtract(provisionDeprecationAmount); - if (solde != BigDecimal.ZERO) { - phrase = new Phrase(solde.toString(), normalFont); - } else { - phrase = new Phrase(""); - } - t.addCell(phrase); } } + financialStatementReport += "</body>" + + "</html>"; - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); + } catch (Exception ex) { + log.error("Can't create document", ex); } - return t; + return financialStatementReport; } - //############## Ledger ############## Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -39,6 +39,8 @@ import javax.ejb.TransactionAttribute; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.Amounts; import org.chorem.lima.beans.AmountsImpl; @@ -64,6 +66,8 @@ @EJB private ReportService reportService; + protected static final Log log = LogFactory.getLog(FinancialStatementServiceImpl.class); + @Override public void createFinancialStatement(FinancialStatement masterFinancialStatement, FinancialStatement financialStatement) throws LimaException { @@ -193,6 +197,7 @@ List<FinancialStatementAmounts> result = null; try { + //create list form tree result = financialStatementReport(null, selectedBeginDate, selectedEndDate, new FinancialStatementDatasImpl()).getListResult(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -164,6 +164,7 @@ String generalEntryBooksReport = null; String balanceReport = null; String ledgerReport = null; + String financialReport = null; //create docs try { @@ -194,8 +195,8 @@ } break; case FINANCIALSTATEMENT: - documentService.createFinancialStatementsDocuments( - beginDateFormat, endDateFormat, formatsEnum); + financialReport = documentService.createFinancialStatementsDocuments( + beginDateFormat, endDateFormat); break; case LEDGER: ledgerReport = documentService.createLedgerDocuments( @@ -225,7 +226,7 @@ resp.setContentType(formatsEnum.getMimeType()); OutputStream out = resp.getOutputStream(); if (accountReport != null || entryBooksReport != null || generalEntryBooksReport != null - || balanceReport != null || ledgerReport != null) { + || balanceReport != null || ledgerReport != null || financialReport != null) { String report = null; if (accountReport != null) { report = accountReport; @@ -235,8 +236,10 @@ report = generalEntryBooksReport; } else if (balanceReport != null) { report = balanceReport; + } else if (ledgerReport != null) { + report = ledgerReport; } else { - report = ledgerReport; + report = financialReport; } IOUtils.write(report, out, Charsets.UTF_8); } else { Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-20 11:38:22 UTC (rev 3613) @@ -76,6 +76,7 @@ lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked lima-business.franceaccountingrules.fiscalperiodnotempty=The fiscal period is not empty \! +lima-business.franceaccountingrules.lastFiscalPeriodCantBlocked= lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=The new fiscal period must adjoining the last lima-business.import.accountadded=SUCCES \: Account %s - %s added\n lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-20 11:38:22 UTC (rev 3613) @@ -76,6 +76,7 @@ lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=Les périodes financières précédentes pour ce journal doivent être bloquées avant lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédente n'est pas bloquée lima-business.franceaccountingrules.fiscalperiodnotempty=La période fiscale à supprimer n'est pas vide \! +lima-business.franceaccountingrules.lastFiscalPeriodCantBlocked=Impossible de clore la dernière période fiscale ouverte lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédente lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -38,7 +38,7 @@ public interface DocumentService { - void createFinancialStatementsDocuments(Date beginDate, Date endDate, FormatsEnum format) throws LimaException; + String createFinancialStatementsDocuments(Date beginDate, Date endDate) throws LimaException; String createLedgerDocuments(Date beginDate, Date endDate) throws LimaException; Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -161,11 +161,10 @@ } //search all account start with accountnumber else { - - String query = "FROM " + Account.class.getName() + " a WHERE NOT IN (" + + String query = "FROM " + Account.class.getName() + " a WHERE a NOT IN (" + "FROM " + Account.class.getName() + " b where b.accountNumber like a.accountNumber+'%')" + - " AND a.accountNumber LIKE ?"; - List<Account> accountsResult = getContext().findAll(query, s); + " AND a.accountNumber LIKE :s"; + List<Account> accountsResult = getContext().findAll(query, "s",s); if (accountsResult != null) { //if first if (first) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -76,10 +76,6 @@ List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "account", account); - if (log.isDebugEnabled()) { - log.debug("Size of entries : " + entries.size()); - } - return entries; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -78,8 +78,6 @@ entryBookService = LimaServiceFactory.getService(EntryBookService.class); fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); - /*LimaServiceFactory.addServiceListener(ImportService.class, this); - LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this);*/ } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2012-08-20 11:38:22 UTC (rev 3613) @@ -41,26 +41,11 @@ <row weightx="1" weighty="0" anchor="center"> <cell fill='both'> - <IntervalPanel id="intervalPanel" onIntervalChanged="handler.intervalChanged()" /> + <IntervalPanel id="intervalPanel"/> </cell> <cell> - <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> - </cell> - <cell> <JButton text="lima.common.ok" onActionPerformed="getHandler().createDocument()"/> </cell> </row> - <row> - <cell fill="both" weightx="1" weighty="1" columns="7"> - <JScrollPane> - <FinancialStatementReportTableModel id="financialStatementReportTableModel"/> - <FinancialStatementReportTable id="table" rowHeight="24" - constructorParams="financialStatementReportTableModel" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> - <ListSelectionModel javaBean="getTable().getSelectionModel()"/> - </JScrollPane> - </cell> - </row> </Table> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2012-08-20 11:38:22 UTC (rev 3613) @@ -25,7 +25,6 @@ package org.chorem.lima.ui.financialstatementreport; -import static org.nuiton.i18n.I18n._; import java.awt.Desktop; import java.io.IOException; @@ -34,22 +33,14 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; - -import javax.swing.JOptionPane; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.beans.FinancialStatementAmounts; -import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialStatementService; -import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.HttpServerService; -import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.utils.DocumentsEnum; -import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; @@ -63,7 +54,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FinancialStatementReportViewHandler implements ServiceListener { +public class FinancialStatementReportViewHandler { /** log. */ private static final Log log = LogFactory.getLog(FinancialStatementReportViewHandler.class); @@ -83,10 +74,6 @@ fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class); financialStatementService = LimaServiceFactory.getService(FinancialStatementService.class); - - LimaServiceFactory.addServiceListener(FinancialStatementService.class, this); - LimaServiceFactory.addServiceListener(ImportService.class, this); - LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this); } /** @@ -95,86 +82,31 @@ public void init() { // init data models - List<FiscalPeriod> fiscalPeriod = fiscalPeriodService.getAllUnblockedFiscalPeriods(); + List<FiscalPeriod> fiscalPeriod = fiscalPeriodService.getAllBlockedFiscalPeriods(); List<FinancialPeriod> financialPeriod = financialPeriodService.getUnblockedFinancialPeriods(); view.getIntervalPanel().init(fiscalPeriod, financialPeriod); } - public void intervalChanged() { - refreshData(); - } - - /** - * Refresh table data depending on item selected on combo boxes. - */ - protected void refreshData() { - - Date beginDate = view.getIntervalPanel().getBeginDate(); - Date endDate = view.getIntervalPanel().getEndDate(); - - if (beginDate != null && endDate != null) { - List<FinancialStatementAmounts> results = - financialStatementService.financialStatementReport(beginDate, endDate); - - FinancialStatementReportTableModel dataModel = view.getFinancialStatementReportTableModel(); - dataModel.setFinancialStatementAmounts(results); - } - } - public void createDocument() { Date beginDate = view.getIntervalPanel().getBeginDate(); Date endDate = view.getIntervalPanel().getEndDate(); if (beginDate != null && endDate != null) { - //looks for all blocked fiscal periods - List<FiscalPeriod> blockedFiscalPeriods = fiscalPeriodService.getAllBlockedFiscalPeriods(); - - //tells if the fiscaPeriod as been found and is blocked - boolean error = true; - - for (FiscalPeriod blockedFiscalPeriod : blockedFiscalPeriods) { - if (blockedFiscalPeriod.getBeginDate().equals(beginDate) - && blockedFiscalPeriod.getEndDate().equals(endDate) - && blockedFiscalPeriod.getLocked()) { - error = false; - } + String address = LimaConfig.getInstance().getHostAdress(); + int port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); + String url = "http://" + address + ":" + port + "/?beginDate=" + + dateFormat.format(beginDate) + + "&endDate=" + dateFormat.format(endDate) + + "&format=.html&model=" + + DocumentsEnum.FINANCIALSTATEMENT.getFileName(); + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException e) { + log.error("Can't open browser", e); + } catch (URISyntaxException e) { + log.error("Can't create news URI", e); } - - //shows error message to user if the fiscalPeriod is unblocked - if (error) { - JOptionPane.showMessageDialog( - view, - "Can't create document on an open fiscal year", - _("lima.common.error"), - JOptionPane.ERROR_MESSAGE); - } else { - FormatsEnum selectedEnum = - (FormatsEnum) view.getDocumentEditor().getSelectedItem(); - - String address = LimaConfig.getInstance().getHostAdress(); - int port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); - String url = "http://" + address + ":" + port + "/?beginDate=" - + dateFormat.format(beginDate) - + "&endDate=" + dateFormat.format(endDate) - + "&format=" + selectedEnum.getExtension() + "&model=" - + DocumentsEnum.FINANCIALSTATEMENT.getFileName(); - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); - } catch (URISyntaxException e) { - log.error("Can't create news URI", e); - } - } } } - - @Override - public void notifyMethod(String serviceName, String methodName) { - if (serviceName.contains("FinancialTransaction") || - methodName.contains("FinancialStatement") || methodName.contains("importAll")) { - refreshData(); - } - } } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-17 17:24:10 UTC (rev 3612) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-20 11:38:22 UTC (rev 3613) @@ -60,4 +60,5 @@ log4j.logger.org.chorem.lima.business.ejb.HttpServerServiceImpl=DEBUG log4j.logger.org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler=DEBUG log4j.logger.org.chorem.lima.business.ejb.ReportServiceImpl=DEBUG -log4j.logger.org.chorem.lima.ui.MainViewHandler=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.MainViewHandler=DEBUG +log4j.logger.org.chorem.lima.business.ejb.FinancialStatementServiceImpl=DEBUG \ No newline at end of file

1 0