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

11 Jul '11

Author: vsalaun Date: 2011-07-11 13:02:45 +0200 (Mon, 11 Jul 2011) New Revision: 3207 Url: http://chorem.org/repositories/revision/lima/3207 Log: add headers in lima-swing Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.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 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/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-07-11 11:02:45 UTC (rev 3207) @@ -14,19 +14,18 @@ # - Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - GNU Lesser General Public License # - General Public License (GPL) # - HSQLDB License # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for Java Transaction API Classes # - License Agreement for JavaMail(TM) API # - MIT License # - Mozilla Public License -# - OpenSymphony Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - The OpenSymphony Software License 1.1 # - http://asm.ow2.org/license.html # - http://www.apache.org/licenses/LICENSE-2.0.txt # - jdomlicence @@ -34,7 +33,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Mar 24 13:26:50 CET 2011 +#Mon Jul 11 11:37:32 CEST 2011 antlr--antlr--2.7.6--jar=ANTLR 2 License com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 @@ -44,7 +43,6 @@ javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes -opensymphony--ognl--2.6.11--jar=OpenSymphony Software License, Version 1.1 org.apache.commons--commons-email--1.2--jar=The Apache Software License, Version 2.0 org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.enums; public enum VatStatementsChartEnum { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.account; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.accountsreports; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.balance; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.celleditor; import java.awt.Component; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.celleditor; import java.awt.Component; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.celleditor; import java.awt.Color; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.entrybook; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.financialstatementchart; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -184,52 +184,52 @@ TreePath treePath = view.treeTable.getPathForRow(selectedRow); // not null FinancialStatement financialStatement = (FinancialStatement) treePath.getLastPathComponent(); - //update Account or update SubLedger - if (financialStatement != null) { - // get current selection path - if ( selectedRow != -1) { - treePath = view.treeTable.getPathForRow(selectedRow); - } else { - treePath = new TreePath(treeTableModel.getRoot()); + //update Account or update SubLedger + if (financialStatement != null) { + // get current selection path + if ( selectedRow != -1) { + treePath = view.treeTable.getPathForRow(selectedRow); + } else { + treePath = new TreePath(treeTableModel.getRoot()); + } + //test if selectedrow is account or ledger + log.debug(financialStatement.getHeader()); + if (financialStatement.getHeader()){ + FinancialStatementHeaderForm financialStatementHeaderForm = + new FinancialStatementHeaderForm(view); + financialStatementHeaderForm.setFinancialStatement(financialStatement); + // jaxx constructor don't call super() ? + financialStatementHeaderForm.setLocationRelativeTo(view); + financialStatementHeaderForm.setVisible(true); + // null == cancel action + financialStatement = financialStatementHeaderForm.getFinancialStatement(); } - //test if selectedrow is account or ledger - log.debug(financialStatement.getHeader()); - if (financialStatement.getHeader()){ - FinancialStatementHeaderForm financialStatementHeaderForm = - new FinancialStatementHeaderForm(view); - financialStatementHeaderForm.setFinancialStatement(financialStatement); - // jaxx constructor don't call super() ? - financialStatementHeaderForm.setLocationRelativeTo(view); - financialStatementHeaderForm.setVisible(true); - // null == cancel action - financialStatement = financialStatementHeaderForm.getFinancialStatement(); + // else is a movement + else{ + FinancialStatementMovementForm financialStatementMovementForm = + new FinancialStatementMovementForm(view); + financialStatementMovementForm.setFinancialStatement(financialStatement); + // jaxx constructor don't call super() ? + financialStatementMovementForm.setLocationRelativeTo(view); + financialStatementMovementForm.setVisible(true); + // null == cancel action + financialStatement = + financialStatementMovementForm.getFinancialStatement(); + } + //if action confirmed + if (financialStatement != null){ + // update it + try { + treeTableModel.updateFinancialStatement( + treePath, financialStatement); + } catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.error("Can't add update", eee); } - // else is a movement - else{ - FinancialStatementMovementForm financialStatementMovementForm = - new FinancialStatementMovementForm(view); - financialStatementMovementForm.setFinancialStatement(financialStatement); - // jaxx constructor don't call super() ? - financialStatementMovementForm.setLocationRelativeTo(view); - financialStatementMovementForm.setVisible(true); - // null == cancel action - financialStatement = - financialStatementMovementForm.getFinancialStatement(); + DialogHelper.showMessageDialog(eee.getMessage()); } - //if action confirmed - if (financialStatement != null){ - // update it - try { - treeTableModel.updateFinancialStatement( - treePath, financialStatement); - } catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't add update", eee); - } - DialogHelper.showMessageDialog(eee.getMessage()); - } - } } + } } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ + <JDialog modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.lettering; import java.awt.event.ActionEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.vatchart; import java.awt.event.KeyEvent; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.vatchart; import static org.nuiton.i18n.I18n._; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ + <Table> <VatChartViewHandler id="handler" javaBean="new VatChartViewHandler(this)" /> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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.vatchart; import org.apache.commons.logging.Log; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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 java.awt.Color; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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 static org.nuiton.i18n.I18n._; 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 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ + <Table> <VatReportViewHandler id="handler" javaBean="new VatReportViewHandler(this)" /> <Boolean id="selectedRow" javaBean="false" /> @@ -37,6 +61,9 @@ constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> <cell> + <JCheckBox id='autocomplete' text='lima.common.autocomplete' selected='true'/> + </cell> + <cell> <JButton id="editVatButton" text="lima.reports.vat" onActionPerformed="getHandler().editVat()"/> </cell> 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 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2011-07-11 11:02:45 UTC (rev 3207) @@ -1,3 +1,27 @@ +/* + * #%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 java.awt.Desktop; 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 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-07-11 11:02:45 UTC (rev 3207) @@ -39,6 +39,7 @@ lima.common.amount=Amount lima.common.amountcredit=Credit amount lima.common.amountdebit=Debit amount +lima.common.autocomplete=Autocomplete lima.common.begindate=Begin lima.common.buttonback=← lima.common.buttonnext=→ 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 2011-07-11 10:26:05 UTC (rev 3206) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-07-11 11:02:45 UTC (rev 3207) @@ -39,6 +39,7 @@ lima.common.amount=Montant lima.common.amountcredit=Total Crédit lima.common.amountdebit=Total Débit +lima.common.autocomplete=Autocomplétion lima.common.begindate=Début lima.common.buttonback=← lima.common.buttonnext=→

1 0

r3206 - in trunk: lima-business lima-swing
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 12:26:05 +0200 (Mon, 11 Jul 2011) New Revision: 3206 Url: http://chorem.org/repositories/revision/lima/3206 Log: update pom for release Modified: trunk/lima-business/pom.xml trunk/lima-swing/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 10:26:04 UTC (rev 3205) +++ trunk/lima-business/pom.xml 2011-07-11 10:26:05 UTC (rev 3206) @@ -15,6 +15,11 @@ <dependencies> <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>lima-callao</artifactId> <version>${project.version}</version> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 10:26:04 UTC (rev 3205) +++ trunk/lima-swing/pom.xml 2011-07-11 10:26:05 UTC (rev 3206) @@ -48,6 +48,11 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> <dependency> <groupId>org.nuiton.i18n</groupId>

1 0

r3205 - trunk
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 12:26:04 +0200 (Mon, 11 Jul 2011) New Revision: 3205 Url: http://chorem.org/repositories/revision/lima/3205 Log: update pom for release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 09:10:32 UTC (rev 3204) +++ trunk/pom.xml 2011-07-11 10:26:04 UTC (rev 3205) @@ -27,9 +27,9 @@ <dependencies> <dependency> - <groupId>javax</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <version>5</version> + <version>5.0-3</version> <scope>provided</scope> </dependency> @@ -198,6 +198,7 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api</artifactId> <version>2.5-6.0.1</version> + <scope>runtime</scope> </dependency>

1 0

r3204 - trunk
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 11:10:32 +0200 (Mon, 11 Jul 2011) New Revision: 3204 Url: http://chorem.org/repositories/revision/lima/3204 Log: update pom for release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-10 22:49:11 UTC (rev 3203) +++ trunk/pom.xml 2011-07-11 09:10:32 UTC (rev 3204) @@ -25,6 +25,13 @@ <dependencyManagement> <dependencies> + + <dependency> + <groupId>javax</groupId> + <artifactId>javaee-api</artifactId> + <version>5</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -123,11 +130,13 @@ <groupId>org.apache.openejb</groupId> <artifactId>ejb31-api-experimental</artifactId> <version>${openEjbVersion}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.openejb</groupId> <artifactId>openejb-ejbd</artifactId> <version>${openEjbVersion}</version> + <scope>runtime</scope> </dependency>

1 0

r3203 - trunk/lima-callao/src/main/xmi
by vsalaun＠users.chorem.org 10 Jul '11

10 Jul '11

Author: vsalaun Date: 2011-07-11 00:49:11 +0200 (Mon, 11 Jul 2011) New Revision: 3203 Url: http://chorem.org/repositories/revision/lima/3203 Log: #347 update VatStatement entity (accouting.zargo) Modified: trunk/lima-callao/src/main/xmi/accounting.zargo Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ)

1 0

r3202 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/java/org/chorem/lima/ui/vatchart
by vsalaun＠users.chorem.org 08 Jul '11

08 Jul '11

Author: vsalaun Date: 2011-07-08 14:53:14 +0200 (Fri, 08 Jul 2011) New Revision: 3202 Url: http://chorem.org/repositories/revision/lima/3202 Log: #347 allows to update the treeTable Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 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 2011-07-08 09:03:27 UTC (rev 3201) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-07-08 12:53:14 UTC (rev 3202) @@ -1060,8 +1060,9 @@ .getLabel()); vatStatement.setAccounts(vatStatementImport .getAccounts()); - vatStatement.setHeader(vatStatementImport - .getHeader()); + vatStatement.setHeader(Boolean + .parseBoolean(vatStatementImport + .getHeader())); vatStatementService .createVatStatementWithTransaction( masterVatStatement, 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 2011-07-08 09:03:27 UTC (rev 3201) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-07-08 12:53:14 UTC (rev 3202) @@ -230,9 +230,6 @@ y_tab = this.getSelectedRow(); Boolean end = true; - System.out.println("x_tab : " + x_tab); - System.out.println("y_tab : " + y_tab); - if (x_tab < max_x - 1){ x_tab++; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-08 09:03:27 UTC (rev 3201) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-08 12:53:14 UTC (rev 3202) @@ -146,7 +146,7 @@ @Override public boolean isCellEditable(Object node, int column) { - return false; + return ((column == 1) && (isLeaf(node))); } @Override @@ -197,4 +197,18 @@ vatStatementService.updateVatStatement(vatStatement); modelSupport.fireTreeStructureChanged(path); } + + + @Override + public void setValueAt(Object value, Object node, int column) { + VatStatement vatStatement = (VatStatement) node; + vatStatement.setAccounts((String) value); + try { + vatStatementService.updateVatStatement(vatStatement); + } catch (LimaException eee) { + log.debug("Can't update vatStatement", eee); + } + } + + }

1 0

r3201 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-business/src/main/java/org/chorem/lima/business/migration lima-business/src/main/java/org/chorem/lima/business/utils lima-business/src/main/resources/i18n lima-callao/src/main/java/org/chorem/lima/entity lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/enums lima-swing/src/main/ja
by vsalaun＠users.chorem.org 08 Jul '11

08 Jul '11

Author: vsalaun Date: 2011-07-08 11:03:27 +0200 (Fri, 08 Jul 2011) New Revision: 3201 Url: http://chorem.org/repositories/revision/lima/3201 Log: #347 add import vat service + improve vat chart table + add vat CSV files Added: trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java trunk/lima-swing/src/main/resources/import/vat_base.csv trunk/lima-swing/src/main/resources/import/vat_default.csv trunk/lima-swing/src/main/resources/import/vat_developed.csv trunk/lima-swing/src/main/resources/import/vat_shortened.csv Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.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/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ExportService.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/ImportExportEntityEnum.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/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.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 Added: trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,7 @@ +package org.chorem.lima.business; + +import org.chorem.lima.business.ejbinterface.VatStatementService; + +public interface VatStatementServiceMonitorable extends VatStatementService, ServiceMonitorable { + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -55,6 +55,8 @@ import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.entity.VatStatement; +import org.chorem.lima.entity.VatStatementDAO; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -349,6 +351,66 @@ doCatch(topiaContext, eeeTE, log); } } + + /** + * Remote method call from UI. + */ + @Override + public String exportVatStatementChartAsCSV() throws LimaException { + + TopiaContext topiaContext = null; + StringWriter out = new StringWriter(); + CSVWriter csvWriter; + + try { + topiaContext = beginTransaction(); + csvWriter = new CSVWriter(out, ';'); + exportVatStatementChartAsCSV(csvWriter, topiaContext); + // Write cache in file + csvWriter.flush(); + csvWriter.close(); + } + catch (TopiaException eeeTE){ + doCatch(topiaContext, eeeTE, log); + } + catch (IOException eeeIO) { + log.error("Can't create new CSV Writer",eeeIO); + } + finally { + doFinally(topiaContext, log); + } + return out.getBuffer().toString(); + + } + + /** + * Local methode, export vatstatements from database + * structure : TYPE | Label | Header | Accounts + */ + public void exportVatStatementChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { + try { + String[] nextLine = new String[11]; + // Get all Vatstatements + VatStatementDAO vatStatementDAO = + LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); + + TopiaQuery query = vatStatementDAO.createQuery(); + query.addOrder(VatStatement.TOPIA_CREATE_DATE); + List<VatStatement> listVatStatements = + vatStatementDAO.findAllByQuery(query); + + // For all Vatstatements + for (VatStatement vatStatement : listVatStatements) { + nextLine[0] = ImportExportEntityEnum.VATSTATEMENT.getLabel(); + nextLine[1] = vatStatement.getLabel(); + nextLine[2] = vatStatement.getAccounts(); + csvWriter.writeNext(nextLine); + } + } + catch (TopiaException eeeTE){ + doCatch(topiaContext, eeeTE, log); + } + } /** 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -66,7 +66,7 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implements FinancialStatementService, FinancialStatementServiceLocal{ private static final Log log = - LogFactory.getLog(AccountServiceImpl.class); + LogFactory.getLog(FinancialStatementServiceImpl.class); private TopiaContext rootContext; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -25,7 +25,6 @@ package org.chorem.lima.business.ejb; -import static org.nuiton.i18n.I18n._; import java.math.BigDecimal; import java.util.ArrayList; 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -61,6 +61,8 @@ import org.chorem.lima.beans.FinancialStatementImportImpl; import org.chorem.lima.beans.FinancialTransactionImport; import org.chorem.lima.beans.FinancialTransactionImportImpl; +import org.chorem.lima.beans.VatStatementImport; +import org.chorem.lima.beans.VatStatementImportImpl; import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; @@ -73,6 +75,7 @@ import org.chorem.lima.business.ejbinterface.IdentityServiceLocal; import org.chorem.lima.business.ejbinterface.ImportService; import org.chorem.lima.business.ejbinterface.ImportServiceLocal; +import org.chorem.lima.business.ejbinterface.VatStatementServiceLocal; import org.chorem.lima.business.utils.AccountEBPComparator; import org.chorem.lima.business.utils.EntryEBPComparator; import org.chorem.lima.business.utils.FiscalPeriodComparator; @@ -105,6 +108,9 @@ import org.chorem.lima.entity.LetterDAO; import org.chorem.lima.entity.LetterImpl; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.entity.VatStatement; +import org.chorem.lima.entity.VatStatementDAO; +import org.chorem.lima.entity.VatStatementImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -145,6 +151,9 @@ @EJB private FinancialStatementServiceLocal financialStatementService; + + @EJB + private VatStatementServiceLocal vatStatementService; @EJB private EntryBookServiceLocal entryBookService; @@ -442,6 +451,9 @@ LinkedHashMap<String, ArrayList<FinancialStatementImport>> financialStatements = new LinkedHashMap<String, ArrayList<FinancialStatementImport>>(); + + LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements = + new LinkedHashMap<String, ArrayList<VatStatementImport>>(); List<FiscalPeriod> fiscalPeriods = new ArrayList<FiscalPeriod>(); @@ -478,6 +490,10 @@ result.append(importFinancialsStatementChartCSV(nextLine, financialStatements, topiaContext)); break; + case VATSTATEMENT: + result.append(importVatStatementChartCSV(nextLine, + vatStatements, topiaContext)); + break; case FISCALPERIOD: result.append(importFiscalPeriodCSV(nextLine, fiscalPeriods, topiaContext)); @@ -505,6 +521,9 @@ // create financialStatements result.append(createFinancialStatements(financialStatements, topiaContext)); + // create vatStatements + result.append(createVatStatements(vatStatements, + topiaContext)); // create fiscalperiod Collections.sort(fiscalPeriods, new FiscalPeriodComparator()); result.append(createFiscalPeriod(fiscalPeriods, topiaContext)); @@ -539,6 +558,8 @@ LinkedHashMap<String, ArrayList<FinancialStatementImport>> financialStatements = null; // Accounts Map<String, AccountImport> accounts = null; + // VatStatement + LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements = null; switch (importExportEntityEnum) { case ACCOUNT: @@ -547,6 +568,9 @@ case FINANCIALSTATEMENT: financialStatements = new LinkedHashMap<String, ArrayList<FinancialStatementImport>>(); break; + case VATSTATEMENT: + vatStatements = new LinkedHashMap<String, ArrayList<VatStatementImport>>(); + break; } TopiaContext topiaContext = null; @@ -562,16 +586,18 @@ case ENTRYBOOK: result.append(importEntryBooksChartCSV(nextLine, topiaContext)); break; - case ACCOUNT: result.append(importAccountsChartsCSV(nextLine, accounts, topiaContext)); break; case FINANCIALSTATEMENT: - result.append(importFinancialsStatementChartCSV(nextLine, financialStatements, topiaContext)); break; + case VATSTATEMENT: + result.append(importVatStatementChartCSV(nextLine, + vatStatements, topiaContext)); + break; } } } @@ -585,6 +611,10 @@ result.append(createFinancialStatements(financialStatements, topiaContext)); break; + case VATSTATEMENT: + result.append(createVatStatements(vatStatements, + topiaContext)); + break; } } catch (TopiaException eeeTE) { @@ -814,9 +844,56 @@ } return result.toString(); } + + + /** + * Import and create vatstatement Structure : TYPE | label | accounts + */ + public String importVatStatementChartCSV(String[] nextLine, + LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements, + TopiaContext topiaContext) throws LimaException { + + StringBuffer result = new StringBuffer(); + + String label = nextLine[1]; + String header = nextLine[2]; + String accounts = nextLine[3]; + String masterVatStatement = nextLine[4]; + + try { + VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper + .getVatStatementDAO(topiaContext); + + // if exist, skip + if (vatStatementDAO.findByLabel(label) == null) { + // create it + VatStatementImport vatStatementImport = new VatStatementImportImpl(); + vatStatementImport.setLabel(label); + vatStatementImport.setHeader(header); + vatStatementImport.setAccounts(accounts); + vatStatementImport.setMasterVatStatement(masterVatStatement); + + // put it in hashlinkedlist + if (vatStatements.containsKey(label)){ + vatStatements.get(label).add(vatStatementImport); + } else { + List<VatStatementImport> list = new ArrayList<VatStatementImport>(); + list.add(vatStatementImport); + vatStatements.put(label, (ArrayList<VatStatementImport>) list); + } + } else { + result.append(_("lima-business.import.vatstatementalreadyexist", label)); + } + } catch (TopiaException eeeTE) { + doCatch(topiaContext, eeeTE, log); + } + return result.toString(); + } + + /** - * Import and create financialtransactions Structue : TYPE | NumTransac | + * Import and create financialtransactions Structure : TYPE | NumTransac | * TransactionDate | AmountDebit | AmountCredit | FinancialPeriod BeginDate * | FinancialPeriod EndDate | EntryBook Code */ @@ -951,7 +1028,68 @@ } return result.toString(); } + + public String createVatStatements(LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements, + TopiaContext topiaContext) throws LimaException { + + StringBuffer result = new StringBuffer(); + try { + VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper + .getVatStatementDAO(topiaContext); + + while (vatStatements.size() > 0) { + for (Iterator<ArrayList<VatStatementImport>> itr = vatStatements + .values().iterator(); itr.hasNext();) { + List<VatStatementImport> vatStatementImports = + itr.next(); + + for (Iterator<VatStatementImport> itr2 = vatStatementImports.iterator(); itr2.hasNext();) { + VatStatementImport vatStatementImport = + itr2.next(); + String masterVatStatementLabel = vatStatementImport + .getMasterVatStatement(); + VatStatement masterVatStatement = vatStatementDAO + .findByLabel(masterVatStatementLabel); + + if (masterVatStatementLabel.equals("") + || masterVatStatement != null) { + // create it + VatStatement vatStatement = new VatStatementImpl(); + vatStatement.setLabel(vatStatementImport + .getLabel()); + vatStatement.setAccounts(vatStatementImport + .getAccounts()); + vatStatement.setHeader(vatStatementImport + .getHeader()); + vatStatementService + .createVatStatementWithTransaction( + masterVatStatement, + vatStatement, topiaContext); + + result.append(_("lima-business.import.vatstatementadded", + vatStatementImport.getLabel())); + + itr2.remove(); + } else if (!vatStatements + .containsKey(masterVatStatementLabel)) { + result.append(_("lima-business.import.vatstatementalnomaster", + vatStatementImport.getLabel(), + masterVatStatementLabel)); + itr2.remove(); + } + } + if (vatStatementImports.isEmpty()){ + itr.remove(); + } + } + } + } catch (TopiaException eeeTE) { + doCatch(topiaContext, eeeTE, log); + } + return result.toString(); + } + public String createFiscalPeriod(List<FiscalPeriod> fiscalPeriods, TopiaContext topiaContext) { StringBuffer result = new StringBuffer(); Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,205 @@ +package org.chorem.lima.business.ejb; + +import java.util.List; + +import javax.ejb.Stateless; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ejbinterface.VatStatementService; +import org.chorem.lima.business.ejbinterface.VatStatementServiceLocal; +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.entity.VatStatement; +import org.chorem.lima.entity.VatStatementDAO; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaQuery; + +/** + * Permet d'implémenter le plan de la déclaration de TVA + * @author vsalaun + * + */ + +@Stateless +public class VatStatementServiceImpl extends AbstractLimaService implements VatStatementService, VatStatementServiceLocal { + + private static final Log log = + LogFactory.getLog(VatStatementServiceImpl.class); + + private TopiaContext rootContext; + + public VatStatementServiceImpl() { + LimaConfig config = LimaConfig.getInstance(); + try { + rootContext = TopiaContextFactory.getContext(config.getOptions()); + } catch (TopiaNotFoundException ex) { + if (log.isErrorEnabled()) { + log.error("Can't init topia context", ex); + } + } + } + + + @Override + public void createVatStatementWithTransaction( + VatStatement masterVatStatement, VatStatement vatStatement, + TopiaContext topiaContext) throws LimaException { + + try { + VatStatementDAO vatStatementDAO = + LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); + + vatStatementDAO.create(vatStatement); + + VatStatement mastervatStatementUpdate = null; + if (masterVatStatement != null) { + mastervatStatementUpdate = vatStatementDAO.findByLabel(masterVatStatement.getLabel()); + } + + // check if parent account exist; + if (mastervatStatementUpdate != null) { + mastervatStatementUpdate.addSubVatStatements(vatStatement); + vatStatementDAO.update(mastervatStatementUpdate); + } + + commitTransaction(topiaContext); + + } + catch (TopiaException ex) { + doCatch(topiaContext, ex, log); + } + + } + + + @Override + public void createVatStatement(VatStatement masterVatStatement, VatStatement vatStatement) throws LimaException { + + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + createVatStatementWithTransaction(masterVatStatement, vatStatement, transaction); + } + catch (Exception ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + } + + + @Override + public List<VatStatement> getAllVatStatements() throws LimaException { + + TopiaContext transaction = null; + List<VatStatement> vatStatements = null; + try { + transaction = beginTransaction(); + VatStatementDAO vatStatementDAO = + LimaCallaoDAOHelper.getVatStatementDAO(transaction); + vatStatements = vatStatementDAO.findAll(); + } catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + return vatStatements; + + } + + + @Override + public List<VatStatement> getAllChildrenVatStatement( + VatStatement vatStatement, List<VatStatement> result) throws LimaException { + + List<VatStatement> childVatStatements = + getChildrenVatStatement(vatStatement); + for (VatStatement childVatStatement: childVatStatements) { + result.add(childVatStatement); + getAllChildrenVatStatement(childVatStatement, result); + } + return result; + + } + + + @Override + public List<VatStatement> getChildrenVatStatement(VatStatement masterVatStatement) throws LimaException { + + List<VatStatement> vatStatements = null; + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + VatStatementDAO vatStatementDAO = + LimaCallaoDAOHelper.getVatStatementDAO(transaction); + + TopiaQuery query = vatStatementDAO.createQuery(); + query.addEquals("masterVatStatement", masterVatStatement) + .addOrder(VatStatement.TOPIA_CREATE_DATE); + vatStatements = vatStatementDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + return vatStatements; + + } + + @Override + public void updateVatStatement(VatStatement vatStatement) throws LimaException { + + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + // DAO + VatStatementDAO vatStatementHeaderDAO = + LimaCallaoDAOHelper.getVatStatementDAO(transaction); + //update + vatStatementHeaderDAO.update(vatStatement); + //commit + commitTransaction(transaction); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + } + + 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; + + } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { + + try { + topiaTransaction.commitTransaction(); + } catch (TopiaException eee) { + if (log.isErrorEnabled()) { + log.error("Error during commit context", eee); + } + throw eee; + } + + } + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ExportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ExportService.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ExportService.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -62,6 +62,11 @@ String exportFinancialStatementChartAsCSV() throws LimaException; /** + * export vatstatement chart as CSV + */ + String exportVatStatementChartAsCSV() throws LimaException; + + /** * export accounts chart as CSV. */ String exportAccountsChartAsCSV() throws LimaException; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,27 @@ +package org.chorem.lima.business.ejbinterface; + +import java.util.List; + +import javax.ejb.Remote; + +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.VatStatement; + +@Remote +public interface VatStatementService { + + void createVatStatement(VatStatement masterVatStatement, + VatStatement vatStatement) throws LimaException; + + List<VatStatement> getAllVatStatements() throws LimaException; + + List<VatStatement> getAllChildrenVatStatement( + VatStatement vatStatement, List<VatStatement> result) + throws LimaException; + + List<VatStatement> getChildrenVatStatement(VatStatement masterVatStatement) + throws LimaException; + + void updateVatStatement(VatStatement vatStatement) throws LimaException; + +} \ No newline at end of file Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,16 @@ +package org.chorem.lima.business.ejbinterface; + +import javax.ejb.Local; + +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.VatStatement; +import org.nuiton.topia.TopiaContext; + +@Local +public interface VatStatementServiceLocal extends VatStatementService { + + void createVatStatementWithTransaction( + VatStatement masterVatStatement, VatStatement vatStatement, + TopiaContext transaction) throws LimaException; + +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -28,8 +28,6 @@ import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver; import org.nuiton.util.Version; public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/ImportExportEntityEnum.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/ImportExportEntityEnum.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/ImportExportEntityEnum.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -30,7 +30,7 @@ ACCOUNT("ACCN"), ENTRYBOOK("ENBK"), FINANCIALSTATEMENT("FNST"), FISCALPERIOD("FSCP"), CLOSEDPERIODICENTRYBOOK("CPEB"), FINANCIALTRANSACTION("FTRC"), ENTRY("NTRY"), - IDENTITY("IDNT"); + VATSTATEMENT("VAT"), IDENTITY("IDNT"); private final String label; private ImportExportEntityEnum(String label) { 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2011-07-08 09:03:27 UTC (rev 3201) @@ -1,69 +1,72 @@ -= -lima-business.account.accountalreardyexist=An account already exists with this number \: %s -lima-business.common.failed=FAILED \: %s \n -lima-business.document.accountnumber=Account N\u00B0 -lima-business.document.amounts=Amounts -lima-business.document.balance=Balance -lima-business.document.businessnumber=Business N\u00B0 -lima-business.document.carryback=Carry Back -lima-business.document.carryforward=reporter\u00C0 -lima-business.document.classificationcode=Classification Code -lima-business.document.createdate1=Editing Date -lima-business.document.createdate2=to -lima-business.document.credit=Credit -lima-business.document.date=Date -lima-business.document.date.begin=Begin date -lima-business.document.date.end=End date -lima-business.document.debit=Debit -lima-business.document.description=Description -lima-business.document.entrybook=EntryBook -lima-business.document.financialstatement=FinancialStatement -lima-business.document.generalentrybook=General EntryBook -lima-business.document.grossamount=Gross Amount -lima-business.document.label=Label -lima-business.document.ledger=Ledger -lima-business.document.movementcredit=Credit movement -lima-business.document.movementdebit=Debit movement -lima-business.document.netamount=Net Amount -lima-business.document.pagenumber=Page N\u00B0 -lima-business.document.period1=Periode from -lima-business.document.period2=to -lima-business.document.provisiondeprecationamount=Provision Deprecation Amount -lima-business.document.solde=Solde -lima-business.document.soldecredit=Credit solde -lima-business.document.soldedebit=Debit solde -lima-business.document.vat=VAT form -lima-business.document.vatnumber=VAT N\u00B0 -lima-business.document.voucher=Voucher -lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s -lima-business.financialstatement.check.nothing=Not found \: %s - %s \n -lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financialstatement.\n Some account marked not found is normally.\n\n -lima-business.financialtransaction.retainedearnings.description=Report \u00E0 nouveau -lima-business.financialtransaction.retainedearnings.voucher=Selon d\u00E9cision AG -lima-business.import.accountadded=SUCCES \: Account %s - %s added\n -lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n -lima-business.import.accountnomaster=FAILED \: The account %s have master \: %s which not exist \n -lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n -lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. -lima-business.import.ebpnoentry=FAILED \: This file contains no entries. -lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n -lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" -lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n -lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n -lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n -lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s have master \: %s which not exist \n -lima-business.import.financialstatementalreadyexist=FAILED \: The financialstatement %s already exists \!\n -lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n -lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n -lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n -lima-business.import.letteradded=SUCCESS \: The letter %s - %s is created \! \n -lima-business.import.letteralreadyexist=FAILED \: The letter %s already exists \!\n -lima-business.import.noaccount=ERROR \: This file contains no account -lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n -lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n -lima.config.configFileName.description= -lima.config.httpport=HTTP Port -lima.config.reportsdir=Reports directories -lima.config.rulesnationality=Rules Nationality -lima.config.scale=Scale -lima.config.serveraddress=Server Address += +lima-business.account.accountalreardyexist=An account already exists with this number \: %s +lima-business.common.failed=FAILED \: %s \n +lima-business.document.accountnumber=Account N° +lima-business.document.amounts=Amounts +lima-business.document.balance=Balance +lima-business.document.businessnumber=Business N° +lima-business.document.carryback=Carry Back +lima-business.document.carryforward=reporterÀ +lima-business.document.classificationcode=Classification Code +lima-business.document.createdate1=Editing Date +lima-business.document.createdate2=to +lima-business.document.credit=Credit +lima-business.document.date=Date +lima-business.document.date.begin=Begin date +lima-business.document.date.end=End date +lima-business.document.debit=Debit +lima-business.document.description=Description +lima-business.document.entrybook=EntryBook +lima-business.document.financialstatement=FinancialStatement +lima-business.document.generalentrybook=General EntryBook +lima-business.document.grossamount=Gross Amount +lima-business.document.label=Label +lima-business.document.ledger=Ledger +lima-business.document.movementcredit=Credit movement +lima-business.document.movementdebit=Debit movement +lima-business.document.netamount=Net Amount +lima-business.document.pagenumber=Page N° +lima-business.document.period1=Periode from +lima-business.document.period2=to +lima-business.document.provisiondeprecationamount=Provision Deprecation Amount +lima-business.document.solde=Solde +lima-business.document.soldecredit=Credit solde +lima-business.document.soldedebit=Debit solde +lima-business.document.vat=VAT form +lima-business.document.vatnumber=VAT N° +lima-business.document.voucher=Voucher +lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s +lima-business.financialstatement.check.nothing=Not found \: %s - %s \n +lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financialstatement.\n Some account marked not found is normally.\n\n +lima-business.financialtransaction.retainedearnings.description=Report à nouveau +lima-business.financialtransaction.retainedearnings.voucher=Selon décision AG +lima-business.import.accountadded=SUCCES \: Account %s - %s added\n +lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n +lima-business.import.accountnomaster=FAILED \: The account %s have master \: %s which not exist \n +lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n +lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. +lima-business.import.ebpnoentry=FAILED \: This file contains no entries. +lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n +lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" +lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n +lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n +lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n +lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s has master \: %s which not exist \n +lima-business.import.financialstatementalreadyexist=FAILED \: The financialstatement %s already exists \!\n +lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n +lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n +lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n +lima-business.import.letteradded=SUCCESS \: The letter %s - %s is created \! \n +lima-business.import.letteralreadyexist=FAILED \: The letter %s already exists \!\n +lima-business.import.noaccount=ERROR \: This file contains no account +lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n +lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n +lima-business.import.vatstatementadded=SUCCESS \: The vatStatement %s is created \n +lima-business.import.vatstatementalnomaster=FAILED \: The vatStatement %s has master \: %s which not exist \n +lima-business.import.vatstatementalreadyexist=FAILED \: The vatStatement %s already exists \!\n +lima.config.configFileName.description= +lima.config.httpport=HTTP Port +lima.config.reportsdir=Reports directories +lima.config.rulesnationality=Rules Nationality +lima.config.scale=Scale +lima.config.serveraddress=Server Address 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2011-07-08 09:03:27 UTC (rev 3201) @@ -1,69 +1,72 @@ -= -lima-business.account.accountalreardyexist=Un compte existe d\u00E9j\u00E0 avec ce num\u00E9ro \: %s -lima-business.common.failed=\u00C9chec \: %s \n -lima-business.document.accountnumber=N\u00B0 Compte -lima-business.document.amounts=Totaux -lima-business.document.balance=Balance -lima-business.document.businessnumber=N\u00B0 Siret -lima-business.document.carryback=Report -lima-business.document.carryforward=\u00C0 reporter -lima-business.document.classificationcode=NAF -lima-business.document.createdate1=Date de tirage -lima-business.document.createdate2=\u00E0 -lima-business.document.credit=Cr\u00E9dit -lima-business.document.date=Date -lima-business.document.date.begin=Date de d\u00E9but \: -lima-business.document.date.end=Date de fin \: -lima-business.document.debit=D\u00E9bit -lima-business.document.description=Description -lima-business.document.entrybook=Journal -lima-business.document.financialstatement=Bilan et compte de r\u00E9sultat -lima-business.document.generalentrybook=Journal G\u00E9n\u00E9ral -lima-business.document.grossamount=Brut -lima-business.document.label=Libell\u00E9 -lima-business.document.ledger=Grand Livre -lima-business.document.movementcredit=Mouvement Cr\u00E9diteur -lima-business.document.movementdebit=Mouvement D\u00E9biteur -lima-business.document.netamount=Net -lima-business.document.pagenumber=N\u00B0 page -lima-business.document.period1=P\u00E9riode du -lima-business.document.period2=au -lima-business.document.provisiondeprecationamount=Amortissements et provisions -lima-business.document.solde=Solde -lima-business.document.soldecredit=Solde Cr\u00E9diteur -lima-business.document.soldedebit=Solde D\u00E9biteur -lima-business.document.vat=D\u00E9claration de TVA -lima-business.document.vatnumber=N\u00B0 TVA -lima-business.document.voucher=Pi\u00E8ce comptable -lima-business.entrybook.entrybookalreadyexist=Un journal existe d\u00E9j\u00E0 avec ce libell\u00E9 \: %s -lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n -lima-business.financialstatement.check.warn=Attention cette fonctionnalit\u00E9 n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas \u00EAtre pr\u00E9sent au bilan et compte de r\u00E9sultat.\n Il est donc normal que des comptes sont marqu\u00E9s comme introuvable.\n\n -lima-business.financialtransaction.retainedearnings.description=Report \u00E0 nouveau -lima-business.financialtransaction.retainedearnings.voucher=Selon d\u00E9cision AG -lima-business.import.accountadded=Succ\u00E8s \: Compte %s - %s ajout\u00E9\n -lima-business.import.accountalreadyexist=\u00C9chec \: Le compte %s existe d\u00E9j\u00E0 \n -lima-business.import.accountnomaster=\u00C9chec \: Le compte %s poss\u00E8de le master \: %s inexistant \n -lima-business.import.closedperiodicentrybookupdated=Succ\u00E8s \: La p\u00E9riode financi\u00E8re %s - %s - %s est ajout\u00E9e \! \n -lima-business.import.ebpmissingaccount=\u00C9chec \: Compte %s inexistant. \nImportation annul\u00E9e. \nCr\u00E9er tous les comptes avant d'importer les \u00E9critures. -lima-business.import.ebpnoentry=\u00C9chec \: Ce fichier ne contient aucune entr\u00E9e. -lima-business.import.entriesoutofdatesrange=Attention \: Cette entr\u00E9e %s ne fait partie d'aucune p\u00E9riode ouverte. Entr\u00E9e non import\u00E9e \!\n -lima-business.import.entryadded=Succ\u00E8s \: Entr\u00E9e %s %s ajout\u00E9e \n -lima-business.import.entrybookalreadyexist=\u00C9chec \: Le journal %s exist d\u00E9j\u00E0 \!\n -lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a \u00E9t\u00E9 cr\u00E9\u00E9 \!\n -lima-business.import.financialstatementadded=Succ\u00E8s \: Mouvement %s ajout\u00E9e \n -lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s poss\u00E8de le master \: %s inexistant \n -lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist d\u00E9j\u00E0 \!\n -lima-business.import.fiscalperiodadded=Succ\u00E8s \: Exercice %s - %s ajout\u00E9e \! \n -lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe d\u00E9j\u00E0 \!\n -lima-business.import.identityadded=Succ\u00E8s \: Identit\u00E9 %s ajout\u00E9e \! \n -lima-business.import.letteradded=Succ\u00E8s \: ajout\u00E9e \! \n -lima-business.import.letteralreadyexist=u00C9chec \: La lettre %s existe d\u00E9j\u00E0 \!\n -lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. -lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n -lima-business.import.transactionadded=Succ\u00E8s \: Transaction, %s, %s, ajout\u00E9e\n -lima.config.configFileName.description= -lima.config.httpport=Port HTTP -lima.config.reportsdir=Dossier des rapports -lima.config.rulesnationality=R\u00E8gles nationales -lima.config.scale=Pr\u00E9cision -lima.config.serveraddress=Addresse serveur += +lima-business.account.accountalreardyexist=Un compte existe déjà avec ce numéro \: %s +lima-business.common.failed=Échec \: %s \n +lima-business.document.accountnumber=N° Compte +lima-business.document.amounts=Totaux +lima-business.document.balance=Balance +lima-business.document.businessnumber=N° Siret +lima-business.document.carryback=Report +lima-business.document.carryforward=À reporter +lima-business.document.classificationcode=NAF +lima-business.document.createdate1=Date de tirage +lima-business.document.createdate2=à +lima-business.document.credit=Crédit +lima-business.document.date=Date +lima-business.document.date.begin=Date de début \: +lima-business.document.date.end=Date de fin \: +lima-business.document.debit=Débit +lima-business.document.description=Description +lima-business.document.entrybook=Journal +lima-business.document.financialstatement=Bilan et compte de résultat +lima-business.document.generalentrybook=Journal Général +lima-business.document.grossamount=Brut +lima-business.document.label=Libellé +lima-business.document.ledger=Grand Livre +lima-business.document.movementcredit=Mouvement Créditeur +lima-business.document.movementdebit=Mouvement Débiteur +lima-business.document.netamount=Net +lima-business.document.pagenumber=N° page +lima-business.document.period1=Période du +lima-business.document.period2=au +lima-business.document.provisiondeprecationamount=Amortissements et provisions +lima-business.document.solde=Solde +lima-business.document.soldecredit=Solde Créditeur +lima-business.document.soldedebit=Solde Débiteur +lima-business.document.vat=Déclaration de TVA +lima-business.document.vatnumber=N° TVA +lima-business.document.voucher=Pièce comptable +lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce libellé \: %s +lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n +lima-business.financialstatement.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable.\n\n +lima-business.financialtransaction.retainedearnings.description=Report à nouveau +lima-business.financialtransaction.retainedearnings.voucher=Selon décision AG +lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n +lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n +lima-business.import.accountnomaster=Échec \: Le compte %s possède le master \: %s inexistant \n +lima-business.import.closedperiodicentrybookupdated=Succès \: La période financière %s - %s - %s est ajoutée \! \n +lima-business.import.ebpmissingaccount=Échec \: Compte %s inexistant. \nImportation annulée. \nCréer tous les comptes avant d'importer les écritures. +lima-business.import.ebpnoentry=Échec \: Ce fichier ne contient aucune entrée. +lima-business.import.entriesoutofdatesrange=Attention \: Cette entrée %s ne fait partie d'aucune période ouverte. Entrée non importée \!\n +lima-business.import.entryadded=Succès \: Entrée %s %s ajoutée \n +lima-business.import.entrybookalreadyexist=Échec \: Le journal %s exist déjà \!\n +lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a été créé \!\n +lima-business.import.financialstatementadded=Succès \: Mouvement %s ajoutée \n +lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s possède le master \: %s inexistant \n +lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist déjà \!\n +lima-business.import.fiscalperiodadded=Succès \: Exercice %s - %s ajoutée \! \n +lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe déjà \!\n +lima-business.import.identityadded=Succès \: Identité %s ajoutée \! \n +lima-business.import.letteradded=Succès \: ajoutée \! \n +lima-business.import.letteralreadyexist=u00C9chec \: La lettre %s existe déjà \!\n +lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. +lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n +lima-business.import.transactionadded=Succès \: Transaction, %s, %s, ajoutée\n +lima-business.import.vatstatementadded=Succès \: Plan de TVA %s ajoutée \n +lima-business.import.vatstatementalnomaster=u00C9chec \: Le plan %s possède le master \: %s inexsitant \n +lima-business.import.vatstatementalreadyexist=u00C9chec \: Le plan %s exist déjà \!\n +lima.config.configFileName.description= +lima.config.httpport=Port HTTP +lima.config.reportsdir=Dossier des rapports +lima.config.rulesnationality=Règles nationales +lima.config.scale=Précision +lima.config.serveraddress=Addresse serveur Added: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,18 @@ +package org.chorem.lima.entity; + +public class VatStatementImpl extends VatStatementAbstract { + + protected Integer level; + + @Override + public int getLevel() { + if (level == null) { + if (masterVatStatement != null){ + level = masterVatStatement.getLevel() + 1; + } else { + level = 1; + } + } + return level; + } +} Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -32,8 +32,10 @@ */ public enum ImportExportEnum { CSV_ALL_EXPORT(false, true), CSV_ALL_IMPORT(true, true), - CSV_ACCOUNTCHARTS_EXPORT(false, true), CSV_ENTRYBOOKS_EXPORT(false, true), CSV_FINANCIALSTATEMENTS_EXPORT(false, true), - CSV_ACCOUNTCHARTS_IMPORT(true, true), CSV_ENTRYBOOKS_IMPORT(true, true), CSV_FINANCIALSTATEMENTS_IMPORT(true, true), + CSV_ACCOUNTCHARTS_EXPORT(false, true), CSV_ACCOUNTCHARTS_IMPORT(true, true), + CSV_ENTRYBOOKS_EXPORT(false, true), CSV_ENTRYBOOKS_IMPORT(true, true), + CSV_FINANCIALSTATEMENTS_EXPORT(false, true), CSV_FINANCIALSTATEMENTS_IMPORT(true, true), + CSV_VAT_EXPORT(false, true), CSV_VAT_IMPORT(true, true), EBP_ACCOUNTCHARTS_EXPORT(false, false), EBP_ENTRIES_EXPORT(false, false), EBP_ACCOUNTCHARTS_IMPORT(true, false), EBP_ENTRIES_IMPORT(true, false); Added: trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,22 @@ +package org.chorem.lima.enums; + +public enum VatStatementsChartEnum { + + IMPORT(""), SHORTENED("vat_shortened.csv"), BASE("vat_base.csv"), + DEVELOPED("vat_developed.csv"), DEFAULT("vat_default.csv"); + + private final String filePath; + + private VatStatementsChartEnum(String filePath) { + this.filePath = filePath; + + } + + public String getFilePath() { + String result = ""; + if (!this.filePath.equals("")){ + result=getClass().getResource("/import/"+this.filePath).getPath(); + } + return result; + } +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -347,7 +347,7 @@ public void showVatChartView(JAXXContext rootContext){ MainView mainView = getUI(rootContext); VatChartView vatChartView = new VatChartView(mainView); - mainView.showTab(_("lima.charts.financialstatement"), vatChartView); + mainView.showTab(_("lima.charts.vat"), vatChartView); } /** 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -138,6 +138,10 @@ datas = exportService.exportFinancialStatementChartAsCSV(); createFile(filePath, charset.getEncoding(), datas); break; + case CSV_VAT_EXPORT: + datas = exportService.exportVatStatementChartAsCSV(); + createFile(filePath, charset.getEncoding(), datas); + break; case EBP_ACCOUNTCHARTS_EXPORT: //For windows ebp datas = exportService.exportAccountsAsEBP(); @@ -164,6 +168,10 @@ datas = extractFile(filePath, charset.getEncoding()); result = importService.importAsCSV(datas, ImportExportEntityEnum.FINANCIALSTATEMENT); break; + case CSV_VAT_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAsCSV(datas, ImportExportEntityEnum.VATSTATEMENT); + break; case EBP_ACCOUNTCHARTS_IMPORT: //For windows ebp datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -41,6 +41,7 @@ import org.chorem.lima.enums.EntryBooksChartEnum; import org.chorem.lima.enums.FinancialStatementsChartEnum; import org.chorem.lima.enums.ImportExportEnum; +import org.chorem.lima.enums.VatStatementsChartEnum; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.identity.IdentityHandler; import org.chorem.lima.ui.importexport.ImportExport; @@ -135,6 +136,26 @@ FinancialStatementsChartEnum.BASE.getFilePath(), false); break; } + //Import vatstatement + switch(defaultAccountsChartEnum) { + case SHORTENED: + importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, + VatStatementsChartEnum.SHORTENED.getFilePath(), false); + break; + case BASE: + importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, + VatStatementsChartEnum.BASE.getFilePath(), false); + break; + case DEVELOPED: + importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, + VatStatementsChartEnum.DEVELOPED.getFilePath(), false); + break; + default: + importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, + VatStatementsChartEnum.DEFAULT.getFilePath(), false); + break; + } + } view.getAccountsIcon().setBorder(noBorder); view.getEntrybooksIcon().setBorder(BorderFactory.createLineBorder(green, 2)); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -5,10 +5,10 @@ import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.FinancialStatementServiceMonitorable; import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.FinancialStatement; -import org.chorem.lima.entity.FinancialStatementImpl; +import org.chorem.lima.business.VatStatementServiceMonitorable; +import org.chorem.lima.entity.VatStatement; +import org.chorem.lima.entity.VatStatementImpl; import org.chorem.lima.service.LimaServiceFactory; import org.jdesktop.swingx.treetable.AbstractTreeTableModel; @@ -18,22 +18,24 @@ private static final Log log = LogFactory.getLog(VatChartViewHandler.class); /** Services. */ - protected final FinancialStatementServiceMonitorable financialStatementService; + protected final VatStatementServiceMonitorable vatStatementService; /** - * Model constructor. Init account service used here. + * Model constructor. Initiate account service used here. */ public VatChartTreeTableModel() { - - financialStatementService = + //create root for the tree + super(new VatStatementImpl()); + // Gets factory service + vatStatementService = LimaServiceFactory.getInstance().getService( - FinancialStatementServiceMonitorable.class); + VatStatementServiceMonitorable.class); } @Override public int getColumnCount() { - return 5; + return 2; } @Override @@ -44,17 +46,8 @@ res = _("lima.table.label"); break; case 1: - res = _("lima.table.debitcredit"); + res = _("lima.table.account"); break; - case 2: - res = _("lima.table.debit"); - break; - case 3: - res = _("lima.table.credit"); - break; - case 4: - res = _("lima.table.provisiondeprecationamount"); - break; } return res; } @@ -64,18 +57,18 @@ int result = 0; if (node == getRoot()) { try { - result = financialStatementService. - getChildrenFinancialStatement(null).size(); + result = vatStatementService. + getChildrenVatStatement(null).size(); } catch (LimaException eee) { log.debug("Can't count child", eee); } } else { - FinancialStatement parentFinancialStatementHeader = - (FinancialStatement) node; + VatStatement parentVatStatementHeader = + (VatStatement) node; try { - result = financialStatementService.getChildrenFinancialStatement( - parentFinancialStatementHeader).size(); + result = vatStatementService.getChildrenVatStatement( + parentVatStatementHeader).size(); } catch (LimaException eee) { log.debug("Can't count child", eee); } @@ -88,20 +81,20 @@ Object result = null; if (parent == getRoot()) { try { - List<FinancialStatement> financialStatements = - financialStatementService.getChildrenFinancialStatement(null); - result = financialStatements.get(index); + List<VatStatement> vatStatements = + vatStatementService.getChildrenVatStatement(null); + result = vatStatements.get(index); } catch (LimaException eee) { log.debug("Can't get child", eee); } } else { - FinancialStatement parentFinancialStatement = - (FinancialStatement) parent; + VatStatement parentVatStatement = + (VatStatement) parent; try { - List<FinancialStatement> financialStatements = financialStatementService. - getChildrenFinancialStatement(parentFinancialStatement); - result = financialStatements.get(index); + List<VatStatement> vatStatements = vatStatementService. + getChildrenVatStatement(parentVatStatement); + result = vatStatements.get(index); } catch (LimaException eee) { log.debug("Can't get child", eee); } @@ -115,20 +108,20 @@ if (parent == getRoot()) { try { - List<FinancialStatement> financialStatements = - financialStatementService.getChildrenFinancialStatement(null); - result = financialStatements.indexOf(child); + List<VatStatement> vatStatements = + vatStatementService.getChildrenVatStatement(null); + result = vatStatements.indexOf(child); } catch (LimaException eee) { log.debug("Can't get index child", eee); } } else { - FinancialStatement parentFinancialStatement = - (FinancialStatement) parent; + VatStatement parentVatStatement = + (VatStatement) parent; try { - List<FinancialStatement> financialStatements = financialStatementService. - getChildrenFinancialStatement(parentFinancialStatement); - result = financialStatements.indexOf(child); + List<VatStatement> vatStatements = vatStatementService. + getChildrenVatStatement(parentVatStatement); + result = vatStatements.indexOf(child); } catch (LimaException eee) { log.debug("Can't get index child", eee); } @@ -139,23 +132,14 @@ @Override public Object getValueAt(Object node, int column) { Object result = "n/a"; - FinancialStatement financialStatement = (FinancialStatement) node; + VatStatement vatStatement = (VatStatement) node; switch (column) { case 0: - result = financialStatement.getLabel(); + result = vatStatement.getLabel(); break; case 1: - result = financialStatement.getAccounts(); + result = vatStatement.getAccounts(); break; - case 2: - result = financialStatement.getDebitAccounts(); - break; - case 3: - result = financialStatement.getCreditAccounts(); - break; - case 4: - result = financialStatement.getProvisionDeprecationAccounts(); - break; } return result; } @@ -172,7 +156,7 @@ /** - * Refresh FinancialStatementChart. + * Refresh VatStatementChart. * */ public void refreshTree() throws LimaException { @@ -182,51 +166,35 @@ /** - * Add FinancialStatement(path can be null). + * Add VatStatement(path can be null). * * @param path * @param account * @throws LimaException */ - public void addFinancialStatement(TreePath path, FinancialStatement financialStatement) throws LimaException { + public void addVatStatement(TreePath path, VatStatement vatStatement) throws LimaException { // Calling account service - FinancialStatement parentFinancialStatementHeader = - (FinancialStatement) path.getLastPathComponent(); - if (parentFinancialStatementHeader == getRoot()) { - parentFinancialStatementHeader = null; + VatStatement parentVatStatementHeader = + (VatStatement) path.getLastPathComponent(); + if (parentVatStatementHeader == getRoot()) { + parentVatStatementHeader = null; } - financialStatementService.createFinancialStatement( - parentFinancialStatementHeader, financialStatement); + vatStatementService.createVatStatement( + parentVatStatementHeader, vatStatement); modelSupport.fireTreeStructureChanged(path); } /** - * Update financialStatement + * Update vatStatement * * @param path * @param account * @throws LimaException */ - public void updateFinancialStatement(TreePath path, FinancialStatement financialStatement) throws LimaException { + public void updateVatStatement(TreePath path, VatStatement vatStatement) throws LimaException { - financialStatementService.updateFinancialStatement(financialStatement); + vatStatementService.updateVatStatement(vatStatement); modelSupport.fireTreeStructureChanged(path); } - - - /** - * Remove financialStatement - * - * @param path - * @param object - * @throws LimaException - */ - public void removeFinancialStatementObject(TreePath path, FinancialStatement financialStatement) throws LimaException { - // Calling account service - int index = getIndexOfChild( - path.getParentPath().getLastPathComponent(), financialStatement); - financialStatementService.removeFinancialStatement(financialStatement); - modelSupport.fireChildRemoved(path.getParentPath(), index, financialStatement); - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2011-07-08 09:03:27 UTC (rev 3201) @@ -1,26 +1,12 @@ package org.chorem.lima.ui.vatchart; -import static org.nuiton.i18n.I18n._; - -import javax.swing.JOptionPane; -import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.FinancialStatementServiceMonitorable; import org.chorem.lima.business.ImportServiceMonitorable; -import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.entity.FinancialStatement; -import org.chorem.lima.entity.FinancialStatementImpl; -import org.chorem.lima.enums.FinancialStatementsChartEnum; -import org.chorem.lima.enums.ImportExportEnum; +import org.chorem.lima.business.VatStatementServiceMonitorable; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.financialstatementchart.FinancialStatementHeaderForm; -import org.chorem.lima.ui.financialstatementchart.FinancialStatementMovementForm; -import org.chorem.lima.ui.importexport.ImportExport; -import org.chorem.lima.util.DialogHelper; -import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTreeTable; public class VatChartViewHandler implements ServiceListener { @@ -28,16 +14,16 @@ /** log. */ private static final Log log = LogFactory.getLog(VatChartViewHandler.class); - protected FinancialStatementServiceMonitorable financialStatementService; + protected VatStatementServiceMonitorable vatStatementService; protected VatChartView view; protected VatChartViewHandler(VatChartView view) { this.view = view; - financialStatementService = + vatStatementService = LimaServiceFactory.getInstance().getService( - FinancialStatementServiceMonitorable.class); + VatStatementServiceMonitorable.class); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); } @@ -59,11 +45,11 @@ @Override public void notifyMethod(String serviceName, String methodeName) { - /*if (methodeName.contains("FinancialStatements") + if (methodeName.contains("VatStatements") || methodeName.contains("importAll") || methodeName.contains("importAs")){ refresh(); - }*/ + } } 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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-07-08 09:03:27 UTC (rev 3201) @@ -1,257 +1,258 @@ -= -lima.action.commandline.help=Show help in console -lima.action.fullscreen=Full screen -lima.action.fullscreen.tip=Open ui in full screen -lima.action.normalscreen=Normal screen -lima.action.normalscreen.tip=Open ui in normal screen -lima.charts.account=Accounts chart -lima.charts.account.addAccount=Add account -lima.charts.account.addSubLedger=Add thirdpart account -lima.charts.account.base=Base accountchart -lima.charts.account.developed=Developped accountchart -lima.charts.account.number=Account Number -lima.charts.account.question.remove=Do you really remove this account ? -lima.charts.account.shortened=Shorthened accountchart -lima.charts.entrybook.add=Add entrybook -lima.charts.entrybook.confirmation=Do you really remove this entrybook ? -lima.charts.entrybook.default=Defaults entrybooks -lima.charts.entrybook.import=Import entrybooks -lima.charts.financialperiod=Financial Periods -lima.charts.financialperiod.block=Block financialperiod -lima.charts.financialperiod.question.blocked=Do you really block this financialperiod ? This action is irreversible \! -lima.charts.financialstatement=Financialstatement chart -lima.charts.financialstatement.base=Base financialstatement chart -lima.charts.financialstatement.developed=Developped financialstatement chart -lima.charts.financialstatement.nothing=NO financialstatement chart -lima.charts.financialstatement.shortened=Shortened financialstatement chart -lima.charts.financialtransaction.question.removeentry=Do you really remove this entry ? -lima.charts.financialtransaction.question.removetransaction=Do you really remove this transaction ? -lima.charts.fiscalperiod.add=Add fiscalperiod -lima.charts.fiscalperiod.addretainedearnings=Report retained earnings -lima.charts.fiscalperiod.block=Block fiscalperiod -lima.charts.fiscalperiod.create=Create fiscalperiod -lima.charts.fiscalperiod.question.blocked=Block fiscalperiod -lima.charts.fiscalperiod.question.morethan12=This period is longer than 12 months. Do you really create this ? -lima.charts.fiscalperiod.question.newyear=Do you want to create a new fiscal year ? -lima.charts.fiscalyear=Fiscal Years -lima.common.account=Account -lima.common.amount=Amount -lima.common.amountcredit=Credit amount -lima.common.amountdebit=Debit amount -lima.common.begindate=Begin -lima.common.buttonback=\u2190 -lima.common.buttonnext=\u2192 -lima.common.cancel=Cancel -lima.common.close=Close -lima.common.closed=Closed -lima.common.code=Code -lima.common.confirmation=Confirmation -lima.common.copy=Copy -lima.common.enddate=End -lima.common.entrybook=EntryBook -lima.common.entrybooks=EntryBooks -lima.common.error=Error -lima.common.filter=Filter -lima.common.fin=Terminated -lima.common.globalexception=Global lima exception -lima.common.label=Label -lima.common.movmentedfilter=Accounts filtered -lima.common.next=Next -lima.common.ok=OK -lima.common.open=Open -lima.common.paste=Paste -lima.common.period=Period -lima.common.question=Question -lima.common.quit=Exit -lima.common.remove=Remove -lima.common.search=Search -lima.common.solde=Solde -lima.common.soldecredit=Credit solde -lima.common.soldedebit=Debit solde -lima.common.update=Modify -lima.config.category.directories=Directories -lima.config.category.directories.description=Directories used by LIMA -lima.config.category.other=Other -lima.config.category.other.description=Other configuration properties -lima.config.configFileName.description= -lima.config.currency.description= -lima.config.decimalseparator.description= -lima.config.host.adress=Host adress -lima.config.locale.description=Localization used by LIMA -lima.config.scale.description= -lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen.description=FullScreen -lima.daily=Daily -lima.documents=Documents\u2026 -lima.documents.error=Can't create document on an open fiscal year -lima.entries=Entries -lima.entries.addEntry=Add entry -lima.entries.addTransaction=Add transaction -lima.entries.lettering=Lettering -lima.entries.lettering.add=Add letter -lima.entries.lettering.noletterselected=Error \: No selected letter -lima.entries.lettering.radiobutton.list=Existing letters -lima.entries.lettering.radiobutton.new=New letter -lima.entries.lettering.remove=Remove letter -lima.entries.searchtransaction=Search transaction -lima.entries.searchunbalancedtransaction=Incorrect transactions -lima.entries.writetransaction=Write entries -lima.enum.comboboxaccount.account=Account -lima.enum.comboboxaccount.accountlist=Account list -lima.enum.comboboxaccount.allaccount=All accounts -lima.enum.comboboxamount.both=Both -lima.enum.comboboxamount.credit=Credit -lima.enum.comboboxamount.debit=Debit -lima.enum.comboboxentrybook.all=All entrybooks -lima.enum.comboboxentrybook.select_one=EntryBook -lima.enum.comboboxletter.all=All letters -lima.enum.comboboxletter.selectone=Letter -lima.enum.comboboxoperator.equal=Equal -lima.enum.comboboxoperator.inferior=Inferior -lima.enum.comboboxoperator.inferiororequal=Inferior or equal -lima.enum.comboboxoperator.interval=Inteval -lima.enum.comboboxoperator.notequal=Not equal -lima.enum.comboboxoperator.superior=Superior -lima.enum.comboboxoperator.superiororequal=Superior or equal -lima.enum.comboboxperiod.date=Date -lima.enum.comboboxperiod.financialperiod=Financial period -lima.enum.comboboxperiod.fiscalperiod=Fiscal period -lima.enum.comboboxperiod.period=Period -lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> -lima.financialstatement.accounts=Account list on debit and on credit -lima.financialstatement.check=Check accounts passing to movement -lima.financialstatement.creditaccounts=Account credit list -lima.financialstatement.debitaccounts=Account debit list -lima.financialstatement.delete=Delete actual financialstatement chart before import new -lima.financialstatement.header.add=Add category -lima.financialstatement.headeramount=Calculate amount on header -lima.financialstatement.label=Label -lima.financialstatement.movement.add=Add movement -lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list -lima.financialstatement.subamount=Calculate a subamount -lima.home.chartaccounts.create=Create accountschart -lima.home.chartaccounts.modify=Modify accountschart -lima.home.chartaccounts.nothing=No accountschart -lima.home.chartaccounts.state1_2=The chart have -lima.home.chartaccounts.state2_2=accounts -lima.home.entrybooks.create=Create entrybook -lima.home.entrybooks.modify=Modifiy entrybook -lima.home.entrybooks.nothing=No entrybook -lima.home.entrybooks.state.single=Entrybook is -lima.home.entrybooks.state1_2.plural=The -lima.home.entrybooks.state2_2.plural=entrybooks are -lima.home.fiscalperiod.closed=fiscalperiods closed -lima.home.fiscalperiod.create=Create fiscalperiod -lima.home.fiscalperiod.modify=Modify fiscalperiod -lima.home.fiscalperiod.noopen=No fiscalperiod -lima.home.fiscalperiod.opened=fiscalperiods open -lima.home.transaction.balanced=transactions are balanced -lima.home.transaction.create=Create entries -lima.home.transaction.modifiy.balanced=Modify entries -lima.home.transaction.modifiy.unbalanced=Modify incorrect entries -lima.home.transaction.nothing=No transaction -lima.home.transaction.unbalanced=transactions are not balanced -lima.identity=Identity -lima.identity.address=Address -lima.identity.address2=Address (next) -lima.identity.businessNumber=Business number -lima.identity.city=City -lima.identity.classificationCode=Classification code -lima.identity.contact=Contact -lima.identity.description=Description -lima.identity.email=Email -lima.identity.name=Name -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.importcsv=Import CSV -lima.importexport.importebp=Import EBP -lima.importexport.wait=Job in progress\u2026 -lima.init.closed=Lima closed at %1$s -lima.init.errorclosing=Error during Lima close -lima.menu.file=File -lima.menu.help=Help -lima.menu.help.about=About -lima.menu.help.help=Help -lima.menu.help.i18n=Language -lima.menu.help.i18n.fr=French -lima.menu.help.i18n.uk=English -lima.menu.help.site=WebSite -lima.menu.window=Window -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, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> -lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html> -lima.opening.import=Import a CSV Save -lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> -lima.preferences=Preferences -lima.refresh=\u21BB -lima.reports=Reports -lima.reports.accounts=Edit account -lima.reports.balance=Balance -lima.reports.entrybooks=Edit entrybook -lima.reports.financialstatement=Financialstatements -lima.reports.ledger=Ledger -lima.reports.vat=Edit VAT -lima.response.no=No -lima.response.yes=Yes -lima.splash.1=Loading services... -lima.splash.2="Loading accounting... -lima.splash.3=Ready \! -lima.structure=Structure -lima.tab.home=Home -lima.table.account=Account -lima.table.balance=Balance -lima.table.begin.credit=Beginning Balance Credit -lima.table.begin.debit=Beginning Balance Debit -lima.table.closure=Closed -lima.table.code=Code -lima.table.collectedvat=Collected VAT -lima.table.credit=Credit -lima.table.date=Date -lima.table.debit=Debit -lima.table.debitcredit=Debit and credit -lima.table.deductiblevat=Deductible VAT -lima.table.description=Description -lima.table.entrybook=EntryBook -lima.table.fiscalperiod=Fiscalperiod -lima.table.grossamount=Gross amount -lima.table.label=Label -lima.table.letter=Letter -lima.table.move.credit=Movmented Credit -lima.table.move.debit=Movemented Debit -lima.table.netamount=Net amount -lima.table.number=Account Number -lima.table.period=Period -lima.table.provisiondeprecationamount=Provision & Deprecation -lima.table.remainingcredit=Remaining credit -lima.table.repayments=Repayments -lima.table.solde=Solder -lima.table.solde.credit=Credit solde -lima.table.solde.debit=Debit solde -lima.table.vatcredit=VAT credit -lima.table.vatdue=Due VAT -lima.table.vatpaid=VAT paid -lima.table.vatpayable=VAT payable -lima.table.voucher=Voucher -lima.title=Lutin Invoice Monitoring and Accounting -lima.title.about=About Lima... -lima.title.about.description=Open sources accounting software -lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> -lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> -lima.warning.nimbus.landf=Could not find Numbus Look&Feel -limma.config.thousandseparator.description= -nuitonutil.error.applicationconfig.save= += +lima.action.commandline.help=Show help in console +lima.action.fullscreen=Full screen +lima.action.fullscreen.tip=Open ui in full screen +lima.action.normalscreen=Normal screen +lima.action.normalscreen.tip=Open ui in normal screen +lima.charts.account=Accounts chart +lima.charts.account.addAccount=Add account +lima.charts.account.addSubLedger=Add thirdpart account +lima.charts.account.base=Base accountchart +lima.charts.account.developed=Developped accountchart +lima.charts.account.number=Account Number +lima.charts.account.question.remove=Do you really remove this account ? +lima.charts.account.shortened=Shorthened accountchart +lima.charts.entrybook.add=Add entrybook +lima.charts.entrybook.confirmation=Do you really remove this entrybook ? +lima.charts.entrybook.default=Defaults entrybooks +lima.charts.entrybook.import=Import entrybooks +lima.charts.financialperiod=Financial Periods +lima.charts.financialperiod.block=Block financialperiod +lima.charts.financialperiod.question.blocked=Do you really block this financialperiod ? This action is irreversible \! +lima.charts.financialstatement=Financialstatement chart +lima.charts.financialstatement.base=Base financialstatement chart +lima.charts.financialstatement.developed=Developped financialstatement chart +lima.charts.financialstatement.nothing=NO financialstatement chart +lima.charts.financialstatement.shortened=Shortened financialstatement chart +lima.charts.financialtransaction.question.removeentry=Do you really remove this entry ? +lima.charts.financialtransaction.question.removetransaction=Do you really remove this transaction ? +lima.charts.fiscalperiod.add=Add fiscalperiod +lima.charts.fiscalperiod.addretainedearnings=Report retained earnings +lima.charts.fiscalperiod.block=Block fiscalperiod +lima.charts.fiscalperiod.create=Create fiscalperiod +lima.charts.fiscalperiod.question.blocked=Block fiscalperiod +lima.charts.fiscalperiod.question.morethan12=This period is longer than 12 months. Do you really create this ? +lima.charts.fiscalperiod.question.newyear=Do you want to create a new fiscal year ? +lima.charts.fiscalyear=Fiscal Years +lima.charts.vat=VAT statement chart +lima.common.account=Account +lima.common.amount=Amount +lima.common.amountcredit=Credit amount +lima.common.amountdebit=Debit amount +lima.common.begindate=Begin +lima.common.buttonback=← +lima.common.buttonnext=→ +lima.common.cancel=Cancel +lima.common.close=Close +lima.common.closed=Closed +lima.common.code=Code +lima.common.confirmation=Confirmation +lima.common.copy=Copy +lima.common.enddate=End +lima.common.entrybook=EntryBook +lima.common.entrybooks=EntryBooks +lima.common.error=Error +lima.common.filter=Filter +lima.common.fin=Terminated +lima.common.globalexception=Global lima exception +lima.common.label=Label +lima.common.movmentedfilter=Accounts filtered +lima.common.next=Next +lima.common.ok=OK +lima.common.open=Open +lima.common.paste=Paste +lima.common.period=Period +lima.common.question=Question +lima.common.quit=Exit +lima.common.remove=Remove +lima.common.search=Search +lima.common.solde=Solde +lima.common.soldecredit=Credit solde +lima.common.soldedebit=Debit solde +lima.common.update=Modify +lima.config.category.directories=Directories +lima.config.category.directories.description=Directories used by LIMA +lima.config.category.other=Other +lima.config.category.other.description=Other configuration properties +lima.config.configFileName.description= +lima.config.currency.description= +lima.config.decimalseparator.description= +lima.config.host.adress=Host adress +lima.config.locale.description=Localization used by LIMA +lima.config.scale.description= +lima.config.ui.flaunchui.description= +lima.config.ui.fullscreen.description=FullScreen +lima.daily=Daily +lima.documents=Documents… +lima.documents.error=Can't create document on an open fiscal year +lima.entries=Entries +lima.entries.addEntry=Add entry +lima.entries.addTransaction=Add transaction +lima.entries.lettering=Lettering +lima.entries.lettering.add=Add letter +lima.entries.lettering.noletterselected=Error \: No selected letter +lima.entries.lettering.radiobutton.list=Existing letters +lima.entries.lettering.radiobutton.new=New letter +lima.entries.lettering.remove=Remove letter +lima.entries.searchtransaction=Search transaction +lima.entries.searchunbalancedtransaction=Incorrect transactions +lima.entries.writetransaction=Write entries +lima.enum.comboboxaccount.account=Account +lima.enum.comboboxaccount.accountlist=Account list +lima.enum.comboboxaccount.allaccount=All accounts +lima.enum.comboboxamount.both=Both +lima.enum.comboboxamount.credit=Credit +lima.enum.comboboxamount.debit=Debit +lima.enum.comboboxentrybook.all=All entrybooks +lima.enum.comboboxentrybook.select_one=EntryBook +lima.enum.comboboxletter.all=All letters +lima.enum.comboboxletter.selectone=Letter +lima.enum.comboboxoperator.equal=Equal +lima.enum.comboboxoperator.inferior=Inferior +lima.enum.comboboxoperator.inferiororequal=Inferior or equal +lima.enum.comboboxoperator.interval=Inteval +lima.enum.comboboxoperator.notequal=Not equal +lima.enum.comboboxoperator.superior=Superior +lima.enum.comboboxoperator.superiororequal=Superior or equal +lima.enum.comboboxperiod.date=Date +lima.enum.comboboxperiod.financialperiod=Financial period +lima.enum.comboboxperiod.fiscalperiod=Fiscal period +lima.enum.comboboxperiod.period=Period +lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> +lima.financialstatement.accounts=Account list on debit and on credit +lima.financialstatement.check=Check accounts passing to movement +lima.financialstatement.creditaccounts=Account credit list +lima.financialstatement.debitaccounts=Account debit list +lima.financialstatement.delete=Delete actual financialstatement chart before import new +lima.financialstatement.header.add=Add category +lima.financialstatement.headeramount=Calculate amount on header +lima.financialstatement.label=Label +lima.financialstatement.movement.add=Add movement +lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list +lima.financialstatement.subamount=Calculate a subamount +lima.home.chartaccounts.create=Create accountschart +lima.home.chartaccounts.modify=Modify accountschart +lima.home.chartaccounts.nothing=No accountschart +lima.home.chartaccounts.state1_2=The chart have +lima.home.chartaccounts.state2_2=accounts +lima.home.entrybooks.create=Create entrybook +lima.home.entrybooks.modify=Modifiy entrybook +lima.home.entrybooks.nothing=No entrybook +lima.home.entrybooks.state.single=Entrybook is +lima.home.entrybooks.state1_2.plural=The +lima.home.entrybooks.state2_2.plural=entrybooks are +lima.home.fiscalperiod.closed=fiscalperiods closed +lima.home.fiscalperiod.create=Create fiscalperiod +lima.home.fiscalperiod.modify=Modify fiscalperiod +lima.home.fiscalperiod.noopen=No fiscalperiod +lima.home.fiscalperiod.opened=fiscalperiods open +lima.home.transaction.balanced=transactions are balanced +lima.home.transaction.create=Create entries +lima.home.transaction.modifiy.balanced=Modify entries +lima.home.transaction.modifiy.unbalanced=Modify incorrect entries +lima.home.transaction.nothing=No transaction +lima.home.transaction.unbalanced=transactions are not balanced +lima.identity=Identity +lima.identity.address=Address +lima.identity.address2=Address (next) +lima.identity.businessNumber=Business number +lima.identity.city=City +lima.identity.classificationCode=Classification code +lima.identity.contact=Contact +lima.identity.description=Description +lima.identity.email=Email +lima.identity.name=Name +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.importcsv=Import CSV +lima.importexport.importebp=Import EBP +lima.importexport.wait=Job in progress… +lima.init.closed=Lima closed at %1$s +lima.init.errorclosing=Error during Lima close +lima.menu.file=File +lima.menu.help=Help +lima.menu.help.about=About +lima.menu.help.help=Help +lima.menu.help.i18n=Language +lima.menu.help.i18n.fr=French +lima.menu.help.i18n.uk=English +lima.menu.help.site=WebSite +lima.menu.window=Window +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, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> +lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.import=Import a CSV Save +lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> +lima.preferences=Preferences +lima.refresh=↻ +lima.reports=Reports +lima.reports.accounts=Edit account +lima.reports.balance=Balance +lima.reports.entrybooks=Edit entrybook +lima.reports.financialstatement=Financialstatements +lima.reports.ledger=Ledger +lima.reports.vat=Edit VAT +lima.response.no=No +lima.response.yes=Yes +lima.splash.1=Loading services... +lima.splash.2="Loading accounting... +lima.splash.3=Ready \! +lima.structure=Structure +lima.tab.home=Home +lima.table.account=Account +lima.table.balance=Balance +lima.table.begin.credit=Beginning Balance Credit +lima.table.begin.debit=Beginning Balance Debit +lima.table.closure=Closed +lima.table.code=Code +lima.table.collectedvat=Collected VAT +lima.table.credit=Credit +lima.table.date=Date +lima.table.debit=Debit +lima.table.debitcredit=Debit and credit +lima.table.deductiblevat=Deductible VAT +lima.table.description=Description +lima.table.entrybook=EntryBook +lima.table.fiscalperiod=Fiscalperiod +lima.table.grossamount=Gross amount +lima.table.label=Label +lima.table.letter=Letter +lima.table.move.credit=Movmented Credit +lima.table.move.debit=Movemented Debit +lima.table.netamount=Net amount +lima.table.number=Account Number +lima.table.period=Period +lima.table.provisiondeprecationamount=Provision & Deprecation +lima.table.remainingcredit=Remaining credit +lima.table.repayments=Repayments +lima.table.solde=Solder +lima.table.solde.credit=Credit solde +lima.table.solde.debit=Debit solde +lima.table.vatcredit=VAT credit +lima.table.vatdue=Due VAT +lima.table.vatpaid=VAT paid +lima.table.vatpayable=VAT payable +lima.table.voucher=Voucher +lima.title=Lutin Invoice Monitoring and Accounting +lima.title.about=About Lima... +lima.title.about.description=Open sources accounting software +lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> +lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> +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 2011-07-05 16:19:45 UTC (rev 3200) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-07-08 09:03:27 UTC (rev 3201) @@ -1,257 +1,258 @@ -= -lima.action.commandline.help=Afficher l'aide en console -lima.action.fullscreen=Plein Ecran -lima.action.fullscreen.tip=Passer en mode plein \u00E9cran -lima.action.normalscreen=Ecran normal -lima.action.normalscreen.tip=Revenir en \u00E9cran normal -lima.charts.account=Plan comptable -lima.charts.account.addAccount=Ajout Compte G\u00E9n\u00E9ral -lima.charts.account.addSubLedger=Ajouter Compte Tiers -lima.charts.account.base=Plan comptable de base -lima.charts.account.developed=Plan comptable d\u00E9velopp\u00E9 -lima.charts.account.number=Num\u00E9ro de compte -lima.charts.account.question.remove=Voulez-vous supprimer ce compte? -lima.charts.account.shortened=Plan comptable abr\u00E9g\u00E9 -lima.charts.entrybook.add=Ajouter un journal -lima.charts.entrybook.confirmation=Voulez-vous supprimer ce journal? -lima.charts.entrybook.default=Journaux par d\u00E9fault -lima.charts.entrybook.import=Importer des journaux -lima.charts.financialperiod=P\u00E9riodes comptables -lima.charts.financialperiod.block=Cloturer une p\u00E9riode -lima.charts.financialperiod.question.blocked=\u00C8tes vous s\u00FBre de vouloir cl\u00F4turer cette p\u00E9riode ? Cette action est irr\u00E9versible \! -lima.charts.financialstatement=Plan BCR -lima.charts.financialstatement.base=Plan BCR de base -lima.charts.financialstatement.developed=Plan BCR d\u00E9velopp\u00E9 -lima.charts.financialstatement.nothing=<html><center>Aucun plan BCR charg\u00E9<br/>Veuillez s\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html> -lima.charts.financialstatement.shortened=Plan BCR abr\u00E9g\u00E9 -lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? -lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? -lima.charts.fiscalperiod.add=Nouvel exercice -lima.charts.fiscalperiod.addretainedearnings=Reporter \u00E0 nouveau -lima.charts.fiscalperiod.block=Cloturer un exercice -lima.charts.fiscalperiod.create=Choisissez la date de d\u00E9but et de fin du nouvel exercice -lima.charts.fiscalperiod.question.blocked=\u00C8tes vous s\u00FBre de vouloir cl\u00F4turer cette exercice ? Cette action est irr\u00E9versible \! -lima.charts.fiscalperiod.question.morethan12=La p\u00E9riode s\u00E9lectionn\u00E9e n'est pas de 12 mois, voulez-vous continuer ? -lima.charts.fiscalperiod.question.newyear=Voulez vous cr\u00E9er un nouvel exercice? -lima.charts.fiscalyear=Exercices -lima.common.account=Compte -lima.common.amount=Montant -lima.common.amountcredit=Total Cr\u00E9dit -lima.common.amountdebit=Total D\u00E9bit -lima.common.begindate=D\u00E9but -lima.common.buttonback=\u2190 -lima.common.buttonnext=\u2192 -lima.common.cancel=Annuler -lima.common.close=Fermer -lima.common.closed=Ferm\u00E9 -lima.common.code=Code -lima.common.confirmation=Confirmation -lima.common.copy=Copier -lima.common.enddate=Fin -lima.common.entrybook=Journal -lima.common.entrybooks=Journaux -lima.common.error=Erreur -lima.common.filter=Filtrer -lima.common.fin=Termin\u00E9 -lima.common.globalexception=Global lima exception -lima.common.label=Libell\u00E9 -lima.common.movmentedfilter=Comptes mouvement\u00E9s -lima.common.next=Suivant -lima.common.ok=OK -lima.common.open=Ouvert -lima.common.paste=Coller -lima.common.period=P\u00E9riode -lima.common.question=Question -lima.common.quit=Quitter -lima.common.remove=Supprimer -lima.common.search=Rechercher -lima.common.solde=Solde -lima.common.soldecredit=Solde Cr\u00E9diteur -lima.common.soldedebit=Solde D\u00E9biteur -lima.common.update=Modifier -lima.config.category.directories=R\u00E9pertoires -lima.config.category.directories.description=R\u00E9pertoires utilis\u00E9s par Lima -lima.config.category.other=Autre -lima.config.category.other.description=Autre propri\u00E9t\u00E9s de configuration -lima.config.configFileName.description= -lima.config.currency.description= -lima.config.decimalseparator.description= -lima.config.host.adress=Adresse du serveur distant -lima.config.locale.description=Locale utilis\u00E9e par l'application -lima.config.scale.description= -lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen.description=Plein \u00E9cran -lima.daily=Quotidien -lima.documents=Documents\u2026 -lima.documents.error=Impossible de cr\u00E9er un document lorsque l'exercice est ouvert -lima.entries=Traitement -lima.entries.addEntry=Ajouter entr\u00E9e -lima.entries.addTransaction=Ajouter transaction -lima.entries.lettering=Lettrage -lima.entries.lettering.add=Ajouter une lettre -lima.entries.lettering.noletterselected=Erreur \: Aucune lettre s\u00E9lectionn\u00E9e. -lima.entries.lettering.radiobutton.list=Lettres existantes -lima.entries.lettering.radiobutton.new=Nouvelle lettre -lima.entries.lettering.remove=Supprimer une lettre -lima.entries.searchtransaction=Rechercher des \u00E9critures -lima.entries.searchunbalancedtransaction=Entr\u00E9es incorrectes -lima.entries.writetransaction=Saisir des \u00E9critures -lima.enum.comboboxaccount.account=Compte -lima.enum.comboboxaccount.accountlist=Liste de comptes -lima.enum.comboboxaccount.allaccount=Tous les comptes -lima.enum.comboboxamount.both=Les deux -lima.enum.comboboxamount.credit=Cr\u00E9dit -lima.enum.comboboxamount.debit=D\u00E9bit -lima.enum.comboboxentrybook.all=Tous les journaux -lima.enum.comboboxentrybook.select_one=Journal -lima.enum.comboboxletter.all=Toutes les lettres -lima.enum.comboboxletter.selectone=Lettre -lima.enum.comboboxoperator.equal=\u00C9gal -lima.enum.comboboxoperator.inferior=Inf\u00E9rieur -lima.enum.comboboxoperator.inferiororequal=Inf\u00E9rieur ou \u00E9gal -lima.enum.comboboxoperator.interval=Intervalle -lima.enum.comboboxoperator.notequal=Diff\u00E9rent -lima.enum.comboboxoperator.superior=Sup\u00E9rieur -lima.enum.comboboxoperator.superiororequal=Sup\u00E9rieur ou \u00E9gal -lima.enum.comboboxperiod.date=Date -lima.enum.comboboxperiod.financialperiod=P\u00E9riode Financi\u00E8re -lima.enum.comboboxperiod.fiscalperiod=Exercice -lima.enum.comboboxperiod.period=P\u00E9riode -lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> -lima.financialstatement.accounts=Liste de comptes au cr\u00E9dit et au d\u00E9bit -lima.financialstatement.check=V\u00E9rification des comptes aux postes -lima.financialstatement.creditaccounts=Liste de comptes au cr\u00E9dit -lima.financialstatement.debitaccounts=Liste de comptes au d\u00E9bit -lima.financialstatement.delete=Supprimer le plan BCR actuel avant d'importer -lima.financialstatement.header.add=Ajouter une cat\u00E9gorie -lima.financialstatement.headeramount=Calculer le total en en-tete -lima.financialstatement.label=Libell\u00E9 -lima.financialstatement.movement.add=Ajouter un regrouprement -lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions -lima.financialstatement.subamount=Calculer un sous-total -lima.home.chartaccounts.create=Cr\u00E9er le plan des comptes -lima.home.chartaccounts.modify=Modifier le plan des comptes -lima.home.chartaccounts.nothing=Aucun compte \! -lima.home.chartaccounts.state1_2=Le plan comptable possede -lima.home.chartaccounts.state2_2=comptes -lima.home.entrybooks.create=Cr\u00E9er les journaux -lima.home.entrybooks.modify=Modifier les journaux -lima.home.entrybooks.nothing=Aucun journal ouvert \! -lima.home.entrybooks.state.single=Le journal est \: -lima.home.entrybooks.state1_2.plural=Les -lima.home.entrybooks.state2_2.plural=journaux sont \: -lima.home.fiscalperiod.closed=exercices clotur\u00E9s -lima.home.fiscalperiod.create=Cr\u00E9er un exercice -lima.home.fiscalperiod.modify=Modifier les exercices -lima.home.fiscalperiod.noopen=Aucun exercice ouvert \! -lima.home.fiscalperiod.opened=exercices ouverts -lima.home.transaction.balanced=transactions, toutes sont \u00E9quilibr\u00E9es -lima.home.transaction.create=Ajouter des \u00E9critures -lima.home.transaction.modifiy.balanced=Modifier les \u00E9critures -lima.home.transaction.modifiy.unbalanced=Modifier les \u00E9critures incorrectes -lima.home.transaction.nothing=Aucune \u00E9criture -lima.home.transaction.unbalanced=transactions ne sont pas \u00E9quilibr\u00E9es \! -lima.identity=Identit\u00E9 -lima.identity.address=Adresse -lima.identity.address2=Adresse (suite) -lima.identity.businessNumber=SIRET -lima.identity.city=Ville -lima.identity.classificationCode=Code NAF -lima.identity.contact=Contact -lima.identity.description=Description -lima.identity.email=Courriel -lima.identity.name=Nom -lima.identity.phoneNumber=n\u00B0 Tel -lima.identity.vatNumber=n\u00B0 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\u00E9faut -lima.importexport.ebp=Import/Export EBP -lima.importexport.entries=\u00C9critures -lima.importexport.export=Export -lima.importexport.export.terminated=Export termin\u00E9 -lima.importexport.financialstatements=Plan BCR -lima.importexport.import=Import -lima.importexport.import.terminated=Import termin\u00E9 -lima.importexport.importcsv=Import CSV -lima.importexport.importebp=Import EBP -lima.importexport.wait=Traitement en cours \u2026 -lima.init.closed=Lima ferm\u00E9 \u00E0 %1$s -lima.init.errorclosing=Erreur lors de la fermeture -lima.menu.file=Fichier -lima.menu.help=Aide -lima.menu.help.about=\u00C0 Propos -lima.menu.help.help=Afficher l'aide -lima.menu.help.i18n=Langue -lima.menu.help.i18n.fr=Fran\u00E7ais -lima.menu.help.i18n.uk=Anglais -lima.menu.help.site=Acc\u00E9der au site de Lima -lima.menu.window=Fen\u00EAtre -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\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html> -lima.opening.entrybook=<html>Cochez la case pour importer les journaux par d\u00E9faut \:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html> -lima.opening.import=Importer une sauvegarde CSV -lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour d\u00E9marrer votre comptabilit\u00E9 en quelques instants\u0085<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> -lima.preferences=Pr\u00E9f\u00E9rences -lima.refresh=\u21BB -lima.reports=Rapports -lima.reports.accounts=Edition compte -lima.reports.balance=Balance -lima.reports.entrybooks=Edition journal -lima.reports.financialstatement=Bilan et Compte de r\u00E9sultat -lima.reports.ledger=Grand Livre -lima.reports.vat=Edition TVA -lima.response.no=Non -lima.response.yes=Oui -lima.splash.1=Chargement des services... -lima.splash.2=Chargement de la comptabilit\u00E9 -lima.splash.3=Application pr\u00EAte \! -lima.structure=Structure -lima.tab.home=Accueil -lima.table.account=Compte -lima.table.balance=Balance -lima.table.begin.credit=Reprise cr\u00E8dit -lima.table.begin.debit=Reprise d\u00E9bit -lima.table.closure=Cloture -lima.table.code=Code -lima.table.collectedvat=TVA collect\u00E9e -lima.table.credit=Cr\u00E9dit -lima.table.date=Date -lima.table.debit=D\u00E9bit -lima.table.debitcredit=D\u00E9bit et Cr\u00E9dit -lima.table.deductiblevat=TVA d\u00E9ductible -lima.table.description=Description -lima.table.entrybook=Journal -lima.table.fiscalperiod=Exercice -lima.table.grossamount=Brut -lima.table.label=Libell\u00E9 -lima.table.letter=Lettre -lima.table.move.credit=Mouvement au cr\u00E9dit -lima.table.move.debit=Mouvement au d\u00E9bit -lima.table.netamount=Net -lima.table.number=Num\u00E9ro de compte -lima.table.period=P\u00E9riode -lima.table.provisiondeprecationamount=Amortissements et provisions -lima.table.remainingcredit=Cr\u00E9dit de TVA -lima.table.repayments=Remboursements -lima.table.solde=Solde -lima.table.solde.credit=Solde cr\u00E9dit -lima.table.solde.debit=Solde d\u00E9bit -lima.table.vatcredit=Cr\u00E9dit de TVA -lima.table.vatdue=TVA due -lima.table.vatpaid=TVA pay\u00E9e -lima.table.vatpayable=TVA \u00E0 payer -lima.table.voucher=Pi\u00E8ce comptable -lima.title=Lutin Invoice Monitoring and Accounting -lima.title.about=\u00C0 propos de Lima... -lima.title.about.description=Logiciel de comptabilit\u00E9 Libre -lima.tooltip.filter=<html>Expression r\u00E9guli\u00E8re \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> -lima.tooltip.lettering=<html>Pour ajouter une lettre \u00E0 plusieurs \u00E9critures <br/>S\u00E9lectionner plusieurs lignes avec la combinaison ctrl + click</html> -lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 -limma.config.thousandseparator.description= -nuitonutil.error.applicationconfig.save= += +lima.action.commandline.help=Afficher l'aide en console +lima.action.fullscreen=Plein Ecran +lima.action.fullscreen.tip=Passer en mode plein écran +lima.action.normalscreen=Ecran normal +lima.action.normalscreen.tip=Revenir en écran normal +lima.charts.account=Plan comptable +lima.charts.account.addAccount=Ajout Compte Général +lima.charts.account.addSubLedger=Ajouter Compte Tiers +lima.charts.account.base=Plan comptable de base +lima.charts.account.developed=Plan comptable développé +lima.charts.account.number=Numéro de compte +lima.charts.account.question.remove=Voulez-vous supprimer ce compte? +lima.charts.account.shortened=Plan comptable abrégé +lima.charts.entrybook.add=Ajouter un journal +lima.charts.entrybook.confirmation=Voulez-vous supprimer ce journal? +lima.charts.entrybook.default=Journaux par défault +lima.charts.entrybook.import=Importer des journaux +lima.charts.financialperiod=Périodes comptables +lima.charts.financialperiod.block=Cloturer une période +lima.charts.financialperiod.question.blocked=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! +lima.charts.financialstatement=Plan BCR +lima.charts.financialstatement.base=Plan BCR de base +lima.charts.financialstatement.developed=Plan BCR développé +lima.charts.financialstatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> +lima.charts.financialstatement.shortened=Plan BCR abrégé +lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? +lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? +lima.charts.fiscalperiod.add=Nouvel exercice +lima.charts.fiscalperiod.addretainedearnings=Reporter à nouveau +lima.charts.fiscalperiod.block=Cloturer un exercice +lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice +lima.charts.fiscalperiod.question.blocked=Ètes vous sûre de vouloir clôturer cette exercice ? Cette action est irréversible \! +lima.charts.fiscalperiod.question.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? +lima.charts.fiscalperiod.question.newyear=Voulez vous créer un nouvel exercice? +lima.charts.fiscalyear=Exercices +lima.charts.vat=Plan TVA +lima.common.account=Compte +lima.common.amount=Montant +lima.common.amountcredit=Total Crédit +lima.common.amountdebit=Total Débit +lima.common.begindate=Début +lima.common.buttonback=← +lima.common.buttonnext=→ +lima.common.cancel=Annuler +lima.common.close=Fermer +lima.common.closed=Fermé +lima.common.code=Code +lima.common.confirmation=Confirmation +lima.common.copy=Copier +lima.common.enddate=Fin +lima.common.entrybook=Journal +lima.common.entrybooks=Journaux +lima.common.error=Erreur +lima.common.filter=Filtrer +lima.common.fin=Terminé +lima.common.globalexception=Global lima exception +lima.common.label=Libellé +lima.common.movmentedfilter=Comptes mouvementés +lima.common.next=Suivant +lima.common.ok=OK +lima.common.open=Ouvert +lima.common.paste=Coller +lima.common.period=Période +lima.common.question=Question +lima.common.quit=Quitter +lima.common.remove=Supprimer +lima.common.search=Rechercher +lima.common.solde=Solde +lima.common.soldecredit=Solde Créditeur +lima.common.soldedebit=Solde Débiteur +lima.common.update=Modifier +lima.config.category.directories=Répertoires +lima.config.category.directories.description=Répertoires utilisés par Lima +lima.config.category.other=Autre +lima.config.category.other.description=Autre propriétés de configuration +lima.config.configFileName.description= +lima.config.currency.description= +lima.config.decimalseparator.description= +lima.config.host.adress=Adresse du serveur distant +lima.config.locale.description=Locale utilisée par l'application +lima.config.scale.description= +lima.config.ui.flaunchui.description= +lima.config.ui.fullscreen.description=Plein écran +lima.daily=Quotidien +lima.documents=Documents… +lima.documents.error=Impossible de créer un document lorsque l'exercice est ouvert +lima.entries=Traitement +lima.entries.addEntry=Ajouter entrée +lima.entries.addTransaction=Ajouter transaction +lima.entries.lettering=Lettrage +lima.entries.lettering.add=Ajouter une lettre +lima.entries.lettering.noletterselected=Erreur \: Aucune lettre sélectionnée. +lima.entries.lettering.radiobutton.list=Lettres existantes +lima.entries.lettering.radiobutton.new=Nouvelle lettre +lima.entries.lettering.remove=Supprimer une lettre +lima.entries.searchtransaction=Rechercher des écritures +lima.entries.searchunbalancedtransaction=Entrées incorrectes +lima.entries.writetransaction=Saisir des écritures +lima.enum.comboboxaccount.account=Compte +lima.enum.comboboxaccount.accountlist=Liste de comptes +lima.enum.comboboxaccount.allaccount=Tous les comptes +lima.enum.comboboxamount.both=Les deux +lima.enum.comboboxamount.credit=Crédit +lima.enum.comboboxamount.debit=Débit +lima.enum.comboboxentrybook.all=Tous les journaux +lima.enum.comboboxentrybook.select_one=Journal +lima.enum.comboboxletter.all=Toutes les lettres +lima.enum.comboboxletter.selectone=Lettre +lima.enum.comboboxoperator.equal=Égal +lima.enum.comboboxoperator.inferior=Inférieur +lima.enum.comboboxoperator.inferiororequal=Inférieur ou égal +lima.enum.comboboxoperator.interval=Intervalle +lima.enum.comboboxoperator.notequal=Différent +lima.enum.comboboxoperator.superior=Supérieur +lima.enum.comboboxoperator.superiororequal=Supérieur ou égal +lima.enum.comboboxperiod.date=Date +lima.enum.comboboxperiod.financialperiod=Période Financière +lima.enum.comboboxperiod.fiscalperiod=Exercice +lima.enum.comboboxperiod.period=Période +lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> +lima.financialstatement.accounts=Liste de comptes au crédit et au débit +lima.financialstatement.check=Vérification des comptes aux postes +lima.financialstatement.creditaccounts=Liste de comptes au crédit +lima.financialstatement.debitaccounts=Liste de comptes au débit +lima.financialstatement.delete=Supprimer le plan BCR actuel avant d'importer +lima.financialstatement.header.add=Ajouter une catégorie +lima.financialstatement.headeramount=Calculer le total en en-tete +lima.financialstatement.label=Libellé +lima.financialstatement.movement.add=Ajouter un regrouprement +lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions +lima.financialstatement.subamount=Calculer un sous-total +lima.home.chartaccounts.create=Créer le plan des comptes +lima.home.chartaccounts.modify=Modifier le plan des comptes +lima.home.chartaccounts.nothing=Aucun compte \! +lima.home.chartaccounts.state1_2=Le plan comptable possede +lima.home.chartaccounts.state2_2=comptes +lima.home.entrybooks.create=Créer les journaux +lima.home.entrybooks.modify=Modifier les journaux +lima.home.entrybooks.nothing=Aucun journal ouvert \! +lima.home.entrybooks.state.single=Le journal est \: +lima.home.entrybooks.state1_2.plural=Les +lima.home.entrybooks.state2_2.plural=journaux sont \: +lima.home.fiscalperiod.closed=exercices cloturés +lima.home.fiscalperiod.create=Créer un exercice +lima.home.fiscalperiod.modify=Modifier les exercices +lima.home.fiscalperiod.noopen=Aucun exercice ouvert \! +lima.home.fiscalperiod.opened=exercices ouverts +lima.home.transaction.balanced=transactions, toutes sont équilibrées +lima.home.transaction.create=Ajouter des écritures +lima.home.transaction.modifiy.balanced=Modifier les écritures +lima.home.transaction.modifiy.unbalanced=Modifier les écritures incorrectes +lima.home.transaction.nothing=Aucune écriture +lima.home.transaction.unbalanced=transactions ne sont pas équilibrées \! +lima.identity=Identité +lima.identity.address=Adresse +lima.identity.address2=Adresse (suite) +lima.identity.businessNumber=SIRET +lima.identity.city=Ville +lima.identity.classificationCode=Code NAF +lima.identity.contact=Contact +lima.identity.description=Description +lima.identity.email=Courriel +lima.identity.name=Nom +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.importcsv=Import CSV +lima.importexport.importebp=Import EBP +lima.importexport.wait=Traitement en cours … +lima.init.closed=Lima fermé à %1$s +lima.init.errorclosing=Erreur lors de la fermeture +lima.menu.file=Fichier +lima.menu.help=Aide +lima.menu.help.about=À Propos +lima.menu.help.help=Afficher l'aide +lima.menu.help.i18n=Langue +lima.menu.help.i18n.fr=Français +lima.menu.help.i18n.uk=Anglais +lima.menu.help.site=Accéder au site de Lima +lima.menu.window=Fenêtre +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, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> +lima.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.import=Importer une sauvegarde CSV +lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> +lima.preferences=Préférences +lima.refresh=↻ +lima.reports=Rapports +lima.reports.accounts=Edition compte +lima.reports.balance=Balance +lima.reports.entrybooks=Edition journal +lima.reports.financialstatement=Bilan et Compte de résultat +lima.reports.ledger=Grand Livre +lima.reports.vat=Edition TVA +lima.response.no=Non +lima.response.yes=Oui +lima.splash.1=Chargement des services... +lima.splash.2=Chargement de la comptabilité +lima.splash.3=Application prête \! +lima.structure=Structure +lima.tab.home=Accueil +lima.table.account=Compte +lima.table.balance=Balance +lima.table.begin.credit=Reprise crèdit +lima.table.begin.debit=Reprise débit +lima.table.closure=Cloture +lima.table.code=Code +lima.table.collectedvat=TVA collectée +lima.table.credit=Crédit +lima.table.date=Date +lima.table.debit=Débit +lima.table.debitcredit=Débit et Crédit +lima.table.deductiblevat=TVA déductible +lima.table.description=Description +lima.table.entrybook=Journal +lima.table.fiscalperiod=Exercice +lima.table.grossamount=Brut +lima.table.label=Libellé +lima.table.letter=Lettre +lima.table.move.credit=Mouvement au crédit +lima.table.move.debit=Mouvement au débit +lima.table.netamount=Net +lima.table.number=Numéro de compte +lima.table.period=Période +lima.table.provisiondeprecationamount=Amortissements et provisions +lima.table.remainingcredit=Crédit de TVA +lima.table.repayments=Remboursements +lima.table.solde=Solde +lima.table.solde.credit=Solde crédit +lima.table.solde.debit=Solde débit +lima.table.vatcredit=Crédit de TVA +lima.table.vatdue=TVA due +lima.table.vatpaid=TVA payée +lima.table.vatpayable=TVA à payer +lima.table.voucher=Pièce comptable +lima.title=Lutin Invoice Monitoring and Accounting +lima.title.about=À propos de Lima... +lima.title.about.description=Logiciel de comptabilité Libre +lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> +lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> +lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé +limma.config.thousandseparator.description= +nuitonutil.error.applicationconfig.save= Added: trunk/lima-swing/src/main/resources/import/vat_base.csv =================================================================== --- trunk/lima-swing/src/main/resources/import/vat_base.csv (rev 0) +++ trunk/lima-swing/src/main/resources/import/vat_base.csv 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,48 @@ +"VAT";"A. MONTANT DES OPERATIONS REALISEES";"true";"";"" +"VAT";"OPERATIONS IMPOSABLES (H.T.)";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Ventes, prestations de services";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Autres opérations impossables";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de prestations de services intracommunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Acquisitions intracomunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Livraisons de gaz naturel ou d'électricité imposables en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de biens ou de prestations de services réalisées auprès d'un assujetti non établi en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Régularisations";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"OPERATIONS NON IMPOSABLES";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Exportations hors CE";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Autres opérations non iposables";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons intracommunautaires";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons de gaz naturel ou d'électricité non imposables en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Achats de franchise";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Ventes de biens ou prestations de services réalisées aurpès d'un assujetti non établi en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Régularisations";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"B. DECOMPTE DE LA TVA A PAYER";"true";"";"" +"VAT";"TVA BRUTE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Opérations réalisées en France métropolitaine";"true";"";"TVA BRUTE" +"VAT";"Taux normal 19,6%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Taux réduit 5,5%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Opérations réalisées dans les DOM";"true";"";"TVA BRUTE" +"VAT";"Taux normal 8,5%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Taux normal 2,1%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Opérations imposables à un autre taux (France métropolitaine ou DOM)";"true";"";"TVA BRUTE" +"VAT";"Ancien taux";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"Opérations imposables à un taux particulier";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"TVA antérieurement déduite à reverser";"false";"";"TVA BRUTE" +"VAT";"Total de le TVA brute due";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur acquisitions intracommunautaires";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur opérations à destination de Monaco";"false";"";"TVA BRUTE" +"VAT";"TVA DEDUCTIBLE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Biens constituant des immobilisations";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autres biens et services";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autre TVA à déduire";"false";"";"TVA DEDUCTIBLE" +"VAT";"Report du crédit apparaissant ligne 27 de la précedente déclaration";"false";"";"TVA DEDUCTIBLE" +"VAT";"Dont TVA non perçue récupérable par les assujettis disposant d'un établissement stable dans les DOM";"false";"";"TVA DEDUCTIBLE" +"VAT";"CREDIT";"true";"";"" +"VAT";"Crédit de TVA";"false";"";"CREDIT" +"VAT";"Remboursement demandé sur formulaire n°3519";"false";"";"CREDIT" +"VAT";"Crédit à reporter";"false";"";"CREDIT" +"VAT";"TAXE A PAYER";"true";"";"" +"VAT";"TVA nette due";"false";"";"TAXE A PAYER" +"VAT";"Taxes assimilées calculée sur annexe n°3310 A";"false";"";"TAXE A PAYER" +"VAT";"Sommes à imputer, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Sommes à ajouter, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Total à payer";"false";"";"TAXE A PAYER" Added: trunk/lima-swing/src/main/resources/import/vat_default.csv =================================================================== --- trunk/lima-swing/src/main/resources/import/vat_default.csv (rev 0) +++ trunk/lima-swing/src/main/resources/import/vat_default.csv 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,48 @@ +"VAT";"A. MONTANT DES OPERATIONS REALISEES";"true";"";"" +"VAT";"OPERATIONS IMPOSABLES (H.T.)";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Ventes, prestations de services";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Autres opérations impossables";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de prestations de services intracommunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Acquisitions intracomunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Livraisons de gaz naturel ou d'électricité imposables en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de biens ou de prestations de services réalisées auprès d'un assujetti non établi en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Régularisations";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"OPERATIONS NON IMPOSABLES";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Exportations hors CE";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Autres opérations non iposables";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons intracommunautaires";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons de gaz naturel ou d'électricité non imposables en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Achats de franchise";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Ventes de biens ou prestations de services réalisées aurpès d'un assujetti non établi en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Régularisations";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"B. DECOMPTE DE LA TVA A PAYER";"true";"";"" +"VAT";"TVA BRUTE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Opérations réalisées en France métropolitaine";"true";"";"TVA BRUTE" +"VAT";"Taux normal 19,6%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Taux réduit 5,5%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Opérations réalisées dans les DOM";"true";"";"TVA BRUTE" +"VAT";"Taux normal 8,5%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Taux normal 2,1%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Opérations imposables à un autre taux (France métropolitaine ou DOM)";"true";"";"TVA BRUTE" +"VAT";"Ancien taux";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"Opérations imposables à un taux particulier";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"TVA antérieurement déduite à reverser";"false";"";"TVA BRUTE" +"VAT";"Total de le TVA brute due";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur acquisitions intracommunautaires";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur opérations à destination de Monaco";"false";"";"TVA BRUTE" +"VAT";"TVA DEDUCTIBLE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Biens constituant des immobilisations";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autres biens et services";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autre TVA à déduire";"false";"";"TVA DEDUCTIBLE" +"VAT";"Report du crédit apparaissant ligne 27 de la précedente déclaration";"false";"";"TVA DEDUCTIBLE" +"VAT";"Dont TVA non perçue récupérable par les assujettis disposant d'un établissement stable dans les DOM";"false";"";"TVA DEDUCTIBLE" +"VAT";"CREDIT";"true";"";"" +"VAT";"Crédit de TVA";"false";"";"CREDIT" +"VAT";"Remboursement demandé sur formulaire n°3519";"false";"";"CREDIT" +"VAT";"Crédit à reporter";"false";"";"CREDIT" +"VAT";"TAXE A PAYER";"true";"";"" +"VAT";"TVA nette due";"false";"";"TAXE A PAYER" +"VAT";"Taxes assimilées calculée sur annexe n°3310 A";"false";"";"TAXE A PAYER" +"VAT";"Sommes à imputer, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Sommes à ajouter, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Total à payer";"false";"";"TAXE A PAYER" Added: trunk/lima-swing/src/main/resources/import/vat_developed.csv =================================================================== --- trunk/lima-swing/src/main/resources/import/vat_developed.csv (rev 0) +++ trunk/lima-swing/src/main/resources/import/vat_developed.csv 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,48 @@ +"VAT";"A. MONTANT DES OPERATIONS REALISEES";"true";"";"" +"VAT";"OPERATIONS IMPOSABLES (H.T.)";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Ventes, prestations de services";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Autres opérations impossables";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de prestations de services intracommunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Acquisitions intracomunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Livraisons de gaz naturel ou d'électricité imposables en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de biens ou de prestations de services réalisées auprès d'un assujetti non établi en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Régularisations";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"OPERATIONS NON IMPOSABLES";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Exportations hors CE";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Autres opérations non iposables";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons intracommunautaires";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons de gaz naturel ou d'électricité non imposables en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Achats de franchise";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Ventes de biens ou prestations de services réalisées aurpès d'un assujetti non établi en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Régularisations";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"B. DECOMPTE DE LA TVA A PAYER";"true";"";"" +"VAT";"TVA BRUTE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Opérations réalisées en France métropolitaine";"true";"";"TVA BRUTE" +"VAT";"Taux normal 19,6%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Taux réduit 5,5%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Opérations réalisées dans les DOM";"true";"";"TVA BRUTE" +"VAT";"Taux normal 8,5%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Taux normal 2,1%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Opérations imposables à un autre taux (France métropolitaine ou DOM)";"true";"";"TVA BRUTE" +"VAT";"Ancien taux";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"Opérations imposables à un taux particulier";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"TVA antérieurement déduite à reverser";"false";"";"TVA BRUTE" +"VAT";"Total de le TVA brute due";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur acquisitions intracommunautaires";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur opérations à destination de Monaco";"false";"";"TVA BRUTE" +"VAT";"TVA DEDUCTIBLE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Biens constituant des immobilisations";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autres biens et services";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autre TVA à déduire";"false";"";"TVA DEDUCTIBLE" +"VAT";"Report du crédit apparaissant ligne 27 de la précedente déclaration";"false";"";"TVA DEDUCTIBLE" +"VAT";"Dont TVA non perçue récupérable par les assujettis disposant d'un établissement stable dans les DOM";"false";"";"TVA DEDUCTIBLE" +"VAT";"CREDIT";"true";"";"" +"VAT";"Crédit de TVA";"false";"";"CREDIT" +"VAT";"Remboursement demandé sur formulaire n°3519";"false";"";"CREDIT" +"VAT";"Crédit à reporter";"false";"";"CREDIT" +"VAT";"TAXE A PAYER";"true";"";"" +"VAT";"TVA nette due";"false";"";"TAXE A PAYER" +"VAT";"Taxes assimilées calculée sur annexe n°3310 A";"false";"";"TAXE A PAYER" +"VAT";"Sommes à imputer, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Sommes à ajouter, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Total à payer";"false";"";"TAXE A PAYER" Added: trunk/lima-swing/src/main/resources/import/vat_shortened.csv =================================================================== --- trunk/lima-swing/src/main/resources/import/vat_shortened.csv (rev 0) +++ trunk/lima-swing/src/main/resources/import/vat_shortened.csv 2011-07-08 09:03:27 UTC (rev 3201) @@ -0,0 +1,48 @@ +"VAT";"A. MONTANT DES OPERATIONS REALISEES";"true";"";"" +"VAT";"OPERATIONS IMPOSABLES (H.T.)";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Ventes, prestations de services";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Autres opérations impossables";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de prestations de services intracommunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Acquisitions intracomunautaires";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Livraisons de gaz naturel ou d'électricité imposables en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Achats de biens ou de prestations de services réalisées auprès d'un assujetti non établi en France";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"Régularisations";"false";"";"OPERATIONS IMPOSABLES (H.T.)" +"VAT";"OPERATIONS NON IMPOSABLES";"true";"";"A. MONTANT DES OPERATIONS REALISEES" +"VAT";"Exportations hors CE";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Autres opérations non iposables";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons intracommunautaires";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Livraisons de gaz naturel ou d'électricité non imposables en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Achats de franchise";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Ventes de biens ou prestations de services réalisées aurpès d'un assujetti non établi en France";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"Régularisations";"false";"";"OPERATIONS NON IMPOSABLES" +"VAT";"B. DECOMPTE DE LA TVA A PAYER";"true";"";"" +"VAT";"TVA BRUTE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Opérations réalisées en France métropolitaine";"true";"";"TVA BRUTE" +"VAT";"Taux normal 19,6%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Taux réduit 5,5%";"false";"";"Opérations réalisées en France métropolitaine" +"VAT";"Opérations réalisées dans les DOM";"true";"";"TVA BRUTE" +"VAT";"Taux normal 8,5%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Taux normal 2,1%";"false";"";"Opérations réalisées dans les DOM" +"VAT";"Opérations imposables à un autre taux (France métropolitaine ou DOM)";"true";"";"TVA BRUTE" +"VAT";"Ancien taux";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"Opérations imposables à un taux particulier";"false";"";"Opérations imposables à un autre taux (France métropolitaine ou DOM)" +"VAT";"TVA antérieurement déduite à reverser";"false";"";"TVA BRUTE" +"VAT";"Total de le TVA brute due";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur acquisitions intracommunautaires";"false";"";"TVA BRUTE" +"VAT";"Dont TVA sur opérations à destination de Monaco";"false";"";"TVA BRUTE" +"VAT";"TVA DEDUCTIBLE";"true";"";"B. DECOMPTE DE LA TVA A PAYER" +"VAT";"Biens constituant des immobilisations";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autres biens et services";"false";"";"TVA DEDUCTIBLE" +"VAT";"Autre TVA à déduire";"false";"";"TVA DEDUCTIBLE" +"VAT";"Report du crédit apparaissant ligne 27 de la précedente déclaration";"false";"";"TVA DEDUCTIBLE" +"VAT";"Dont TVA non perçue récupérable par les assujettis disposant d'un établissement stable dans les DOM";"false";"";"TVA DEDUCTIBLE" +"VAT";"CREDIT";"true";"";"" +"VAT";"Crédit de TVA";"false";"";"CREDIT" +"VAT";"Remboursement demandé sur formulaire n°3519";"false";"";"CREDIT" +"VAT";"Crédit à reporter";"false";"";"CREDIT" +"VAT";"TAXE A PAYER";"true";"";"" +"VAT";"TVA nette due";"false";"";"TAXE A PAYER" +"VAT";"Taxes assimilées calculée sur annexe n°3310 A";"false";"";"TAXE A PAYER" +"VAT";"Sommes à imputer, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Sommes à ajouter, exprimées en euros, y compris acompte congés";"false";"";"TAXE A PAYER" +"VAT";"Total à payer";"false";"";"TAXE A PAYER"

1 0

r3200 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: . vatchart vatreports
by vsalaun＠users.chorem.org 05 Jul '11

05 Jul '11

Author: vsalaun Date: 2011-07-05 18:19:45 +0200 (Tue, 05 Jul 2011) New Revision: 3200 Url: http://chorem.org/repositories/revision/lima/3200 Log: #347 rename Vat to VatReport add VatChart Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.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 Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-05 16:19:45 UTC (rev 3200) @@ -168,6 +168,8 @@ actionIcon='charts-financialperiod'/> <JMenuItem text="lima.charts.financialstatement" onActionPerformed='getHandler().showFinancialStatementView(this)' actionIcon='charts-financialstatements'/> + <JMenuItem text="lima.charts.vat" onActionPerformed='getHandler().showVatChartView(this)' + actionIcon='charts-financialstatements'/> </JMenu> <JMenu text="lima.entries" mnemonic="{'E'}"> @@ -191,7 +193,7 @@ actionIcon='reports-ledger'/> <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='reports-financialstatement'/> - <JMenuItem text="lima.reports.vat" onActionPerformed='getHandler().showVatView(this)' + <JMenuItem text="lima.reports.vat" onActionPerformed='getHandler().showVatReportView(this)' actionIcon='reports-financialstatement'/> </JMenu> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -54,7 +54,8 @@ import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.ui.lettering.LetteringView; -import org.chorem.lima.ui.vatreports.VatView; +import org.chorem.lima.ui.vatchart.VatChartView; +import org.chorem.lima.ui.vatreports.VatReportView; import org.chorem.lima.util.ErrorHelper; /** @@ -337,9 +338,19 @@ FinancialStatementChartView financialStatementView = new FinancialStatementChartView(mainView); mainView.showTab(_("lima.charts.financialstatement"), financialStatementView); - } + } /** + * Show vat chart to generate vat document + * @param rootContext + */ + public void showVatChartView(JAXXContext rootContext){ + MainView mainView = getUI(rootContext); + VatChartView vatChartView = new VatChartView(mainView); + mainView.showTab(_("lima.charts.financialstatement"), vatChartView); + } + + /** * Show account table report to view an account on a period * @param rootContext */ @@ -407,10 +418,10 @@ mainView.showTab(_("lima.reports.financialstatement"), financialStatementReportView); } - public void showVatView(JAXXContext rootContext) { + public void showVatReportView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); - VatView vatView = new VatView(mainView); - mainView.showTab(_("lima.reports.vat"), vatView); + VatReportView vatReportView = new VatReportView(mainView); + mainView.showTab(_("lima.reports.vat"), vatReportView); } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,77 @@ +package org.chorem.lima.ui.vatchart; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; + +public class VatChartTreeTable extends JXTreeTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3960840343197845825L; + + /** log. */ + private static final Log log = LogFactory + .getLog(VatChartTreeTable.class); + + protected VatChartViewHandler handler; + + public VatChartTreeTable(VatChartViewHandler handler) { + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + /** + * for each action combination key are think + * for extend keyboard and laptop keyboard + */ + @Override + public void keyPressed(KeyEvent e) { + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,232 @@ +package org.chorem.lima.ui.vatchart; + +import static org.nuiton.i18n.I18n._; +import java.util.List; +import javax.swing.tree.TreePath; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.FinancialStatementServiceMonitorable; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.FinancialStatement; +import org.chorem.lima.entity.FinancialStatementImpl; +import org.chorem.lima.service.LimaServiceFactory; +import org.jdesktop.swingx.treetable.AbstractTreeTableModel; + +public class VatChartTreeTableModel extends AbstractTreeTableModel { + + /** log. */ + private static final Log log = LogFactory.getLog(VatChartViewHandler.class); + + /** Services. */ + protected final FinancialStatementServiceMonitorable financialStatementService; + + /** + * Model constructor. Init account service used here. + */ + public VatChartTreeTableModel() { + + financialStatementService = + LimaServiceFactory.getInstance().getService( + FinancialStatementServiceMonitorable.class); + } + + + @Override + public int getColumnCount() { + return 5; + } + + @Override + public String getColumnName(int column) { + String res = null; + switch (column) { + case 0: + res = _("lima.table.label"); + break; + case 1: + res = _("lima.table.debitcredit"); + break; + case 2: + res = _("lima.table.debit"); + break; + case 3: + res = _("lima.table.credit"); + break; + case 4: + res = _("lima.table.provisiondeprecationamount"); + break; + } + return res; + } + + @Override + public int getChildCount(Object node) { + int result = 0; + if (node == getRoot()) { + try { + result = financialStatementService. + getChildrenFinancialStatement(null).size(); + } catch (LimaException eee) { + log.debug("Can't count child", eee); + } + } + else { + FinancialStatement parentFinancialStatementHeader = + (FinancialStatement) node; + try { + result = financialStatementService.getChildrenFinancialStatement( + parentFinancialStatementHeader).size(); + } catch (LimaException eee) { + log.debug("Can't count child", eee); + } + } + return result; + } + + @Override + public Object getChild(Object parent, int index) { + Object result = null; + if (parent == getRoot()) { + try { + List<FinancialStatement> financialStatements = + financialStatementService.getChildrenFinancialStatement(null); + result = financialStatements.get(index); + } catch (LimaException eee) { + log.debug("Can't get child", eee); + } + } + else { + FinancialStatement parentFinancialStatement = + (FinancialStatement) parent; + try { + List<FinancialStatement> financialStatements = financialStatementService. + getChildrenFinancialStatement(parentFinancialStatement); + result = financialStatements.get(index); + } catch (LimaException eee) { + log.debug("Can't get child", eee); + } + } + return result; + } + + @Override + public int getIndexOfChild(Object parent, Object child) { + int result = 0; + + if (parent == getRoot()) { + try { + List<FinancialStatement> financialStatements = + financialStatementService.getChildrenFinancialStatement(null); + result = financialStatements.indexOf(child); + } catch (LimaException eee) { + log.debug("Can't get index child", eee); + } + } + else { + FinancialStatement parentFinancialStatement = + (FinancialStatement) parent; + try { + List<FinancialStatement> financialStatements = financialStatementService. + getChildrenFinancialStatement(parentFinancialStatement); + result = financialStatements.indexOf(child); + } catch (LimaException eee) { + log.debug("Can't get index child", eee); + } + } + return result; + } + + @Override + public Object getValueAt(Object node, int column) { + Object result = "n/a"; + FinancialStatement financialStatement = (FinancialStatement) node; + switch (column) { + case 0: + result = financialStatement.getLabel(); + break; + case 1: + result = financialStatement.getAccounts(); + break; + case 2: + result = financialStatement.getDebitAccounts(); + break; + case 3: + result = financialStatement.getCreditAccounts(); + break; + case 4: + result = financialStatement.getProvisionDeprecationAccounts(); + break; + } + return result; + } + + @Override + public boolean isCellEditable(Object node, int column) { + return false; + } + + @Override + public boolean isLeaf(Object node) { + return getChildCount(node) == 0; + } + + + /** + * Refresh FinancialStatementChart. + * + */ + public void refreshTree() throws LimaException { + + modelSupport.fireNewRoot(); + } + + + /** + * Add FinancialStatement(path can be null). + * + * @param path + * @param account + * @throws LimaException + */ + public void addFinancialStatement(TreePath path, FinancialStatement financialStatement) throws LimaException { + // Calling account service + FinancialStatement parentFinancialStatementHeader = + (FinancialStatement) path.getLastPathComponent(); + if (parentFinancialStatementHeader == getRoot()) { + parentFinancialStatementHeader = null; + } + financialStatementService.createFinancialStatement( + parentFinancialStatementHeader, financialStatement); + modelSupport.fireTreeStructureChanged(path); + } + + + /** + * Update financialStatement + * + * @param path + * @param account + * @throws LimaException + */ + public void updateFinancialStatement(TreePath path, FinancialStatement financialStatement) throws LimaException { + + financialStatementService.updateFinancialStatement(financialStatement); + modelSupport.fireTreeStructureChanged(path); + } + + + /** + * Remove financialStatement + * + * @param path + * @param object + * @throws LimaException + */ + public void removeFinancialStatementObject(TreePath path, FinancialStatement financialStatement) throws LimaException { + // Calling account service + int index = getIndexOfChild( + path.getParentPath().getLastPathComponent(), financialStatement); + financialStatementService.removeFinancialStatement(financialStatement); + modelSupport.fireChildRemoved(path.getParentPath(), index, financialStatement); + } +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,26 @@ +<Table> + + <VatChartViewHandler id="handler" javaBean="new VatChartViewHandler(this)" /> + <Boolean id="selectedRow" javaBean="false" /> + + <script> + <![CDATA[ + //getHandler().init(); + ]]> + </script> + + <row> + <cell fill="both" weightx="1" weighty="1" rows='6'> + <JScrollPane> + <VatChartTreeTable id="treeTable" + constructorParams="getHandler()" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}" + treeTableModel="{new org.chorem.lima.ui.vatchart.VatChartTreeTableModel()}" + highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" /> + <javax.swing.ListSelectionModel + javaBean="getTreeTable().getSelectionModel()" + onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/> + </JScrollPane> + </cell> + </row> +</Table> \ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,70 @@ +package org.chorem.lima.ui.vatchart; + +import static org.nuiton.i18n.I18n._; + +import javax.swing.JOptionPane; +import javax.swing.tree.TreePath; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.FinancialStatementServiceMonitorable; +import org.chorem.lima.business.ImportServiceMonitorable; +import org.chorem.lima.business.LimaBusinessException; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.entity.FinancialStatement; +import org.chorem.lima.entity.FinancialStatementImpl; +import org.chorem.lima.enums.FinancialStatementsChartEnum; +import org.chorem.lima.enums.ImportExportEnum; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.financialstatementchart.FinancialStatementHeaderForm; +import org.chorem.lima.ui.financialstatementchart.FinancialStatementMovementForm; +import org.chorem.lima.ui.importexport.ImportExport; +import org.chorem.lima.util.DialogHelper; +import org.chorem.lima.util.ErrorHelper; +import org.jdesktop.swingx.JXTreeTable; + +public class VatChartViewHandler implements ServiceListener { + + /** log. */ + private static final Log log = LogFactory.getLog(VatChartViewHandler.class); + + protected FinancialStatementServiceMonitorable financialStatementService; + + protected VatChartView view; + + protected VatChartViewHandler(VatChartView view) { + this.view = view; + + financialStatementService = + LimaServiceFactory.getInstance().getService( + FinancialStatementServiceMonitorable.class); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + } + + public void refresh(){ + JXTreeTable treeTable = view.getTreeTable(); + VatChartTreeTableModel treeTableModel = + (VatChartTreeTableModel) treeTable.getTreeTableModel(); + try { + treeTableModel.refreshTree(); + } catch (LimaException eee) { + if(log.isDebugEnabled()){ + log.debug("Can't refresh model", eee); + } + } + //refresh view + view.repaint(); + } + + @Override + public void notifyMethod(String serviceName, String methodeName) { + /*if (methodeName.contains("FinancialStatements") + || methodeName.contains("importAll") + || methodeName.contains("importAs")){ + refresh(); + }*/ + } + + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,69 @@ +package org.chorem.lima.ui.vatreports; + +import java.awt.Color; +import java.awt.Component; +import java.math.BigDecimal; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ColorHighlighter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; + +public class VatReportTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4042515416850867834L; + + /** log. */ + private static final Log log = LogFactory.getLog(VatReportTable.class); + + protected VatReportViewHandler handler; + + protected VatReportTableModel model; + + private Highlighter colorTransaction; + + public VatReportTable(VatReportViewHandler handler) { + + this.handler = handler; + + model = this.handler.getView().getVatReportTableModel(); + + //Get new BigDecimal editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + + //highlight financial financial transactions + //FIXME 2011.06.09 doesn't work !!! + addMonthColor(); + } + + /* + * Color the background row in grey if the month number is even (pair in french) + */ + protected void addMonthColor() { + HighlightPredicate predicate = new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, + ComponentAdapter adapter) { + Object object = model.getElementAt(adapter.row); + if (object instanceof FinancialPeriod) { + return true; + } else { + return false; + } + } + }; + colorTransaction = + new ColorHighlighter(predicate, new Color(222,222,222), null); + addHighlighter(colorTransaction); + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,315 @@ +package org.chorem.lima.ui.vatreports; + +import static org.nuiton.i18n.I18n._; + +import java.text.SimpleDateFormat; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.swing.table.AbstractTableModel; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.BalanceTrial; +import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.utils.EntryComparator; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; +import org.nuiton.topia.TopiaException; + +public class VatReportTableModel extends AbstractTableModel implements ServiceListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6301817853711018389L; + + /** log. */ + private static final Log log = LogFactory + .getLog(VatReportTableModel.class); + + /** Services. */ + protected ReportServiceMonitorable reportService; + + /** selected financial period */ + protected FiscalPeriod selectedFiscalPeriod; + + /** data cache */ + protected List<Object> cacheDataList; + + + public VatReportTableModel() { + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); + } + + protected List<Object> getDataList() throws TopiaException { + List<Object> finalresults = new ArrayList<Object>(); + + if (selectedFiscalPeriod != null) { + try { + List<Object> results = reportService.generateVat(selectedFiscalPeriod); + + for (int index=0; index<results.size(); index++) { + if (results.get(index) instanceof BalanceTrial) { + if (((BalanceTrial)results.get(index)).getReportsDatas() != null){ + for (ReportsDatas reportsDatas : ((BalanceTrial)results.get(index)).getReportsDatas()) { + //reports datas + finalresults.add(reportsDatas); + List<Entry> entries = (List<Entry>) reportsDatas.getListEntry(); + if (entries != null){ + Collections.sort(entries, new EntryComparator()); + for (Entry entry : entries) { + //entry + finalresults.add(entry); + } + } + } + } + } else { + //financial period + finalresults.add(results.get(index)); + } + } + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get VAT list", eee); + } + } + return finalresults; + } + + public void refresh(){ + try { + cacheDataList = getDataList(); + } catch (TopiaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get VAT list", eee); + } + fireTableDataChanged(); + } + + @Override + public Class<?> getColumnClass(int column) { + + Class<?> result = null; + + switch (column) { + case 0: + result = String.class; + break; + case 1: + result = Account.class; + break; + case 2: + result = String.class; + break; + case 3: + result = String.class; + break; + case 4: + result = BigDecimal.class; + break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; + } + + return result; + } + + @Override + public String getColumnName(int column) { + String result = "n/a"; + + switch (column) { + case 0: + result = _("lima.table.date"); //date + break; + case 1: + result = "compte"; //tva collectee + break; + case 2: + result = "piece comptable"; //tva due + break; + case 3: + result = "description"; //credit de tva + break; + case 4: + result = "debit"; //remboursemments + break; + case 5: + result = "credit"; //credit restant + break; + case 6: + result = "solde"; //tva a payer + break; + } + + return result; + } + + @Override + public int getRowCount() { + int result = 0; + + if (cacheDataList != null) { + result = cacheDataList.size(); + } + + return result; + } + + @Override + public int getColumnCount() { + return 7; + } + + public Object getElementAt(int row){ + Object currentRow = cacheDataList.get(row); + return currentRow; + } + + @Override + public Object getValueAt(int row, int column) { + Object result = null; + // just prevent too much result + if (cacheDataList != null) { + result = cacheDataList.get(row); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); + if (result instanceof FinancialPeriod) { + FinancialPeriod fp = (FinancialPeriod) result; + + switch (column) { + case 0: + result = simpleDateFormat.format(fp.getBeginDate()) + + " - " + simpleDateFormat.format(fp.getEndDate()); + break; + case 1: + result = null; + break; + case 2: + result = null; // voucher + break; + case 3: + result = null; // description + break; + case 4: + result = null; // position + break; + case 5: + result = null; + break; + case 6: + result = null; + break; + } + } + else if (result instanceof ReportsDatas) { + ReportsDatas currentRow = (ReportsDatas)result; + BigDecimal amountDebit = currentRow.getAmountDebit(); + BigDecimal amountCredit = currentRow.getAmountCredit(); + + switch (column) { + case 0: + result = null; // date + break; + case 1: + if (currentRow.getAccount() != null){ + result = currentRow.getAccount().getAccountNumber() + + " - " + currentRow.getAccount().getLabel(); + } + else { + result = null; + } + break; + case 2: + result = null; // voucher + break; + case 3: + result = null; // description + break; + case 4: + result = amountDebit; // position + break; + case 5: + result = amountCredit; + break; + case 6: + result = amountDebit.subtract(amountCredit); + break; + } + } + else if (result instanceof Entry) { + Entry currentRow = (Entry)result; + BigDecimal amountDebit = BigDecimal.ZERO, + amountCredit = BigDecimal.ZERO; + if (currentRow.getDebit()){ + amountDebit = currentRow.getAmount(); + } + else { + amountCredit = currentRow.getAmount(); + } + + switch (column) { + case 0: // date + result = simpleDateFormat. + format(currentRow.getFinancialTransaction().getTransactionDate()); + break; + case 1 : // account + result = null; + break; + case 2: // description + result = currentRow.getVoucher(); + break; + case 3: + result = currentRow.getDescription(); + break; + case 4: + result = amountDebit; + break; + case 5: + result = amountCredit; + break; + case 6: + result = amountDebit.subtract(amountCredit); + break; + } + } + } + + return result; + } + + public FiscalPeriod getFiscalPeriod() { + return selectedFiscalPeriod; + } + + public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ + selectedFiscalPeriod = fiscalPeriod; + refresh(); + } + + @Override + public void notifyMethod(String serviceName, String methodeName) { + // TODO Auto-generated method stub + + } + +} Added: 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 (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,58 @@ +<Table> + <VatReportViewHandler id="handler" javaBean="new VatReportViewHandler(this)" /> + <Boolean id="selectedRow" javaBean="false" /> + + <script> + <![CDATA[ + import org.chorem.lima.entity.FiscalPeriod; + import org.chorem.lima.entity.FinancialPeriod; + import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; + import org.chorem.lima.ui.financialtransaction.FinancialPeriodComboBox; + import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; + import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer; + import org.chorem.lima.ui.vatreports.VatTableModel; + import org.chorem.lima.ui.vatreports.VatTable; + + void $afterCompleteSetup() { + getHandler().refresh(); + } + + ]]> + </script> + + <row weightx="1" weighty="0" anchor="center"> + <cell anchor="east"> + <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> + </cell> + <cell anchor="west"> + <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <JComboBox id="fiscalPeriodComboBox" + model="{getModelFiscalPeriod()}" + renderer="{new FiscalPeriodComboBoxRenderer()}" + onActionPerformed="getVatReportTableModel().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" + editable="false"/> + </cell> + <cell> + <EnumEditor id='DocumentEditor' + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> + </cell> + <cell> + <JButton id="editVatButton" text="lima.reports.vat" + onActionPerformed="getHandler().editVat()"/> + </cell> + </row> + <row> + <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> + <JScrollPane> + <org.chorem.lima.ui.vatreports.VatReportTableModel + id="vatReportTableModel"/> + <org.chorem.lima.ui.vatreports.VatReportTable + id="vatReportTable" sortable="false" rowHeight="22" + constructorParams="getHandler()" model="{getVatReportTableModel()}" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> + <javax.swing.ListSelectionModel javaBean="getVatReportTable().getSelectionModel()" + onValueChanged="setSelectedRow(vatReportTable.getSelectedRow() != -1)"/> + </JScrollPane> + </cell> + </row> +</Table> \ No newline at end of file Added: 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 (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -0,0 +1,83 @@ +package org.chorem.lima.ui.vatreports; + +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.text.SimpleDateFormat; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaConfig; +import org.chorem.lima.business.DocumentServiceMonitorable; +import org.chorem.lima.business.HttpServerServiceMonitorable; +import org.chorem.lima.business.utils.DocumentsEnum; +import org.chorem.lima.service.LimaServiceFactory; + +public class VatReportViewHandler { + /** log. */ + private static final Log log = + LogFactory.getLog(VatReportViewHandler.class); + + protected VatReportView view; + + protected VatReportTable table; + + protected VatReportTableModel tableModel; + + protected DocumentServiceMonitorable documentService; + + private static SimpleDateFormat dateFormat = + new SimpleDateFormat("yyyy-MM-dd"); + + protected int port; + + protected VatReportViewHandler(VatReportView view) { + this.view = view; + + port = LimaServiceFactory.getInstance().getService( + HttpServerServiceMonitorable.class).getHttpPort(); + + documentService = + LimaServiceFactory.getInstance().getService( + DocumentServiceMonitorable.class); + } + + /** + * @return VatView + */ + public VatReportView getView() { + return view; + } + + /** + * Edit VAT document + */ + public void editVat() { + if (tableModel.getFiscalPeriod() != null){ + String address = LimaConfig.getInstance().getHostAdress(); + + try { + String url = "http://"+address+":"+port+"/?beginDate=" + + dateFormat.format(tableModel.getFiscalPeriod().getBeginDate()) + + "&endDate="+dateFormat.format(tableModel.getFiscalPeriod().getEndDate()) + + "&format=.pdf&model=" + + DocumentsEnum.VAT.getFileName(); + 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); + } + } + } + + /** + * Refresh VatTableModel + */ + public void refresh(){ + tableModel = view.getVatReportTableModel(); + tableModel.refresh(); + } + +} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -1,69 +0,0 @@ -package org.chorem.lima.ui.vatreports; - -import java.awt.Color; -import java.awt.Component; -import java.math.BigDecimal; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ColorHighlighter; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; - -public class VatTable extends JXTable { - - /** serialVersionUID. */ - private static final long serialVersionUID = 4042515416850867834L; - - /** log. */ - private static final Log log = LogFactory.getLog(VatTable.class); - - protected VatViewHandler handler; - - protected VatTableModel model; - - private Highlighter colorTransaction; - - public VatTable(VatViewHandler handler) { - - this.handler = handler; - - model = this.handler.getView().getVatTableModel(); - - //Get new BigDecimal editor - setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); - //Get new BigDecimal renderer - setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); - - //highlight financial financial transactions - //FIXME 2011.06.09 doen't work !!! - addMonthColor(); - } - - /* - * Color the background row in grey if the month number is even (pair in french) - */ - protected void addMonthColor() { - HighlightPredicate predicate = new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, - ComponentAdapter adapter) { - Object object = model.getElementAt(adapter.row); - if (object instanceof FinancialPeriod) { - return true; - } else { - return false; - } - } - }; - colorTransaction = - new ColorHighlighter(predicate, new Color(222,222,222), null); - addHighlighter(colorTransaction); - } - -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -1,315 +0,0 @@ -package org.chorem.lima.ui.vatreports; - -import static org.nuiton.i18n.I18n._; - -import java.text.SimpleDateFormat; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.swing.table.AbstractTableModel; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.BalanceTrial; -import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportServiceMonitorable; -import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.business.utils.EntryComparator; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.ErrorHelper; -import org.nuiton.topia.TopiaException; - -public class VatTableModel extends AbstractTableModel implements ServiceListener { - - /** serialVersionUID. */ - private static final long serialVersionUID = -6301817853711018389L; - - /** log. */ - private static final Log log = LogFactory - .getLog(VatTableModel.class); - - /** Services. */ - protected ReportServiceMonitorable reportService; - - /** selected financial period */ - protected FiscalPeriod selectedFiscalPeriod; - - /** data cache */ - protected List<Object> cacheDataList; - - - public VatTableModel() { - reportService = - LimaServiceFactory.getInstance().getService( - ReportServiceMonitorable.class); - } - - protected List<Object> getDataList() throws TopiaException { - List<Object> finalresults = new ArrayList<Object>(); - - if (selectedFiscalPeriod != null) { - try { - List<Object> results = reportService.generateVat(selectedFiscalPeriod); - - for (int index=0; index<results.size(); index++) { - if (results.get(index) instanceof BalanceTrial) { - if (((BalanceTrial)results.get(index)).getReportsDatas() != null){ - for (ReportsDatas reportsDatas : ((BalanceTrial)results.get(index)).getReportsDatas()) { - //reports datas - finalresults.add(reportsDatas); - List<Entry> entries = (List<Entry>) reportsDatas.getListEntry(); - if (entries != null){ - Collections.sort(entries, new EntryComparator()); - for (Entry entry : entries) { - //entry - finalresults.add(entry); - } - } - } - } - } else { - //financial period - finalresults.add(results.get(index)); - } - } - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get VAT list", eee); - } - } - return finalresults; - } - - public void refresh(){ - try { - cacheDataList = getDataList(); - } catch (TopiaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get VAT list", eee); - } - fireTableDataChanged(); - } - - @Override - public Class<?> getColumnClass(int column) { - - Class<?> result = null; - - switch (column) { - case 0: - result = String.class; - break; - case 1: - result = Account.class; - break; - case 2: - result = String.class; - break; - case 3: - result = String.class; - break; - case 4: - result = BigDecimal.class; - break; - case 5: - result = BigDecimal.class; - break; - case 6: - result = BigDecimal.class; - break; - } - - return result; - } - - @Override - public String getColumnName(int column) { - String result = "n/a"; - - switch (column) { - case 0: - result = _("lima.table.date"); //date - break; - case 1: - result = "compte"; //tva collectee - break; - case 2: - result = "piece comptable"; //tva due - break; - case 3: - result = "description"; //credit de tva - break; - case 4: - result = "debit"; //remboursemments - break; - case 5: - result = "credit"; //credit restant - break; - case 6: - result = "solde"; //tva a payer - break; - } - - return result; - } - - @Override - public int getRowCount() { - int result = 0; - - if (cacheDataList != null) { - result = cacheDataList.size(); - } - - return result; - } - - @Override - public int getColumnCount() { - return 7; - } - - public Object getElementAt(int row){ - Object currentRow = cacheDataList.get(row); - return currentRow; - } - - @Override - public Object getValueAt(int row, int column) { - Object result = null; - // just prevent too much result - if (cacheDataList != null) { - result = cacheDataList.get(row); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); - if (result instanceof FinancialPeriod) { - FinancialPeriod fp = (FinancialPeriod) result; - - switch (column) { - case 0: - result = simpleDateFormat.format(fp.getBeginDate()) - + " - " + simpleDateFormat.format(fp.getEndDate()); - break; - case 1: - result = null; - break; - case 2: - result = null; // voucher - break; - case 3: - result = null; // description - break; - case 4: - result = null; // position - break; - case 5: - result = null; - break; - case 6: - result = null; - break; - } - } - else if (result instanceof ReportsDatas) { - ReportsDatas currentRow = (ReportsDatas)result; - BigDecimal amountDebit = currentRow.getAmountDebit(); - BigDecimal amountCredit = currentRow.getAmountCredit(); - - switch (column) { - case 0: - result = null; // date - break; - case 1: - if (currentRow.getAccount() != null){ - result = currentRow.getAccount().getAccountNumber() - + " - " + currentRow.getAccount().getLabel(); - } - else { - result = null; - } - break; - case 2: - result = null; // voucher - break; - case 3: - result = null; // description - break; - case 4: - result = amountDebit; // position - break; - case 5: - result = amountCredit; - break; - case 6: - result = amountDebit.subtract(amountCredit); - break; - } - } - else if (result instanceof Entry) { - Entry currentRow = (Entry)result; - BigDecimal amountDebit = BigDecimal.ZERO, - amountCredit = BigDecimal.ZERO; - if (currentRow.getDebit()){ - amountDebit = currentRow.getAmount(); - } - else { - amountCredit = currentRow.getAmount(); - } - - switch (column) { - case 0: // date - result = simpleDateFormat. - format(currentRow.getFinancialTransaction().getTransactionDate()); - break; - case 1 : // account - result = null; - break; - case 2: // description - result = currentRow.getVoucher(); - break; - case 3: - result = currentRow.getDescription(); - break; - case 4: - result = amountDebit; - break; - case 5: - result = amountCredit; - break; - case 6: - result = amountDebit.subtract(amountCredit); - break; - } - } - } - - return result; - } - - public FiscalPeriod getFiscalPeriod() { - return selectedFiscalPeriod; - } - - public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ - selectedFiscalPeriod = fiscalPeriod; - refresh(); - } - - @Override - public void notifyMethod(String serviceName, String methodeName) { - // TODO Auto-generated method stub - - } - -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-07-05 16:19:45 UTC (rev 3200) @@ -1,58 +0,0 @@ -<Table> - <VatViewHandler id="handler" javaBean="new VatViewHandler(this)" /> - <Boolean id="selectedRow" javaBean="false" /> - - <script> - <![CDATA[ - import org.chorem.lima.entity.FiscalPeriod; - import org.chorem.lima.entity.FinancialPeriod; - import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; - import org.chorem.lima.ui.financialtransaction.FinancialPeriodComboBox; - import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; - import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer; - import org.chorem.lima.ui.vatreports.VatTableModel; - import org.chorem.lima.ui.vatreports.VatTable; - - void $afterCompleteSetup() { - getHandler().refresh(); - } - - ]]> - </script> - - <row weightx="1" weighty="0" anchor="center"> - <cell anchor="east"> - <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> - </cell> - <cell anchor="west"> - <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> - <JComboBox id="fiscalPeriodComboBox" - model="{getModelFiscalPeriod()}" - renderer="{new FiscalPeriodComboBoxRenderer()}" - onActionPerformed="getVatTableModel().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" - editable="false"/> - </cell> - <cell> - <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> - </cell> - <cell> - <JButton id="editVatButton" text="lima.reports.vat" - onActionPerformed="getHandler().editVat()"/> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> - <JScrollPane> - <org.chorem.lima.ui.vatreports.VatTableModel - id="vatTableModel"/> - <org.chorem.lima.ui.vatreports.VatTable - id="vatTable" sortable="false" rowHeight="22" - constructorParams="getHandler()" model="{getVatTableModel()}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> - <javax.swing.ListSelectionModel javaBean="getVatTable().getSelectionModel()" - onValueChanged="setSelectedRow(vatTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-07-05 10:34:37 UTC (rev 3199) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-07-05 16:19:45 UTC (rev 3200) @@ -1,88 +0,0 @@ -package org.chorem.lima.ui.vatreports; - -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.text.SimpleDateFormat; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaConfig; -import org.chorem.lima.business.DocumentServiceMonitorable; -import org.chorem.lima.business.HttpServerServiceMonitorable; -import org.chorem.lima.business.utils.DocumentsEnum; -import org.chorem.lima.business.utils.FormatsEnum; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.vatreports.VatTable; -import org.chorem.lima.ui.vatreports.VatTableModel; -import org.chorem.lima.ui.vatreports.VatView; - -public class VatViewHandler { - /** log. */ - private static final Log log = - LogFactory.getLog(VatViewHandler.class); - - protected VatView view; - - protected VatTable table; - - protected VatTableModel tableModel; - - protected DocumentServiceMonitorable documentService; - - private static SimpleDateFormat dateFormat = - new SimpleDateFormat("yyyy-MM-dd"); - - protected int port; - - protected VatViewHandler(VatView view) { - this.view = view; - - port = LimaServiceFactory.getInstance().getService( - HttpServerServiceMonitorable.class).getHttpPort(); - - documentService = - LimaServiceFactory.getInstance().getService( - DocumentServiceMonitorable.class); - } - - /** - * @return VatView - */ - public VatView getView() { - return view; - } - - /** - * Edit VAT document - */ - public void editVat() { - if (tableModel.getFiscalPeriod() != null){ - FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); - String address = LimaConfig.getInstance().getHostAdress(); - - try { - String url = "http://"+address+":"+port+"/?beginDate=" - + dateFormat.format(tableModel.getFiscalPeriod().getBeginDate()) - + "&endDate="+dateFormat.format(tableModel.getFiscalPeriod().getEndDate()) - + "&format="+selectedEnum.getExtension()+"&model=" - + DocumentsEnum.VAT.getFileName(); - 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); - } - } - } - - /** - * Refresh VatTableModel - */ - public void refresh(){ - tableModel = view.getVatTableModel(); - tableModel.refresh(); - } - -}

1 0

r3199 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-swing/src/main/java/org/chorem/lima/ui/vatreports
by vsalaun＠users.chorem.org 05 Jul '11

05 Jul '11

Author: vsalaun Date: 2011-07-05 12:34:37 +0200 (Tue, 05 Jul 2011) New Revision: 3199 Url: http://chorem.org/repositories/revision/lima/3199 Log: #347 improves VAT table Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-07-04 16:06:26 UTC (rev 3198) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-07-05 10:34:37 UTC (rev 3199) @@ -39,10 +39,9 @@ import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.beans.ReportsDatasImpl; -import org.chorem.lima.beans.VatReports; -import org.chorem.lima.beans.VatReportsImpl; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ejbinterface.AccountService; import org.chorem.lima.business.ejbinterface.FinancialPeriodService; import org.chorem.lima.business.ejbinterface.ReportService; import org.chorem.lima.business.ejbinterface.ReportServiceLocal; @@ -71,6 +70,9 @@ @EJB protected FinancialPeriodService financialPeriodService; + @EJB + protected AccountService accountService; + public ReportServiceImpl() { LimaConfig config = LimaConfig.getInstance(); try { @@ -546,105 +548,45 @@ return generateBalanceTrial(beginDate, endDate, selectedAccounts, true, movementedFilter); } + /** * Generate VAT * - * @return VatReports - * @throws TopiaException + * @param FiscalPeriod + * @throws LimaException, TopiaException */ @Override - public List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException { - - List<VatReports> vatReportsList = new ArrayList<VatReports>(); - - //gets the list of all the financialPeriods from the given fiscalPeriod - List<FinancialPeriod> financialPeriodsList = - financialPeriodService.getFinancialPeriods(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); - - //Sets variables used to save amount for the following period - BigDecimal payable = BigDecimal.ZERO; - BigDecimal remainingCredit = BigDecimal.ZERO; - - TopiaContext topiaTransaction = null; - try { - topiaTransaction = beginTransaction(); - - AccountDAO accountDAO = - LimaCallaoDAOHelper.getAccountDAO(topiaTransaction); - //for each account, add the amount to the correct VatReports variable - - List<Account> accountsList = null; - - //Remove Spaces - String result = "445711,445712,445714,445715"; // TVA collectee - result = result.concat(",44562,445661,445662,445664,445665"); //TVA deductible - //build list account from selectedAccounts - accountsList = accountDAO.stringToListAccounts(result, false); - for (FinancialPeriod financialPeriod : financialPeriodsList) { - //Variable to save the vat total sum (collected - deductible) - BigDecimal vat = BigDecimal.ZERO; - //Sets VatReports variables to Zero - VatReports vatReports = new VatReportsImpl(); - vatReports.setPeriod(financialPeriod); - vatReports.setAmountCollected(BigDecimal.ZERO); - vatReports.setAmountDeductible(BigDecimal.ZERO); - vatReports.setAmountDue(BigDecimal.ZERO); - vatReports.setAmountCredit(BigDecimal.ZERO); - vatReports.setAmountRepayments(BigDecimal.ZERO); - vatReports.setAmountRemainingCredit(BigDecimal.ZERO); - //if remainingCredit is not nul then report it to the current period - if (!remainingCredit.equals(BigDecimal.ZERO)) { - vatReports.setAmountRemainingCredit(remainingCredit); - remainingCredit = BigDecimal.ZERO; - } - //if payable is not null then report it to the current period - vatReports.setAmountPayable(BigDecimal.ZERO); - if (!payable.equals(BigDecimal.ZERO)) { - vatReports.setAmountPayable(payable); - payable = BigDecimal.ZERO; - } - vatReports.setAmountPaid(BigDecimal.ZERO); - for (Account account : accountsList) { - ReportsDatas reportsDatas = - generateSubAccountBalanceWithTransaction(account, financialPeriod.getBeginDate(), - financialPeriod.getEndDate(), false, topiaTransaction); - //445711,445712,445714,445715 TVA collectee - if (("445711,445712,445714,445715").contains(account.getAccountNumber()) - && (reportsDatas.getAmountSolde() != null)) { - vatReports.setAmountCollected(vatReports.getAmountCollected().add(reportsDatas.getAmountSolde())); - vat = vat.add(reportsDatas.getAmountSolde()); + public List<Object> generateVat(FiscalPeriod fiscalPeriod) throws LimaException, TopiaException { + List<Object> list = new ArrayList<Object>(); + if (fiscalPeriod != null) { + TopiaContext topiaTransaction = null; + try { + topiaTransaction = beginTransaction(); + //lists all accounts + AccountDAO accountDAO = + LimaCallaoDAOHelper.getAccountDAO(topiaTransaction); + List<Account> accountsList = null; + //gets all financial periods from the fiscal period + List<FinancialPeriod> financialPeriod = financialPeriodService.getFinancialPeriods( + fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); + for (FinancialPeriod fp : financialPeriod) { + list.add(fp); + accountsList = accountDAO.findAll(); + for (Account account : accountsList) { + //VAT accounts start only with number 44 + if (account.getAccountNumber().startsWith("44")) { + list.add(generateBalanceTrial(fp.getBeginDate(), + fp.getEndDate(), account.getAccountNumber(), + true, false)); + } } - //44562,445661,445662,445664,445665TVA deductible - if (("44562,445661,445662,445664,445665").contains(account.getAccountNumber()) - && (reportsDatas.getAmountSolde() != null)) { - vatReports.setAmountDeductible(vatReports.getAmountDeductible().add(reportsDatas.getAmountSolde())); - vat = vat.add(reportsDatas.getAmountSolde().negate()); - } } - //if vat is positive it's a credit - if (vat.compareTo(BigDecimal.ZERO) < 0) { - vatReports.setAmountRemainingCredit(vat.abs()); - remainingCredit = vat.abs(); - } - //if vat is negative it's a debit - if (vat.compareTo(BigDecimal.ZERO) > 0) { - vatReports.setAmountDue(vat.abs()); - payable = vat.abs(); - } - if (vatReports != null) { - vatReportsList.add(vatReports); - } } - - //commitTransaction(topiaTransaction); + catch(LimaException eee) { + System.out.println(eee); + } } - catch (TopiaException ex) { - doCatch(topiaTransaction, ex, log); - } - finally { - doFinally(topiaTransaction, log); - } - return vatReportsList; + return list; } @@ -657,4 +599,16 @@ return topiaTransaction; } + + protected void commitTransaction(TopiaContext topiaTransaction) throws TopiaException { + try { + topiaTransaction.commitTransaction(); + } catch (TopiaException eee) { + if (log.isErrorEnabled()) { + log.error("Error during commit context", eee); + } + throw eee; + } + } + } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2011-07-04 16:06:26 UTC (rev 3198) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2011-07-05 10:34:37 UTC (rev 3199) @@ -31,12 +31,12 @@ import javax.ejb.Remote; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.beans.VatReports; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FiscalPeriod; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; /** * Service de generation des rapports. @@ -104,6 +104,6 @@ /** * Generate VAT */ - List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException; + List<Object> generateVat(FiscalPeriod fiscalPeriod) throws LimaException, TopiaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-07-04 16:06:26 UTC (rev 3198) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-07-05 10:34:37 UTC (rev 3199) @@ -3,11 +3,10 @@ import java.awt.Color; import java.awt.Component; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.VatReports; +import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; @@ -54,13 +53,12 @@ @Override public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - VatReports vatReport = model.getElementAt(adapter.row); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM"); - int month = Integer.parseInt(simpleDateFormat.format( - vatReport.getPeriod().getBeginDate())); - // true if month is even - return ((month % 2)==0); - + Object object = model.getElementAt(adapter.row); + if (object instanceof FinancialPeriod) { + return true; + } else { + return false; + } } }; colorTransaction = Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-07-04 16:06:26 UTC (rev 3198) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-07-05 10:34:37 UTC (rev 3199) @@ -4,20 +4,27 @@ import java.text.SimpleDateFormat; import java.math.BigDecimal; -import java.util.Date; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.VatReports; +import org.chorem.lima.beans.BalanceTrial; +import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ReportServiceMonitorable; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.utils.EntryComparator; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; +import org.nuiton.topia.TopiaException; public class VatTableModel extends AbstractTableModel implements ServiceListener { @@ -35,8 +42,7 @@ protected FiscalPeriod selectedFiscalPeriod; /** data cache */ - protected List<VatReports> cacheDataList; - protected VatReports vatReportsCache; + protected List<Object> cacheDataList; public VatTableModel() { @@ -45,12 +51,34 @@ ReportServiceMonitorable.class); } - protected List<VatReports> getDataList() { - List<VatReports> results = null; + protected List<Object> getDataList() throws TopiaException { + List<Object> finalresults = new ArrayList<Object>(); if (selectedFiscalPeriod != null) { try { - results = reportService.generateVat(selectedFiscalPeriod); + List<Object> results = reportService.generateVat(selectedFiscalPeriod); + + for (int index=0; index<results.size(); index++) { + if (results.get(index) instanceof BalanceTrial) { + if (((BalanceTrial)results.get(index)).getReportsDatas() != null){ + for (ReportsDatas reportsDatas : ((BalanceTrial)results.get(index)).getReportsDatas()) { + //reports datas + finalresults.add(reportsDatas); + List<Entry> entries = (List<Entry>) reportsDatas.getListEntry(); + if (entries != null){ + Collections.sort(entries, new EntryComparator()); + for (Entry entry : entries) { + //entry + finalresults.add(entry); + } + } + } + } + } else { + //financial period + finalresults.add(results.get(index)); + } + } } catch (LimaException eee) { if (log.isErrorEnabled()) { @@ -59,12 +87,18 @@ ErrorHelper.showErrorDialog("Can't get VAT list", eee); } } - - return results; + return finalresults; } public void refresh(){ - cacheDataList = getDataList(); + try { + cacheDataList = getDataList(); + } catch (TopiaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get VAT list", eee); + } fireTableDataChanged(); } @@ -75,11 +109,26 @@ switch (column) { case 0: - result = Date.class; + result = String.class; break; - default: + case 1: + result = Account.class; + break; + case 2: + result = String.class; + break; + case 3: + result = String.class; + break; + case 4: result = BigDecimal.class; break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; } return result; @@ -94,26 +143,23 @@ result = _("lima.table.date"); //date break; case 1: - result = _("lima.table.collectedvat"); //tva collectee + result = "compte"; //tva collectee break; case 2: - result = _("lima.table.deductiblevat"); //tva deductible + result = "piece comptable"; //tva due break; case 3: - result = _("lima.table.vatdue"); //tva due + result = "description"; //credit de tva break; case 4: - result = _("lima.table.vatcredit"); //credit de tva + result = "debit"; //remboursemments break; case 5: - result = _("lima.table.repayments"); //remboursemments + result = "credit"; //credit restant break; case 6: - result = _("lima.table.remainingcredit"); //credit restant + result = "solde"; //tva a payer break; - case 7: - result = _("lima.table.vatpayable"); //tva a payer - break; } return result; @@ -132,55 +178,121 @@ @Override public int getColumnCount() { - return 8; + return 7; } - public VatReports getElementAt(int row){ - VatReports currentRow = (VatReports) cacheDataList.get(row); + public Object getElementAt(int row){ + Object currentRow = cacheDataList.get(row); return currentRow; } @Override public Object getValueAt(int row, int column) { Object result = null; - VatReports currentRow = (VatReports) cacheDataList.get(row); - //get entries for the period for the current row - - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); - - try { - switch (column) { + // just prevent too much result + if (cacheDataList != null) { + result = cacheDataList.get(row); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); + if (result instanceof FinancialPeriod) { + FinancialPeriod fp = (FinancialPeriod) result; + + switch (column) { case 0: - //result = currentRow.getDate(); //date - result = simpleDateFormat.format(currentRow.getPeriod().getBeginDate()) - + " - " + simpleDateFormat.format(currentRow.getPeriod().getEndDate()); + result = simpleDateFormat.format(fp.getBeginDate()) + + " - " + simpleDateFormat.format(fp.getEndDate()); break; case 1: - result = currentRow.getAmountCollected(); //tva collectee + result = null; break; case 2: - result = currentRow.getAmountDeductible(); //tva deductible + result = null; // voucher break; case 3: - result = currentRow.getAmountDue(); //tva due + result = null; // description break; case 4: - result = currentRow.getAmountCredit(); //credit de tva + result = null; // position break; case 5: - result = currentRow.getAmountRepayments(); //remboursemments + result = null; break; case 6: - result = currentRow.getAmountRemainingCredit(); //credit restant + result = null; break; - case 7: - result = currentRow.getAmountPayable(); //tva a payer + } + } + else if (result instanceof ReportsDatas) { + ReportsDatas currentRow = (ReportsDatas)result; + BigDecimal amountDebit = currentRow.getAmountDebit(); + BigDecimal amountCredit = currentRow.getAmountCredit(); + + switch (column) { + case 0: + result = null; // date break; + case 1: + if (currentRow.getAccount() != null){ + result = currentRow.getAccount().getAccountNumber() + + " - " + currentRow.getAccount().getLabel(); + } + else { + result = null; + } + break; + case 2: + result = null; // voucher + break; + case 3: + result = null; // description + break; + case 4: + result = amountDebit; // position + break; + case 5: + result = amountCredit; + break; + case 6: + result = amountDebit.subtract(amountCredit); + break; } + } + else if (result instanceof Entry) { + Entry currentRow = (Entry)result; + BigDecimal amountDebit = BigDecimal.ZERO, + amountCredit = BigDecimal.ZERO; + if (currentRow.getDebit()){ + amountDebit = currentRow.getAmount(); + } + else { + amountCredit = currentRow.getAmount(); + } + + switch (column) { + case 0: // date + result = simpleDateFormat. + format(currentRow.getFinancialTransaction().getTransactionDate()); + break; + case 1 : // account + result = null; + break; + case 2: // description + result = currentRow.getVoucher(); + break; + case 3: + result = currentRow.getDescription(); + break; + case 4: + result = amountDebit; + break; + case 5: + result = amountCredit; + break; + case 6: + result = amountDebit.subtract(amountCredit); + break; + } + } } - catch (Exception eee) { - log.debug("Can't get entries", eee); - } return result; }

1 0

r3198 - in trunk/lima-swing: . src/main/java/org/chorem/lima/ui src/main/java/org/chorem/lima/ui/fiscalperiod src/main/java/org/chorem/lima/ui/home src/main/java/org/chorem/lima/ui/opening
by vsalaun＠users.chorem.org 04 Jul '11

04 Jul '11

Author: vsalaun Date: 2011-07-04 18:06:26 +0200 (Mon, 04 Jul 2011) New Revision: 3198 Url: http://chorem.org/repositories/revision/lima/3198 Log: update packages and jaxx files Modified: trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/pom.xml 2011-07-04 16:06:26 UTC (rev 3198) @@ -67,7 +67,7 @@ <dependency> <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> + <artifactId>swingx-core</artifactId> </dependency>  <Table insets='0,0,0,0' opaque='false'> + <script> + <![CDATA[ + + import java.awt.Dimension; + + ]]> + </script> + + <String id="title" javaBean='null' /> <Boolean id="canClose" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-04 16:06:26 UTC (rev 3198) @@ -40,6 +40,12 @@ import java.net.URI; import org.chorem.lima.business.HttpServerServiceMonitorable; import org.chorem.lima.service.LimaServiceFactory; + import java.awt.Component; + import javax.swing.BoxLayout; + import javax.swing.border.EtchedBorder; + import javax.swing.ImageIcon; + import java.io.IOException; + import javax.swing.JButton; public LimaConfig getConfig() { return getContextValue(LimaConfig.class); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-07-04 16:06:26 UTC (rev 3198) @@ -33,6 +33,8 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.business.LimaException; import org.apache.commons.lang.time.DateUtils; + import java.util.Date; + import java.util.Calendar; import org.chorem.lima.entity.FiscalPeriodImpl; getRootPane().setDefaultButton(okButton); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2011-07-04 16:06:26 UTC (rev 3198) @@ -34,6 +34,9 @@ import static org.nuiton.i18n.I18n._; import java.awt.Color; import java.awt.Font; + import javax.swing.BoxLayout; + import javax.swing.border.EtchedBorder; + import javax.swing.ImageIcon; ]]> </script> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2011-07-04 16:06:26 UTC (rev 3198) @@ -30,6 +30,8 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.business.LimaException; import org.apache.commons.lang.time.DateUtils; + import java.util.Date; + import java.util.Calendar; protected FiscalPeriodServiceMonitorable fiscalPeriodService = LimaServiceFactory.getInstance().getService( 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 2011-07-04 16:06:24 UTC (rev 3197) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx 2011-07-04 16:06:26 UTC (rev 3198) @@ -29,6 +29,10 @@ <script> <![CDATA[ import javax.swing.BorderFactory; + import javax.swing.ImageIcon; + + + getRootPane().setDefaultButton(ok); protected void performNext() { dispose();

1 0