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

r3424 - trunk/lima-callao/src/main/xmi
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 16:12:34 +0200 (Tue, 15 May 2012) New Revision: 3424 Url: http://chorem.org/repositories/revision/lima/3424 Log: Fix another lazy exception Modified: trunk/lima-callao/src/main/xmi/accounting.properties Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 13:02:06 UTC (rev 3423) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 14:12:34 UTC (rev 3424) @@ -48,6 +48,7 @@ # lazy org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false +org.chorem.lima.entity.Entry.attribute.financialTransaction.tagvalue.lazy=false org.chorem.lima.entity.FinancialTransaction.attribute.entry.tagvalue.lazy=false org.chorem.lima.entity.FinancialTransaction.attribute.entryBook.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.subFinancialStatements.tagvalue.lazy=false

1 0

r3423 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 15:02:06 +0200 (Tue, 15 May 2012) New Revision: 3423 Url: http://chorem.org/repositories/revision/lima/3423 Log: Autorisation de la modification du journal. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-05-15 12:48:56 UTC (rev 3422) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-05-15 13:02:06 UTC (rev 3423) @@ -310,7 +310,12 @@ currentFinancialTransaction.setTransactionDate((Date) value); break; case 1: - if (currentFinancialTransaction.getEntry() != null) { + // FIXME echatellier 20120515 je ne comprend pas pourquoi + // il n'est pas possible de changer le journal si la transaction + // a des entrées + // update : autorisation si le journal est null au moins + if (currentFinancialTransaction.getEntry() != null + && currentFinancialTransaction.getEntryBook() != null) { // not authorized to change the value return; } @@ -410,7 +415,11 @@ // FIXME echatellier 20120413 une modification des dates fait que l'ordre // devient faux int trIndex = indexOf(currentFinancialTransaction); - fireTableRowsUpdated(trIndex, trIndex + currentFinancialTransaction.getEntry().size()); + int endIndex = trIndex; + if (currentFinancialTransaction.getEntry() != null) { + endIndex += currentFinancialTransaction.getEntry().size(); + } + fireTableRowsUpdated(trIndex, endIndex); } catch (LimaException ex) { throw new LimaRuntimeException("Can't propagate data modification to service", ex);

1 0

r3422 - in trunk/lima-business/src/main: java/org/chorem/lima/business resources
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 14:48:56 +0200 (Tue, 15 May 2012) New Revision: 3422 Url: http://chorem.org/repositories/revision/lima/3422 Log: fixes #408 : Modify hibernate database creation mecanism Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/resources/lima.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2012-05-15 09:53:13 UTC (rev 3421) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2012-05-15 12:48:56 UTC (rev 3422) @@ -36,8 +36,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaXAResource; +import org.chorem.lima.entity.AccountImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaUtil; /** * Interceptor for topia context transaction. @@ -83,6 +86,8 @@ TopiaContext rootContext = TopiaContextFactory.getContext(config.getFlatOptions()); TopiaContext tx = rootContext.beginTransaction(); + createShemaIfNeeded(tx); + LimaDaoHelper helper = new LimaDaoHelper(tx); DAO_HELPER.set(helper); @@ -107,4 +112,28 @@ return result; } + + protected static boolean schemaExistChecked = false; + + /** + * Test if schema do not already exists and create it if not found. + * + * @param tx transaction + * @throws TopiaException + */ + protected void createShemaIfNeeded(TopiaContext tx) throws TopiaException { + + if (!schemaExistChecked) { + boolean exist = TopiaUtil.isSchemaExist(tx, AccountImpl.class.getName()); + if (!exist) { + + if (log.isInfoEnabled()) { + log.info("Creating to schema in database"); + } + tx.createSchema(); + } + + schemaExistChecked = true; + } + } } Modified: trunk/lima-business/src/main/resources/lima.properties =================================================================== --- trunk/lima-business/src/main/resources/lima.properties 2012-05-15 09:53:13 UTC (rev 3421) +++ trunk/lima-business/src/main/resources/lima.properties 2012-05-15 12:48:56 UTC (rev 3422) @@ -23,11 +23,6 @@ # #L% ### -# Proprietes par defaut pour une base de donnees de type H2 -# FIXME echatellier remove this (currently active only for test, and creation) -hibernate.hbm2ddl.auto=update -#hibernate.show_sql=true - hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password=

1 0

r3421 - in trunk: lima-business/src/main/java/org/chorem/lima/business/migration lima-callao/src/main/xmi
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 11:53:13 +0200 (Tue, 15 May 2012) New Revision: 3421 Url: http://chorem.org/repositories/revision/lima/3421 Log: Correction migration : h2 index on clob Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java trunk/lima-callao/src/main/xmi/accounting.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2012-05-15 08:53:50 UTC (rev 3420) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2012-05-15 09:53:13 UTC (rev 3421) @@ -60,25 +60,26 @@ log.info("Migrates to version 0.6"); } - // delete computed fields - queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTDEBIT"); - queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTCREDIT"); + // migration from h2 to 1.3.166 not supporting index on clob + queries.add("Alter table account alter column accountnumber varchar"); - // model refactoring - queries.add("drop table record"); - + // add new columns queries.add("alter table account drop column masteraccount"); queries.add("alter table account drop column generalledger"); - + queries.add("alter table entry add column lettering varchar(30)"); queries.add("alter table financialtransaction drop column financialperiod"); - queries.add("alter table entry add column lettering varchar(30)"); + // perform some migration queries.add("update entry e set lettering = (select l.code from Letter l where l.topiaid = e.letter)"); + + // delete non necessary fields + queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTDEBIT"); + queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTCREDIT"); + queries.add("alter table vatstatement drop column amount"); queries.add("alter table entry drop column letter"); + + // delete tables + queries.add("drop table record"); queries.add("drop table letter"); - - queries.add("alter table vatstatement drop column amount"); - - } } Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 08:53:50 UTC (rev 3420) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 09:53:13 UTC (rev 3421) @@ -49,7 +49,7 @@ # lazy org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false org.chorem.lima.entity.FinancialTransaction.attribute.entry.tagvalue.lazy=false -org.chorem.lima.entity.FinancialTransaction.attribute.entrybook.tagvalue.lazy=false +org.chorem.lima.entity.FinancialTransaction.attribute.entryBook.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.subFinancialStatements.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.masterFinancialStatement.tagvalue.lazy=false org.chorem.lima.entity.VatStatement.attribute.subVatStatements.tagvalue.lazy=false

1 0

r3420 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:53:50 +0200 (Tue, 15 May 2012) New Revision: 3420 Url: http://chorem.org/repositories/revision/lima/3420 Log: Fix model fire bounds Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-05-15 08:53:16 UTC (rev 3419) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-05-15 08:53:50 UTC (rev 3420) @@ -410,7 +410,7 @@ // FIXME echatellier 20120413 une modification des dates fait que l'ordre // devient faux int trIndex = indexOf(currentFinancialTransaction); - fireTableRowsUpdated(trIndex, trIndex + currentFinancialTransaction.getEntry().size() - 1); + fireTableRowsUpdated(trIndex, trIndex + currentFinancialTransaction.getEntry().size()); } catch (LimaException ex) { throw new LimaRuntimeException("Can't propagate data modification to service", ex);

1 0

r3419 - in trunk: lima-business/src/main/resources/i18n lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/entrybook lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart lima-swing/src/main/java/org/chorem/lima/ui/opening lima-swing/src/main/java/org/chorem/lima/ui/vatchart lima-swing/src/main/resources/i18n
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:53:16 +0200 (Tue, 15 May 2012) New Revision: 3419 Url: http://chorem.org/repositories/revision/lima/3419 Log: Clean i18n files Modified: 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-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 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/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-05-15 08:53:16 UTC (rev 3419) @@ -3,11 +3,7 @@ lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Can't update financialtransaction \: the new financialperiod of this entrybook is closed lima-Business.defaultaccountingrules.updatenewentryerror=Can't update entry \: financialperiod of this entrybook is closed lima-business.account.accountalreardyexist=An account already exists with this number \: %s -lima-business.common.close.transactionerror=Can't close transaction \: %s -lima-business.common.commit.transactionerror=Can't commit a transaction \: %s lima-business.common.failed=FAILED \: %s \n -lima-business.common.open.transactionerror=Can't open a transaction \: %s -lima-business.common.queryerror=Exception during query \: %s lima-business.defaultaccountingrules.allentrybookclosed=All EntryBook of this financialperiod are closed lima-business.defaultaccountingrules.blockerrorequillibrate=Can't block financialperiod/entrybook contain financialtransaction not equilibrate lima-business.defaultaccountingrules.dateaftererror=The date is after the fiscal period @@ -21,7 +17,6 @@ lima-business.defaultaccountingrules.invalidaccountnumber=Invalid Account Number \: %d lima-business.defaultaccountingrules.missingelements=Can't block financialperiod / missing elements in transactions for this FinancialPeriod/EntryBook lima-business.defaultaccountingrules.missingentrybook=Can't block financialperiod / missing EntryBook in transactions -lima-business.defaultaccountingrules.subledgererror=Subledger must create on a account whithout subaccount lima-business.document.accountnumber=Account N° lima-business.document.amounts=Amounts lima-business.document.balance=Balance @@ -64,16 +59,13 @@ lima-business.fiscalperiod.fiscalperiodalreadyblocked=Fiscal Period already blocked lima-business.fiscalperiod.newfinancialperioderror=Can't set financial period on the following fiscal year lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=The last financial period from the fiscal period is blocked -lima-business.franceaccountingrules.accountnumbernotmaster=Account Number not begin with the number account master \: %d lima-business.franceaccountingrules.accountnumbernotnumeric=Account Number is not numeric \: %s lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked -lima-business.franceaccountingrules.masteraccountnumbererror=Master Account Number is not a thirdpart account lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=The new fiscal period must adjoining the last lima-business.import.accountadded=SUCCES \: Account %s - %s added\n lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n -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. @@ -87,8 +79,6 @@ lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscal period %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 @@ -98,9 +88,7 @@ lima.config.configFileName.description=Filename of Lima's configuration lima.config.data.dir.description=Data directory of Lima lima.config.httpport.description=HTTP Port -lima.config.i18ndir.description=i18n directories lima.config.reports.dir.description= -lima.config.reportsdir.description=Reports directories lima.config.reportvatpdfurl.description= lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-05-15 08:53:16 UTC (rev 3419) @@ -1,14 +1,9 @@ -= lima-Business.defaultaccountingrules.updateentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Impossible de mettre à jour la transaction \: la période financière de ce nouveau journal est bloquée lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Impossible de mettre à jour la transaction \: la période financière de ce journal est bloquée lima-Business.defaultaccountingrules.updatenewentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce nouveau journal est bloquée lima-business.account.accountalreardyexist=Un compte existe déjà avec ce numéro \: %s -lima-business.common.close.transactionerror=Impossible de fermer la transaction \: %s -lima-business.common.commit.transactionerror=Impossible de commiter transaction \: %s lima-business.common.failed=Échec \: %s \n -lima-business.common.open.transactionerror=Impossible d'ouvrir la transaction \: %s -lima-business.common.queryerror=Exception lors de la requête \: %s lima-business.defaultaccountingrules.allentrybookclosed=Tous les journaux de cette période financière sont fermés lima-business.defaultaccountingrules.blockerrorequillibrate=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées lima-business.defaultaccountingrules.dateaftererror=La date est antérieure à la période fiscale @@ -22,7 +17,6 @@ lima-business.defaultaccountingrules.invalidaccountnumber=Numéro de compte invalide \: %d lima-business.defaultaccountingrules.missingelements=Impossible de bloquer la période financière / il manque des éléments dans des transactions lima-business.defaultaccountingrules.missingentrybook=Impossible de bloquer la période financière / il mmanque un journal dans une transaction -lima-business.defaultaccountingrules.subledgererror=Un livre auxilliaire doit être créé sur un compte contenant aucun sous-compte lima-business.document.accountnumber=N° Compte lima-business.document.amounts=Totaux lima-business.document.balance=Balance @@ -65,16 +59,13 @@ lima-business.fiscalperiod.fiscalperiodalreadyblocked=La période fiscale est déjà bloquée lima-business.fiscalperiod.newfinancialperioderror=Impossible de définir la période financière sur la période fiscale suivante lima-business.fiscalperiod.previousfiscalperiodalreadyblocked=La dernière période financière de la période fiscale est bloquée -lima-business.franceaccountingrules.accountnumbernotmaster=Le numéro de compte doit reprendre le numéro de compte général \: %d lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de copte n'est pas numéric \: %s lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du copte général n'est pas compris entre 1 et 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=Les périodes financières précédentes pour ce journal doivent être bloquées avant lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédante n'est pas bloquée -lima-business.franceaccountingrules.masteraccountnumbererror=Le numéro du compte général n'est pas un compte de tiers lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédante 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. @@ -88,8 +79,6 @@ 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 @@ -99,7 +88,6 @@ lima.config.configFileName.description=Nom du fichier de configuration de Lima lima.config.data.dir.description=Répertoire des données de Lima lima.config.httpport.description=Port HTTP -lima.config.i18n.dir.description=Dossier des i18n lima.config.reports.dir.description=Dossier des rapports lima.config.reportvatpdfurl.description=Chemin du raport lima.config.rulesnationality.description=Règles nationales 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 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -23,7 +23,7 @@ #L% --> -<JFrame title="lima.title" onWindowClosing="getHandler().close(this)" +<JFrame title="lima.ui.mainview.title" onWindowClosing="getHandler().close(this)" defaultCloseOperation="do_nothing_on_close" undecorated='{getConfig().isFullScreen()}' resizable="true" width="800" height="600" @@ -62,43 +62,43 @@ <JMenuBar> <JMenu text="lima.menu.file"> - <JMenu text="lima.importexport.csv"> - <JMenu text="lima.importexport.import" actionIcon='import-element'> - <JMenuItem text="lima.importexport.all" + <JMenu text="lima.ui.importexport.csv"> + <JMenu text="lima.ui.importexport.import" actionIcon='import-element'> + <JMenuItem text="lima.ui.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_IMPORT)'/> - <JMenuItem text="lima.importexport.accountcharts" + <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_IMPORT)'/> - <JMenuItem text="lima.common.entrybooks" + <JMenuItem text="lima.ui.importexport.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_IMPORT)'/> - <JMenuItem text="lima.importexport.financialstatements" + <JMenuItem text="lima.ui.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT)'/> - <JMenuItem text="lima.importexport.vatstatements" + <JMenuItem text="lima.ui.importexport.vatstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_VAT_IMPORT)'/> </JMenu> - <JMenu text="lima.importexport.export" actionIcon='export-element'> - <JMenuItem text="lima.importexport.all" + <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> + <JMenuItem text="lima.ui.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_EXPORT)'/> - <JMenuItem text="lima.importexport.accountcharts" + <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_EXPORT)'/> - <JMenuItem text="lima.common.entrybooks" + <JMenuItem text="lima.ui.importexport.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_EXPORT)'/> - <JMenuItem text="lima.importexport.financialstatements" + <JMenuItem text="lima.ui.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_EXPORT)'/> - <JMenuItem text="lima.importexport.vatstatements" + <JMenuItem text="lima.ui.importexport.vatstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_VAT_EXPORT)'/> </JMenu> </JMenu> - <JMenu text="lima.importexport.ebp"> - <JMenu text="lima.importexport.import" actionIcon='import-element'> - <JMenuItem text="lima.importexport.accountcharts" + <JMenu text="lima.ui.importexport.ebp"> + <JMenu text="lima.ui.importexport.import" actionIcon='import-element'> + <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_IMPORT)'/> - <JMenuItem text="lima.importexport.entries" + <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_IMPORT)'/> </JMenu> - <JMenu text="lima.importexport.export" actionIcon='export-element'> - <JMenuItem text="lima.importexport.accountcharts" + <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> + <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_EXPORT)'/> - <JMenuItem text="lima.importexport.entries" + <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_EXPORT)'/> </JMenu> </JMenu> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -73,7 +73,7 @@ </row> <row> <cell fill="horizontal" anchor="north" weighty="1"> - <JButton id="importButton" text="lima.importexport.import" + <JButton id="importButton" text="lima.ui.importexport.import" onActionPerformed="getHandler().importEntryBooks()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -77,7 +77,7 @@ </row> <row> <cell fill="horizontal"> - <JButton id="importButton" text="lima.importexport.import" + <JButton id="importButton" text="lima.ui.importexport.import" onActionPerformed="getHandler().importFinancialStatementChart()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -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 @@ -78,7 +78,7 @@ </row> <row> <cell> - <JRadioButton text='lima.importexport.import' + <JRadioButton text='lima.ui.importexport.import' value='{FinancialStatementsChartEnum.IMPORT}' buttonGroup="{getRadioButtons()}" selected='true'/> 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-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -59,14 +59,14 @@ </row> <row> <cell> - <JRadioButton text='lima.importexport.importcsv' + <JRadioButton text='lima.ui.importexport.importcsv' value='{AccountsChartEnum.IMPORT}' buttonGroup="{buttonGroup}"/> </cell> </row> <row> <cell> - <JRadioButton text='lima.importexport.importebp' + <JRadioButton text='lima.ui.importexport.importebp' value='{AccountsChartEnum.IMPORTEBP}' buttonGroup="{buttonGroup}"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2011 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 @@ -77,7 +77,7 @@ </row> <row> <cell> - <JRadioButton text='lima.importexport.import' + <JRadioButton text='lima.ui.importexport.import' value='{VatStatementsChartEnum.IMPORT}' buttonGroup="{getRadioButtons()}" selected='true'/> 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 2012-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2012-05-15 08:53:16 UTC (rev 3419) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2011 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 @@ -74,7 +74,7 @@ </row> <row> <cell fill="horizontal"> - <JButton id="importButton" text="lima.importexport.import" + <JButton id="importButton" text="lima.ui.importexport.import" onActionPerformed="getHandler().importVatStatementChart()"/> </cell> </row> 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-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-05-15 08:53:16 UTC (rev 3419) @@ -9,19 +9,12 @@ lima.balance.documentcreationfiscalerror=Can't create document on an open fiscal year lima.balance.listerror=Can't get entries list lima.charts.account=Accounts chart -lima.charts.account.addAccount=Add 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 @@ -32,10 +25,6 @@ lima.charts.fiscalperiod.add=Add fiscalperiod lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod -lima.charts.fiscalperiod.question.addretainedearnings=Report retained earnings ? -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.vatpdf=PDF structure lima.charts.vatstatement=VAT statement chart @@ -54,7 +43,6 @@ 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 @@ -64,17 +52,12 @@ lima.common.entrybooks=EntryBooks lima.common.error=Error lima.common.filter=Filter -lima.common.fin=Terminated -lima.common.globalexception=Global lima exception lima.common.info=Information 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 @@ -97,7 +80,6 @@ lima.config.scale.description= lima.config.ui.flaunchui.description= lima.config.ui.fullscreen.description=FullScreen -lima.daily=Daily lima.documents=Documents… lima.entries=Entries lima.entries.addEntry=Add entry @@ -146,31 +128,8 @@ lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list lima.financialstatement.subamount=Calculate a subamount lima.financialstatementreport.listerror=Can't get entries list -lima.fiscalperiod.creationerror=Can't create fiscal periods -lima.fiscalperiod.listerror=Can't get fiscal periods list lima.fiscalperiod.unbalancedtransactions=Fiscal Period has unbalanced transactions -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) @@ -183,8 +142,10 @@ lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code -lima.importexport.importcsv= -lima.importexport.importebp= +lima.importexport.choiceencoding= +lima.importexport.export= +lima.importexport.export.terminated= +lima.importexport.usevatpdf= lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close lima.ledger.documentcreationerror=Enable to create document @@ -200,8 +161,8 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Support email lima.openejb.remotemode.description= +lima.opening.accounts= lima.preferences=Preferences -lima.refresh=↻ lima.reports=Reports lima.reports.accounts=Edit account lima.reports.balance=Balance @@ -209,8 +170,6 @@ 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 \! @@ -218,15 +177,12 @@ lima.tab.home=Home lima.table.account=Account lima.table.balance=Balance -lima.table.closure=Closed -lima.table.code=Code lima.table.credit=Credit lima.table.date=Date lima.table.debit=Debit lima.table.debitcredit=Debit and credit 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 @@ -234,18 +190,15 @@ 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.solde=Solder lima.table.solde.credit=Credit solde lima.table.solde.debit=Debit solde 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 \: - accounts interval i..j - accounts list i,j,k - Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries Select many rows with combination ctrl + click</html> -lima.ui.account.addAccount= lima.ui.account.addaccount= lima.ui.account.addaccounttitle= lima.ui.account.base= @@ -260,6 +213,7 @@ lima.ui.common.cancel= lima.ui.common.error= lima.ui.common.ok= +lima.ui.common.refresh= lima.ui.common.remove= lima.ui.common.update= lima.ui.entrybook.add= @@ -298,7 +252,6 @@ lima.ui.financialtransaction.voucher= lima.ui.fiscalperiod.addfiscalperiod.morethan12= lima.ui.fiscalperiod.addfiscalperiodtitle= -lima.ui.fiscalperiod.addperiodtitle= lima.ui.fiscalperiod.block.addretainedearnings= lima.ui.fiscalperiod.block.confirmation= lima.ui.fiscalperiod.block.newyear= @@ -336,11 +289,11 @@ lima.ui.home.transaction.unbalanced= lima.ui.importexport.accountcharts=Accounts chart lima.ui.importexport.all=All -lima.ui.importexport.choiceencoding=Choice encoding lima.ui.importexport.csv=Import/Export CSV lima.ui.importexport.defaultentrybooks=Defaults entrybooks lima.ui.importexport.ebp=Import/Export EBP lima.ui.importexport.entries=Entries +lima.ui.importexport.entrybooks=Entry books lima.ui.importexport.export=Export lima.ui.importexport.export.terminated=Export terminated lima.ui.importexport.financialstatements=FinancialStatements chart @@ -349,12 +302,15 @@ lima.ui.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory lima.ui.importexport.importcsv= lima.ui.importexport.importebp= -lima.ui.importexport.usevatpdf=Would you like to use this PDF when editing the VAT document ? +lima.ui.importexport.importerror= +lima.ui.importexport.importtitle= lima.ui.importexport.vatstatements=VAT chart lima.ui.importexport.wait=Job in progress… lima.ui.importexport.waittitle= +lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.opening.accounts=<html><center>Select a default, import your personnal or cancel to create your own account chart.</center></html> lima.ui.opening.close= +lima.ui.opening.end= lima.ui.opening.entrybook=<html>Tick box to import default accounts chart\: Achats, Ventes, Trésorerie, Opération diverses</html> lima.ui.opening.import=Import a CSV Save lima.ui.opening.next= 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-05-15 08:29:37 UTC (rev 3418) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-05-15 08:53:16 UTC (rev 3419) @@ -9,19 +9,12 @@ lima.balance.documentcreationfiscalerror=Impossible de créer le document quand la période fiscale est ouverte lima.balance.listerror=Erreur lors de la récupération des données de la liste lima.charts.account=Plan comptable -lima.charts.account.addAccount=Ajout Compte Général 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é @@ -32,10 +25,6 @@ lima.charts.fiscalperiod.add=Nouvel exercice 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.addretainedearnings=Reporter à nouveau? -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.vatpdf=Structure du pdf lima.charts.vatstatement=Plan TVA @@ -54,7 +43,6 @@ 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 @@ -64,17 +52,12 @@ lima.common.entrybooks=Journaux lima.common.error=Erreur lima.common.filter=Filtrer -lima.common.fin=Terminé -lima.common.globalexception=Global lima exception lima.common.info=Information 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 @@ -97,7 +80,6 @@ lima.config.scale.description= lima.config.ui.flaunchui.description= lima.config.ui.fullscreen.description=Plein écran -lima.daily=Quotidien lima.documents=Documents… lima.entries=Traitement lima.entries.addEntry=Ajouter entrée @@ -146,10 +128,7 @@ lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions lima.financialstatement.subamount=Calculer un sous-total lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste -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.state2_2= lima.home.entrybooks.create= lima.identity=Identité lima.identity.address=Adresse @@ -163,8 +142,10 @@ lima.identity.phoneNumber=n° Tel lima.identity.vatNumber=n° TVA lima.identity.zipCode=Code Postal -lima.importexport.importcsv= -lima.importexport.importebp= +lima.importexport.choiceencoding= +lima.importexport.export= +lima.importexport.export.terminated= +lima.importexport.usevatpdf= lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture lima.ledger.documentcreationerror=Erreur lors de la création du document @@ -180,8 +161,8 @@ 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= lima.preferences=Préférences -lima.refresh=↻ lima.reports=Rapports lima.reports.accounts=Edition compte lima.reports.balance=Balance @@ -189,8 +170,6 @@ 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 \! @@ -198,15 +177,12 @@ lima.tab.home=Accueil lima.table.account=Compte lima.table.balance=Balance -lima.table.closure=Cloture -lima.table.code=Code lima.table.credit=Crédit lima.table.date=Date lima.table.debit=Débit lima.table.debitcredit=Débit et Crédit lima.table.description=Description lima.table.entrybook=Journal -lima.table.fiscalperiod=Exercice lima.table.grossamount=Brut lima.table.label=Libellé lima.table.letter=Lettre @@ -214,13 +190,11 @@ 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.solde=Solde lima.table.solde.credit=Solde crédit lima.table.solde.debit=Solde débit 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 \: - intervalle de compte i..j - liste de compte i,j,k - Exclure un compte -i</html> @@ -239,6 +213,7 @@ lima.ui.common.cancel=Annuler lima.ui.common.error=Erreur lima.ui.common.ok=Ok +lima.ui.common.refresh= lima.ui.common.remove=Supprimer lima.ui.common.update=Modifier lima.ui.entrybook.add=Ajout de journal @@ -277,7 +252,6 @@ lima.ui.financialtransaction.voucher=Pièce comptable lima.ui.fiscalperiod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? lima.ui.fiscalperiod.addfiscalperiodtitle=Nouvel exercice -lima.ui.fiscalperiod.addperiodtitle= lima.ui.fiscalperiod.block.addretainedearnings=Reporter à nouveau? lima.ui.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! lima.ui.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice? @@ -315,11 +289,11 @@ lima.ui.home.transaction.unbalanced=transactions ne sont pas équilibrées \! lima.ui.importexport.accountcharts=Plan des comptes lima.ui.importexport.all=Tout -lima.ui.importexport.choiceencoding=Choisir encodage \: lima.ui.importexport.csv=Import/Export CSV lima.ui.importexport.defaultentrybooks=Journaux par défaut lima.ui.importexport.ebp=Import/Export EBP lima.ui.importexport.entries=Écritures +lima.ui.importexport.entrybooks=Journaux lima.ui.importexport.export=Export lima.ui.importexport.export.terminated=Export terminé lima.ui.importexport.financialstatements=Plan BCR @@ -328,12 +302,15 @@ lima.ui.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima lima.ui.importexport.importcsv=Import/Export CSV lima.ui.importexport.importebp=Import/Export EBP -lima.ui.importexport.usevatpdf=Voulez-vous utilser ce PDF pour la déclaration de TVA ? +lima.ui.importexport.importerror= +lima.ui.importexport.importtitle= lima.ui.importexport.vatstatements=Plan TVA lima.ui.importexport.wait=Traitement en cours… lima.ui.importexport.waittitle=Traitement en cours +lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, importer un plan personnalisé ou annuler pour créer votre propre plan.</center></html> lima.ui.opening.close=Fermer +lima.ui.opening.end= lima.ui.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \: Achats, Ventes, Trésorerie, Opération diverses</html> lima.ui.opening.import=Importer une sauvegarde CSV lima.ui.opening.next=Suivant

1 0

r3418 - trunk/lima-business/src/main/java/org/chorem/lima/business/migration
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:29:37 +0200 (Tue, 15 May 2012) New Revision: 3418 Url: http://chorem.org/repositories/revision/lima/3418 Log: Remove financialperiod column in table financialtransaction Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2012-05-15 08:23:51 UTC (rev 3417) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2012-05-15 08:29:37 UTC (rev 3418) @@ -64,17 +64,21 @@ queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTDEBIT"); queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTCREDIT"); - // modele refactoring + // model refactoring queries.add("drop table record"); queries.add("alter table account drop column masteraccount"); queries.add("alter table account drop column generalledger"); + queries.add("alter table financialtransaction drop column financialperiod"); + queries.add("alter table entry add column lettering varchar(30)"); queries.add("update entry e set lettering = (select l.code from Letter l where l.topiaid = e.letter)"); queries.add("alter table entry drop column letter"); queries.add("drop table letter"); queries.add("alter table vatstatement drop column amount"); + + } }

1 0

r3417 - trunk/lima-callao/src/main/xmi
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:23:51 +0200 (Tue, 15 May 2012) New Revision: 3417 Url: http://chorem.org/repositories/revision/lima/3417 Log: Fix lazy exception for transaction edition Modified: trunk/lima-callao/src/main/xmi/accounting.properties Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 08:21:59 UTC (rev 3416) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2012-05-15 08:23:51 UTC (rev 3417) @@ -47,9 +47,9 @@ org.chorem.lima.entity.FiscalPeriod.attribute.endDate.tagvalue.notNull=true # lazy -org.chorem.lima.entity.FiscalPeriod.attribute.financialPeriod.tagvalue.lazy=false +org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false org.chorem.lima.entity.FinancialTransaction.attribute.entry.tagvalue.lazy=false -org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false +org.chorem.lima.entity.FinancialTransaction.attribute.entrybook.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.subFinancialStatements.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.masterFinancialStatement.tagvalue.lazy=false org.chorem.lima.entity.VatStatement.attribute.subVatStatements.tagvalue.lazy=false

1 0

r3416 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:21:59 +0200 (Tue, 15 May 2012) New Revision: 3416 Url: http://chorem.org/repositories/revision/lima/3416 Log: Remove sysout Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-05-15 08:21:05 UTC (rev 3415) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2012-05-15 08:21:59 UTC (rev 3416) @@ -246,7 +246,6 @@ //skip all cell while not editable or if end of table add entry or transaction or end of table while (!isCellEditable(y_tab, x_tab) && end ){ - System.out.println("coucou"); //if end of row if (x_tab == max_x-1) { Object object = this.handler.tableModel.getElementAt(y_tab);

1 0

r3415 - trunk/lima-business/src/test/java/org/chorem/lima/entity
by echatellier＠users.chorem.org May 15, 2012

May 15, 2012

Author: echatellier Date: 2012-05-15 10:21:05 +0200 (Tue, 15 May 2012) New Revision: 3415 Url: http://chorem.org/repositories/revision/lima/3415 Log: Remove sysout Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2012-05-15 08:09:23 UTC (rev 3414) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java 2012-05-15 08:21:05 UTC (rev 3415) @@ -61,9 +61,6 @@ AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(tx); List<Account> accounts = accountDAO.stringToListAccounts("50..511", false); - for (Account account : accounts) { - System.out.println(account.getAccountNumber()); - } Assert.assertEquals(5, accounts.size()); accounts = accountDAO.stringToListAccounts("60..99", false);

1 0