Author: echatellier Date: 2012-04-06 16:32:57 +0200 (Fri, 06 Apr 2012) New Revision: 3356 Url: http://chorem.org/repositories/revision/lima/3356 Log: Mise ?\195?\160 jour home view et opening. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodServiceLocal.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EntryBookListRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -100,10 +100,11 @@ } @Override - public void createFiscalPeriodWithTransaction(FiscalPeriod fiscalPeriod, + public FiscalPeriod createFiscalPeriodWithTransaction(FiscalPeriod fiscalPeriod, TopiaContext topiaContext) throws LimaException { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + FiscalPeriod result = null; try { @@ -127,12 +128,14 @@ LimaCallaoDAOHelper.getFiscalPeriodDAO(topiaContext); //create - fiscalPeriodDAO.create(fiscalPeriod); + result = fiscalPeriodDAO.create(fiscalPeriod); commitTransaction(topiaContext); } catch (TopiaException ex) { doCatch(topiaContext, ex); } + + return result; } /** @@ -140,17 +143,19 @@ * Check localized rules before create */ @Override - public void createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { + public FiscalPeriod createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { TopiaContext transaction = beginTransaction(rootContext); + FiscalPeriod result = null; try { - - createFiscalPeriodWithTransaction(fiscalPeriod, transaction); + result = createFiscalPeriodWithTransaction(fiscalPeriod, transaction); } catch (Exception ex) { doCatch(transaction, ex); } finally { doFinally(transaction); } + + return result; } /** return all fiscal period */ @@ -247,12 +252,13 @@ * check localized rules before block it */ @Override - public void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { + public FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { //open transaction for update TopiaContext transaction = beginTransaction(rootContext); AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + FiscalPeriod result = null; try { if (fiscalPeriod.getLocked()) { @@ -275,7 +281,7 @@ financialPeriod.setLocked(true); } - fiscalPeriodDAO.update(oldFiscalPeriod); + result = fiscalPeriodDAO.update(oldFiscalPeriod); commitTransaction(transaction); @@ -284,6 +290,8 @@ } finally { doFinally(transaction); } + + return result; } @Override Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -52,9 +52,9 @@ FiscalPeriod getLastFiscalPeriod() throws LimaException; - void createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; + FiscalPeriod createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; - void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; + FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; void addRetainedEarnings(FiscalPeriod fiscalPeriod, boolean newyear, Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodServiceLocal.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodServiceLocal.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -43,7 +43,7 @@ @Local public interface FiscalPeriodServiceLocal extends FiscalPeriodService { - void createFiscalPeriodWithTransaction(FiscalPeriod fiscalPeriod, + FiscalPeriod createFiscalPeriodWithTransaction(FiscalPeriod fiscalPeriod, TopiaContext topiaContext) throws LimaException; 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 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -56,6 +56,8 @@ import org.chorem.lima.ui.vatchart.VatChartView; import org.chorem.lima.ui.vatreports.VatReportView; import org.chorem.lima.util.ErrorHelper; +import org.nuiton.profiling.NuitonTrace; +import org.nuiton.util.DesktopUtil; import javax.swing.JButton; import javax.swing.JTabbedPane; @@ -185,40 +187,19 @@ helper.displayUI(ui, false); } -// public void showHelp(JAXXContext context, String helpId) { -// -// } -// -// public void closeHelp(JAXXContext context) { -// -// } - public void gotoSite(JAXXContext context) { LimaConfig config = getUI(context).getConfig(); URL siteURL = config.getOptionAsURL("application.site.url"); - String url = siteURL.toString(); try { - SwingUtil.openLink(url); + DesktopUtil.browse(siteURL.toURI()); } catch (Exception e) { - ErrorHelper.showErrorDialog("Can't open lima website at " + url, e); + ErrorHelper.showErrorDialog("Can't open lima website at " + siteURL, e); } -// log.info("goto " + siteURL); -// if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { -// try { -// Desktop.getDesktop().browse(siteURL.toURI()); -// } catch (Exception ex) { -// if (log.isErrorEnabled()) { -// log.error("Can't open lima website", ex); -// } -// ErrorHelper.showErrorDialog("Can't open lima website", ex); -// } -// } } public void showAbout(JAXXContext context) { - MainView ui = getUI(context); AboutPanel about = new AboutPanel(); about.setTitle(_("lima.title.about")); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EntryBookListRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EntryBookListRenderer.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EntryBookListRenderer.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -55,8 +55,7 @@ if (entryBook != null) { newValue = entryBook.getCode() + " - " + entryBook.getLabel(); } - return super.getListCellRendererComponent(list, value, index, isSelected, + return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus); } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -39,8 +39,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.swing.table.TableModel; - /** * Fiscal period table add support for JXTable. * Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -0,0 +1,64 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.ui.home; + +import java.awt.Color; + +import javax.swing.JEditorPane; +import javax.swing.event.HyperlinkListener; +import javax.swing.plaf.basic.BasicEditorPaneUI; + +/** + * Common code for all home page panel. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public abstract class AbstractHomePane extends JEditorPane implements HyperlinkListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = -7820679841428370136L; + + protected static final Color RED_BACKGROUND = new Color(0xff, 0xee, 0xee); + + protected static final Color GREEN_BACKGROUND = new Color(0xee, 0xff, 0xee); + + protected HomeView view; + + protected AbstractHomePane(HomeView view) { + this.view = view; + + //init + setOpaque(true); + setContentType("text/html"); + setEditable(false); + setUI(new BasicEditorPaneUI()); + addHyperlinkListener(this); + } +} Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -25,6 +25,10 @@ package org.chorem.lima.ui.home; +import static org.nuiton.i18n.I18n._; + +import javax.swing.event.HyperlinkEvent; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; @@ -32,57 +36,39 @@ import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.monitorable.AccountServiceMonitorable; import org.chorem.lima.business.monitorable.ImportServiceMonitorable; -import org.chorem.lima.entity.Account; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.plaf.basic.BasicEditorPaneUI; -import java.awt.Color; -import java.util.List; +/** + * Home view pane that display account plan statistics. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class AccountsPane extends AbstractHomePane implements ServiceListener { -import static org.nuiton.i18n.I18n._; - -public class AccountsPane extends JEditorPane implements HyperlinkListener, ServiceListener { - private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(AccountsPane.class); - protected HomeView view; - protected AccountServiceMonitorable accountService; - private static Color redBackground = new Color(0xff, 0xee, 0xee); - - private static Color greenBackground = new Color(0xee, 0xff, 0xee); - - public AccountsPane(HomeView view) { - this.view = view; - accountService = - LimaServiceFactory.getService( - AccountServiceMonitorable.class); - LimaServiceFactory.addServiceListener( - AccountServiceMonitorable.class, this); - LimaServiceFactory.addServiceListener( - ImportServiceMonitorable.class, this); + super(view); - //init - setOpaque(true); - setContentType("text/html"); - setEditable(false); - setUI(new BasicEditorPaneUI()); - addHyperlinkListener(this); + accountService = LimaServiceFactory.getService(AccountServiceMonitorable.class); + LimaServiceFactory.addServiceListener(AccountServiceMonitorable.class, this); + LimaServiceFactory.addServiceListener(ImportServiceMonitorable.class, this); + refresh(); } @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { - if (e.getDescription().equals("#accountschart")) { MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showAccountView(ui); @@ -100,23 +86,25 @@ long accountCount = accountService.getAccountCount(); if (accountCount > 0) { - setBackground(greenBackground); - String accountsString = _("lima.home.chartaccounts.state1_2") + " " - + accountCount + " " + _("lima.home.chartaccounts.state2_2") + setBackground(GREEN_BACKGROUND); + String accountsString = _("lima.ui.home.chartaccounts.state1_2") + " " + + accountCount + " " + _("lima.ui.home.chartaccounts.state2_2") + "<br/><br/><a href='#accountschart'>" - + _("lima.home.chartaccounts.modify") + "</a>"; + + _("lima.ui.home.chartaccounts.modify") + "</a>"; //set Text setText(htmlBegin + accountsString + htmlEnd); } else { - setBackground(redBackground); - String accountsString = _("lima.home.chartaccounts.nothing") + setBackground(RED_BACKGROUND); + String accountsString = _("lima.ui.home.chartaccounts.nothing") + "<br/><br/><a href='#accountschart'>" - + _("lima.home.chartaccounts.create") + "</a>"; + + _("lima.ui.home.chartaccounts.create") + "</a>"; //set Text setText(htmlBegin + accountsString + htmlEnd); } - } catch (LimaException eee) { - log.debug("Can't get datas account editor pane home", eee); + } catch (LimaException ex) { + if (log.isErrorEnabled()) { + log.error("Can't get datas account editor pane home", ex); + } } } @@ -126,5 +114,4 @@ refresh(); } } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -25,6 +25,12 @@ package org.chorem.lima.ui.home; +import static org.nuiton.i18n.I18n._; + +import java.util.List; + +import javax.swing.event.HyperlinkEvent; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; @@ -37,52 +43,36 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.plaf.basic.BasicEditorPaneUI; -import java.awt.Color; -import java.util.List; +/** + * Home view pane that display entry books statistics. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class EntryBooksPane extends AbstractHomePane implements ServiceListener { -import static org.nuiton.i18n.I18n._; - -public class EntryBooksPane extends JEditorPane implements HyperlinkListener, ServiceListener { - private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(EntryBooksPane.class); - protected HomeView view; - protected EntryBookService entryBookService; - private static Color redBackground = new Color(0xff, 0xee, 0xee); - - private static Color greenBackground = new Color(0xee, 0xff, 0xee); - public EntryBooksPane(HomeView view) { - this.view = view; + super(view); - entryBookService = - LimaServiceFactory.getService( - EntryBookServiceMonitorable.class); - LimaServiceFactory.addServiceListener(entryBookService, this); + entryBookService = LimaServiceFactory.getService(EntryBookServiceMonitorable.class); + LimaServiceFactory.addServiceListener(EntryBookServiceMonitorable.class, this); LimaServiceFactory.addServiceListener(ImportServiceMonitorable.class, this); - //init - setOpaque(true); - setContentType("text/html"); - setEditable(false); - setUI(new BasicEditorPaneUI()); - addHyperlinkListener(this); refresh(); } @Override public void hyperlinkUpdate(HyperlinkEvent e) { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { - if (e.getDescription().equals("#entrybookschart")) { MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showEntryBookView(ui); @@ -101,18 +91,18 @@ List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); int ebSize = entryBooks.size(); if (ebSize > 0) { - setBackground(greenBackground); + setBackground(GREEN_BACKGROUND); String entryBooksString; if (ebSize == 1) { - entryBooksString = _("lima.home.entrybooks.state.single") + entryBooksString = _("lima.ui.home.entrybooks.state.single") + "<br/>" + entryBooks.get(0).getLabel() + "<br/><br/><a href='#entrybookschart'>" - + _("lima.home.entrybooks.modify") + "</a>"; + + _("lima.ui.home.entrybooks.modify") + "</a>"; } else { - entryBooksString = _("lima.home.entrybooks.state1_2.plural") + entryBooksString = _("lima.ui.home.entrybooks.state1_2.plural") + " " + entryBooks.size() + " " - + _("lima.home.entrybooks.state2_2.plural") + "<ul>"; + + _("lima.ui.home.entrybooks.state2_2.plural") + "<ul>"; for (int i = 0; i < ebSize && i < 3; i++) { // for (EntryBook entryBook : entryBooks) { EntryBook entryBook = entryBooks.get(i); @@ -124,17 +114,17 @@ } entryBooksString += "</ul></p><p horizontal-align:'center'>" + "<a href='#entrybookschart'>" - + _("lima.home.entrybooks.modify") + "</a>"; + + _("lima.ui.home.entrybooks.modify") + "</a>"; } //set Text setText(htmlBegin + entryBooksString + htmlEnd); } else { - setBackground(redBackground); + setBackground(RED_BACKGROUND); //set Text setText(htmlBegin - + _("lima.home.entrybooks.nothing") + + _("lima.ui.home.entrybooks.nothing") + "<br/><br/><a href='#entrybookschart'>" - + _("lima.home.entrybooks.create") + "</a>" + htmlEnd); + + _("lima.ui.home.entrybooks.create") + "</a>" + htmlEnd); } } catch (LimaException eee) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -25,6 +25,12 @@ package org.chorem.lima.ui.home; +import static org.nuiton.i18n.I18n._; + +import java.util.List; + +import javax.swing.event.HyperlinkEvent; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; @@ -40,48 +46,34 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.plaf.basic.BasicEditorPaneUI; -import java.awt.Color; -import java.util.List; +/** + * Home view pane that display statistics about unbalanced transactions. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionsPane extends AbstractHomePane implements ServiceListener { -import static org.nuiton.i18n.I18n._; - -public class FinancialTransactionsPane extends JEditorPane implements HyperlinkListener, ServiceListener { - private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(FinancialTransactionsPane.class); - protected HomeView view; - protected FinancialTransactionService financialTransactionService; protected FiscalPeriodService fiscalPeriodService; - private static Color redBackground = new Color(0xff, 0xee, 0xee); - - private static Color greenBackground = new Color(0xee, 0xff, 0xee); - public FinancialTransactionsPane(HomeView view) { - this.view = view; + super(view); - financialTransactionService = - LimaServiceFactory.getService(FinancialTransactionServiceMonitorable.class); - LimaServiceFactory.addServiceListener(financialTransactionService, this); - fiscalPeriodService = - LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); - LimaServiceFactory.addServiceListener(fiscalPeriodService, this); + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionServiceMonitorable.class); + fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); + LimaServiceFactory.addServiceListener(FinancialTransactionServiceMonitorable.class, this); + LimaServiceFactory.addServiceListener(FiscalPeriodServiceMonitorable.class, this); LimaServiceFactory.addServiceListener(ImportServiceMonitorable.class, this); - //init - setOpaque(true); - setContentType("text/html"); - setEditable(false); - setUI(new BasicEditorPaneUI()); - addHyperlinkListener(this); refresh(); } @@ -114,11 +106,11 @@ financialTransactionService. getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); if (financialTransactionsUnbal.size() > 0) { - setBackground(redBackground); + setBackground(RED_BACKGROUND); String transactionsString = financialTransactionsUnbal.size() - + " " + _("lima.home.transaction.unbalanced") + + " " + _("lima.ui.home.transaction.unbalanced") + "<br/><br/><a href='#financialtransactionunbalanced'>" - + _("lima.home.transaction.modifiy.unbalanced") + "</a>"; + + _("lima.ui.home.transaction.modifiy.unbalanced") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { @@ -126,25 +118,25 @@ financialTransactionService.getAllFinancialTransactionsBalanced(unblockedFiscalPeriods.get(0)); if (financialTransactionsBal.size() > 0) { - setBackground(greenBackground); + setBackground(GREEN_BACKGROUND); String transactionsString = financialTransactionsBal.size() - + " " + _("lima.home.transaction.balanced") + + " " + _("lima.ui.home.transaction.balanced") + "<br/><br/><a href='#financialtransactionbalanced'>" - + _("lima.home.transaction.modifiy.balanced") + "</a>"; + + _("lima.ui.home.transaction.modifiy.balanced") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { - setBackground(redBackground); - String transactionsString = _("lima.home.transaction.nothing") + setBackground(RED_BACKGROUND); + String transactionsString = _("lima.ui.home.transaction.nothing") + "<br/><br/><a href='#financialtransactionbalanced'>" - + _("lima.home.transaction.create") + "</a>"; + + _("lima.ui.home.transaction.create") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } } } else { - setBackground(redBackground); + setBackground(RED_BACKGROUND); } } catch (LimaException eee) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -25,6 +25,12 @@ package org.chorem.lima.ui.home; +import static org.nuiton.i18n.I18n._; + +import java.util.List; + +import javax.swing.event.HyperlinkEvent; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; @@ -37,50 +43,42 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.plaf.basic.BasicEditorPaneUI; -import java.awt.Color; -import java.util.List; +/** + * Panenl de la home view de lima qui affiche les statistiques de + * l'exercice en cours. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FiscalPeriodsPane extends AbstractHomePane implements ServiceListener { -import static org.nuiton.i18n.I18n._; - -public class FiscalPeriodsPane extends JEditorPane implements HyperlinkListener, ServiceListener { - private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(FiscalPeriodsPane.class); - protected HomeView view; - protected FiscalPeriodService fiscalPeriodService; - private static Color redBackground = new Color(0xff, 0xee, 0xee); - - private static Color greenBackground = new Color(0xee, 0xff, 0xee); - + /** + * Constructors (init services). + * + * @param view home view + */ public FiscalPeriodsPane(HomeView view) { - this.view = view; + super(view); - fiscalPeriodService = - LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); - LimaServiceFactory.addServiceListener(fiscalPeriodService, this); + fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); + LimaServiceFactory.addServiceListener(FiscalPeriodServiceMonitorable.class, this); LimaServiceFactory.addServiceListener(ImportServiceMonitorable.class, this); - //init - setOpaque(true); - setContentType("text/html"); - setEditable(false); - setUI(new BasicEditorPaneUI()); - addHyperlinkListener(this); refresh(); } @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { - if (e.getDescription().equals("#fiscalperiodschart")) { MainView ui = LimaContext.MAIN_UI_ENTRY_DEF.getContextValue(view); ui.getHandler().showFiscalPeriodView(ui); @@ -102,26 +100,26 @@ List<FiscalPeriod> unblockedFiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); if (unblockedFiscalPeriods.size() > 0) { - setBackground(greenBackground); + setBackground(GREEN_BACKGROUND); String fiscalString = unblockedFiscalPeriods.size() + " " - + _("lima.home.fiscalperiod.opened") + "<br/>" + + _("lima.ui.home.fiscalperiod.opened") + "<br/>" + (fiscalPeriods.size() - unblockedFiscalPeriods.size()) - + " " + _("lima.home.fiscalperiod.closed") + + " " + _("lima.ui.home.fiscalperiod.closed") + "<br/><br/><a href='#fiscalperiodschart'>" - + _("lima.home.fiscalperiod.modify") + "</a>"; + + _("lima.ui.home.fiscalperiod.modify") + "</a>"; //set Text setText(htmlBegin + fiscalString + htmlEnd); } else { - setBackground(redBackground); - String fiscalString = _("lima.home.fiscalperiod.noopen"); + setBackground(RED_BACKGROUND); + String fiscalString = _("lima.ui.home.fiscalperiod.noopen"); if (fiscalPeriods.size() > 0) { fiscalString += "<br/>" + fiscalPeriods.size() + " " - + _("lima.home.fiscalperiod.closed"); + + _("lima.ui.home.fiscalperiod.closed"); } fiscalString += "<br/><br/><a href='#fiscalperiodschart'>" - + _("lima.home.fiscalperiod.create") + "</a>"; + + _("lima.ui.home.fiscalperiod.create") + "</a>"; //set Text setText(htmlBegin + fiscalString + htmlEnd); 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 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - <Table> <import> java.awt.Color @@ -38,8 +37,7 @@ <row> <cell anchor="southeast"> - <JPanel - id='accountPanel' + <JPanel id='accountPanel' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' minimumSize='{getMiniSize()}' preferredSize='{getFixedSize()}' @@ -47,27 +45,24 @@ <Table> <row> <cell weightx="0" weighty="0.1" anchor="northwest"> - <JLabel - icon='accounts.png'/> + <JLabel icon='accounts.png'/> </cell> <cell weightx="1" weighty="0.1" anchor="center"> <JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' - text='lima.charts.account'/> + text='lima.ui.home.account'/> </cell> </row> <row fill="both"> <cell columns="2" weightx="1" weighty="0.9"> - <JEditorPane - javaBean='new AccountsPane(this)'/> + <JEditorPane initializer='new AccountsPane(this)'/> </cell> </row> </Table> </JPanel> </cell> <cell anchor="southwest"> - <JPanel - id='entryBookPanel' + <JPanel id='entryBookPanel' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' minimumSize='{getMiniSize()}' preferredSize='{getFixedSize()}' @@ -75,19 +70,17 @@ <Table> <row> <cell weightx="0" weighty="0.1" anchor="northwest"> - <JLabel - icon='entrybooks.png'/> + <JLabel icon='entrybooks.png'/> </cell> <cell weightx="1" weighty="0.1" anchor="center"> <JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' - text='lima.common.entrybooks'/> + text='lima.ui.home.entrybooks'/> </cell> </row> <row fill="both"> <cell columns="2" weightx="1" weighty="0.9"> - <JEditorPane - javaBean='new EntryBooksPane(this)'/> + <JEditorPane initializer='new EntryBooksPane(this)'/> </cell> </row> </Table> @@ -96,8 +89,7 @@ </row> <row> <cell anchor="northeast"> - <JPanel - id='fiscalPeriodPanel' + <JPanel id='fiscalPeriodPanel' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' minimumSize='{getMiniSize()}' preferredSize='{getFixedSize()}' @@ -105,27 +97,24 @@ <Table> <row> <cell weightx="0" weighty="0.1" anchor="northwest"> - <JLabel - icon='fiscalperiods.png'/> + <JLabel icon='fiscalperiods.png'/> </cell> <cell weightx="1" weighty="0.1" anchor="center"> <JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' - text='lima.charts.fiscalyear'/> + text='lima.ui.home.fiscalyear'/> </cell> </row> <row fill="both"> <cell columns="2" weightx="1" weighty="0.9"> - <JEditorPane - javaBean='new FiscalPeriodsPane(this)'/> + <JEditorPane initializer='new FiscalPeriodsPane(this)'/> </cell> </row> </Table> </JPanel> </cell> <cell anchor="northwest"> - <JPanel - id='financialTransactionPanel' + <JPanel id='financialTransactionPanel' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' minimumSize='{getMiniSize()}' preferredSize='{getFixedSize()}' @@ -133,13 +122,12 @@ <Table> <row> <cell weightx="0" weighty="0.1" anchor="northwest"> - <JLabel - icon='entries.png'/> + <JLabel icon='entries.png'/> </cell> <cell weightx="1" weighty="0.1" anchor="center"> <JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' - text='lima.daily'/> + text='lima.ui.home.daily'/> </cell> </row> <row fill="both"> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -0,0 +1,29 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Contient l'onglet d'acceuil de lima avec les statistiques de la + * comptabilite. + */ +package org.chorem.lima.ui.home; Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,14 +22,12 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - <JPanel> <import> - jaxx.runtime.swing.JAXXButtonGroup org.chorem.lima.enums.AccountsChartEnum </import> - <JAXXButtonGroup id="radioButtons"/> + <javax.swing.ButtonGroup id="buttonGroup"/> <Table> <row> @@ -41,7 +39,7 @@ <cell> <JRadioButton text='lima.charts.account.shortened' value='{AccountsChartEnum.SHORTENED}' - buttonGroup="{getRadioButtons()}" + buttonGroup="{buttonGroup}" selected='true'/> </cell> </row> @@ -49,33 +47,29 @@ <cell> <JRadioButton text='lima.charts.account.base' value='{AccountsChartEnum.BASE}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + buttonGroup="{buttonGroup}"/> </cell> </row> <row> <cell> <JRadioButton text='lima.charts.account.developed' value='{AccountsChartEnum.DEVELOPED}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + buttonGroup="{buttonGroup}"/> </cell> </row> <row> <cell> <JRadioButton text='lima.importexport.importcsv' value='{AccountsChartEnum.IMPORT}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + buttonGroup="{buttonGroup}"/> </cell> </row> <row> <cell> <JRadioButton text='lima.importexport.importebp' value='{AccountsChartEnum.IMPORTEBP}' - buttonGroup="{getRadioButtons()}" - selected='true'/> + buttonGroup="{buttonGroup}"/> </cell> </row> </Table> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - <JPanel> <Table> <row> @@ -37,4 +36,4 @@ </cell> </row> </Table> -</JPanel> \ No newline at end of file +</JPanel> 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 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -90,4 +90,4 @@ </cell> </row> </Table> -</JPanel> \ No newline at end of file +</JPanel> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - <JPanel> <import> javax.swing.text.Document @@ -30,14 +29,9 @@ org.chorem.lima.ui.identity.IdentityHandler </import> - <IdentityHandler id="handler" - javaBean="new org.chorem.lima.ui.identity.IdentityHandler()"/> + <IdentityHandler id="handler" javaBean="new IdentityHandler()"/> <Identity id="identity" javaBean='handler.getIdentity()'/> - <script> - <![CDATA[ - ]]> - </script> <Table> <row> <cell fill="horizontal"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx 2012-04-06 14:32:57 UTC (rev 3356) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -111,7 +111,7 @@ break; case 2: - Object value = caPanel.getRadioButtons().getSelectedValue(); + Object value = caPanel.getButtonGroup().getSelectedValue(); // if action confirmed if (value != null) { AccountsChartEnum defaultAccountsChartEnum = Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java 2012-04-06 14:32:57 UTC (rev 3356) @@ -0,0 +1,30 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Contient l'assisant d'importation de comptabilité + * au premier lancement de lima. + * Creation d'identité, etc... + */ +package org.chorem.lima.ui.opening; Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-04-06 14:32:57 UTC (rev 3356) @@ -305,6 +305,32 @@ lima.ui.fiscalperiod.closure= lima.ui.fiscalperiod.fiscalperiod= lima.ui.fiscalperiod.open= +lima.ui.home.account= +lima.ui.home.chartaccounts.create= +lima.ui.home.chartaccounts.modify= +lima.ui.home.chartaccounts.nothing= +lima.ui.home.chartaccounts.state1_2= +lima.ui.home.chartaccounts.state2_2= +lima.ui.home.daily= +lima.ui.home.entrybooks= +lima.ui.home.entrybooks.create= +lima.ui.home.entrybooks.modify= +lima.ui.home.entrybooks.nothing= +lima.ui.home.entrybooks.state.single= +lima.ui.home.entrybooks.state1_2.plural= +lima.ui.home.entrybooks.state2_2.plural= +lima.ui.home.fiscalperiod.closed= +lima.ui.home.fiscalperiod.create= +lima.ui.home.fiscalperiod.modify= +lima.ui.home.fiscalperiod.noopen= +lima.ui.home.fiscalperiod.opened= +lima.ui.home.fiscalyear= +lima.ui.home.transaction.balanced= +lima.ui.home.transaction.create= +lima.ui.home.transaction.modifiy.balanced= +lima.ui.home.transaction.modifiy.unbalanced= +lima.ui.home.transaction.nothing= +lima.ui.home.transaction.unbalanced= lima.ui.importexport.importcsv= lima.ui.importexport.importebp= lima.vatreport.listerror=Can't get entries list Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-04-06 10:07:48 UTC (rev 3355) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-04-06 14:32:57 UTC (rev 3356) @@ -149,28 +149,8 @@ lima.fiscalperiod.creationerror=Erreur lors de la création de la période fiscale lima.fiscalperiod.listerror=Erreur lors de la récupération des données de la liste lima.fiscalperiod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées -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.home.chartaccounts.state2_2= +lima.home.entrybooks.create= lima.identity=Identité lima.identity.address=Adresse lima.identity.address2=Adresse (suite) @@ -304,6 +284,32 @@ lima.ui.fiscalperiod.closure=Cloture lima.ui.fiscalperiod.fiscalperiod=Exercice lima.ui.fiscalperiod.open=Ouvert +lima.ui.home.account=Plan comptable +lima.ui.home.chartaccounts.create=Créer le plan des comptes +lima.ui.home.chartaccounts.modify=Modifier le plan des comptes +lima.ui.home.chartaccounts.nothing=Aucun compte \! +lima.ui.home.chartaccounts.state1_2=Le plan comptable possede +lima.ui.home.chartaccounts.state2_2=comptes +lima.ui.home.daily=Quotidien +lima.ui.home.entrybooks=Journaux +lima.ui.home.entrybooks.create=Créer les journaux +lima.ui.home.entrybooks.modify=Modifier les journaux +lima.ui.home.entrybooks.nothing=Aucun journal ouvert \! +lima.ui.home.entrybooks.state.single=Le journal est \: +lima.ui.home.entrybooks.state1_2.plural=Les +lima.ui.home.entrybooks.state2_2.plural=journaux sont \: +lima.ui.home.fiscalperiod.closed=exercices cloturés +lima.ui.home.fiscalperiod.create=Créer un exercice +lima.ui.home.fiscalperiod.modify=Modifier les exercices +lima.ui.home.fiscalperiod.noopen=Aucun exercice ouvert \! +lima.ui.home.fiscalperiod.opened=exercices ouverts +lima.ui.home.fiscalyear=Exercices +lima.ui.home.transaction.balanced=transactions, toutes sont équilibrées +lima.ui.home.transaction.create=Ajouter des écritures +lima.ui.home.transaction.modifiy.balanced=Modifier les écritures +lima.ui.home.transaction.modifiy.unbalanced=Modifier les écritures incorrectes +lima.ui.home.transaction.nothing=Aucune écriture +lima.ui.home.transaction.unbalanced=transactions ne sont pas équilibrées \! lima.ui.importexport.importcsv=Import/Export CSV lima.ui.importexport.importebp=Import/Export EBP lima.vatreport.listerror=Erreur lors de la récupération des données de la liste