branch develop updated (f63c2236 -> 6161aff9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from f63c2236 refs #1394 [ISO] formatage new 91812ef5 refs #1394 correction numéro version model new 017c408c refs #1394 ajout contrôle new a9201f42 refs #1394 [ISO] possibilité d'utiliser une base de données H2 new 175e2f0e refs #1373 Mise à jour de la documentation new 6161aff9 refs #1373 Mise à jour de la documentation The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6161aff9b650d8cc9f535716b0ec7c8d9b66de19 Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 22:53:23 2017 +0200 refs #1373 Mise à jour de la documentation commit 175e2f0e49c88328c31d3e47c26823d4a25bda6b Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 22:27:02 2017 +0200 refs #1373 Mise à jour de la documentation commit a9201f42ede2ff183c1adf18875b3ed32f7a431c Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 10:00:35 2017 +0200 refs #1394 [ISO] possibilité d'utiliser une base de données H2 commit 017c408c3ba7e22f5d09505862becf69285ec1c8 Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 10:00:09 2017 +0200 refs #1394 ajout contrôle commit 91812ef53e4959759cb6b31ac551deee4ec7cf2c Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 09:36:48 2017 +0200 refs #1394 correction numéro version model Summary of changes: lima-business-api/pom.xml | 22 +++++++++ lima-business/pom.xml | 27 ++++++++++ .../chorem/lima/entity/LimaFlywayServiceImpl.java | 7 +-- lima-callao/pom.xml | 22 +++++++++ .../src/main/xmi/lima-callao-model.properties | 2 +- lima-report/pom.xml | 22 +++++++++ lima-server/pom.xml | 22 +++++++++ lima-swing/pom.xml | 22 +++++++++ .../chorem/lima/enums/MainUiRefreshComponent.java | 22 +++++++++ .../FinancialTransactionViewHandler.java | 2 +- pom.xml | 30 ++++++++++++ src/site/rst/backup.rst | 35 ++++++++++++- src/site/rst/contact.rst | 5 +- src/site/rst/features.rst | 8 --- src/site/rst/importexport.rst | 4 +- src/site/rst/index.rst | 8 +-- src/site/rst/install.rst | 57 ++++++++++++++++++++-- src/site/rst/saisie.rst | 18 +++++-- 18 files changed, 302 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 91812ef53e4959759cb6b31ac551deee4ec7cf2c Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 09:36:48 2017 +0200 refs #1394 correction numéro version model --- lima-callao/src/main/xmi/lima-callao-model.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-callao/src/main/xmi/lima-callao-model.properties b/lima-callao/src/main/xmi/lima-callao-model.properties index 7f53bae5..a42ad891 100644 --- a/lima-callao/src/main/xmi/lima-callao-model.properties +++ b/lima-callao/src/main/xmi/lima-callao-model.properties @@ -20,7 +20,7 @@ # #L% ### # Precise l'entete de l'ensemble des fichiers generes -model.tagvalue.version=0.8.6.0 +model.tagvalue.version=0.8.7.0 model.tagvalue.constantPrefix=PROPERTY_ model.tagValue.notGenerateToString=true model.tagValue.hibernateAttributeType.String=text -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 017c408c3ba7e22f5d09505862becf69285ec1c8 Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 10:00:09 2017 +0200 refs #1394 ajout contrôle --- .../lima/ui/financialtransaction/FinancialTransactionViewHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index fb53c4ee..33592a7d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -393,7 +393,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo boolean result = false; if (financialPeriod != null && entryBook != null) { ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, financialPeriod); - result = closedPeriodicEntryBook.isLocked(); + result = closedPeriodicEntryBook == null || closedPeriodicEntryBook.isLocked(); if (log.isDebugEnabled()) { log.debug("Locked:" + result); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit a9201f42ede2ff183c1adf18875b3ed32f7a431c Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 10:00:35 2017 +0200 refs #1394 [ISO] possibilité d'utiliser une base de données H2 --- lima-business/pom.xml | 5 +++++ .../main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java | 7 ++++--- pom.xml | 8 ++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 0f37000f..c302b482 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -101,6 +101,11 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> diff --git a/lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java index c2109d87..e906898f 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java @@ -24,7 +24,6 @@ package org.chorem.lima.entity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.Driver; import org.nuiton.topia.flyway.TopiaFlywayServiceImpl; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaConfigurationConstants; @@ -44,7 +43,7 @@ public class LimaFlywayServiceImpl extends TopiaFlywayServiceImpl { private static final Log log = LogFactory.getLog(LimaFlywayServiceImpl.class); - protected final static String INITIAL_VERSION = "0.3.0.0"; + protected final static String INITIAL_VERSION = ""; protected final static String OLD_TABLE_VERSION = "TMS_VERSION"; protected final static String VERSION_FROM_OLD_TABLE_VERSION = "SELECT VERSION FROM " + OLD_TABLE_VERSION + ";"; protected final static String FLYWAY_TABLE_VERSION = "schema_version"; @@ -57,7 +56,9 @@ public class LimaFlywayServiceImpl extends TopiaFlywayServiceImpl { String user = configuration.get(TopiaConfigurationConstants.CONFIG_USER); String password = configuration.get(TopiaConfigurationConstants.CONFIG_PASS); - DriverManager.registerDriver(new Driver()); + DriverManager.registerDriver(new org.h2.Driver()); + DriverManager.registerDriver(new org.postgresql.Driver()); + Connection connection = DriverManager.getConnection(url, user, password); return connection; diff --git a/pom.xml b/pom.xml index eb578652..943ee1a9 100644 --- a/pom.xml +++ b/pom.xml @@ -175,6 +175,7 @@ <googleGuavaVersion>19.0</googleGuavaVersion> <!-- h2Version 1.4.180 is beta, and db created with 1.3 are not compatible yet so don't use it for the moment--> <h2Version>1.3.176</h2Version> + <postgresqlVersion>42.1.4.jre7</postgresqlVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <itextVersion>4.2.1</itextVersion> <jasperreportsVersion>6.3.0</jasperreportsVersion> @@ -356,6 +357,13 @@ </dependency> <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresqlVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 175e2f0e49c88328c31d3e47c26823d4a25bda6b Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 22:27:02 2017 +0200 refs #1373 Mise à jour de la documentation --- src/site/rst/backup.rst | 14 ++++++++++++-- src/site/rst/features.rst | 8 -------- src/site/rst/importexport.rst | 2 +- src/site/rst/install.rst | 38 ++++++++++++++++++++++++++++++++++++-- src/site/rst/saisie.rst | 18 +++++++++++++----- 5 files changed, 62 insertions(+), 18 deletions(-) diff --git a/src/site/rst/backup.rst b/src/site/rst/backup.rst index 7abbf602..a2c196d9 100644 --- a/src/site/rst/backup.rst +++ b/src/site/rst/backup.rst @@ -1,7 +1,10 @@ Sauvegarde / Restauration ------------------------- -La base de données utilisée par Lima est une base de données H2, elle est situé dans le dossier .lima +Base de données H2 +================== + +La base de données utilisée par Lima par défaut est une base de données H2, elle est situé dans le dossier .lima - Unix-like : ``$HOME/.lima`` @@ -11,4 +14,11 @@ La base de données utilisée par Lima est une base de données H2, elle est sit À ce jour Lima n'est pas pourvu de mécanisme de sauvegarde automatique il donc fortement conseillé de saugarder régulièrement ce dossier. -En cas de base de données corrompue il suffira alors de restaurer votre sauvegarde. +En cas de problème il suffira alors de restaurer votre sauvegarde. + +Base de données Postgresql +========================== + +Depuis la version 0.8.7 il est possible de définir une base de données Postgresql. + +Dans ce cas utilisez les commandes **pg_dump** et **pg_restore**. \ No newline at end of file diff --git a/src/site/rst/features.rst b/src/site/rst/features.rst index 06923b1b..8565cf17 100644 --- a/src/site/rst/features.rst +++ b/src/site/rst/features.rst @@ -111,10 +111,6 @@ Les documents disponibles sont : .. image:: screens/lima_reports_menu_global_menu.png -**Suivez le lien pour plus de détails sur les `rapport <rapports.html>`_.** - -.. _rapport: rapports.html - Import / Export --------------- @@ -125,7 +121,3 @@ Lima permet l'export FEC recquis par l’administration fiscale Française pour Actuellement Lima permet l'import et l'export pour EBP. Il est possible d'ajouter à la demande l'import / export pour des formats de fichiers d'autres logiciels. - -**Suivez le lien pour plus de détails sur l'`Import / Export <rapports.html>`_.** - -.. _Import / Export: importexport.html \ No newline at end of file diff --git a/src/site/rst/importexport.rst b/src/site/rst/importexport.rst index 7a3f97cf..b4bab5f3 100644 --- a/src/site/rst/importexport.rst +++ b/src/site/rst/importexport.rst @@ -27,7 +27,7 @@ Import / Export Lima supporte actuellement deux formats d'import: - le format CSV avec un modèle de donnée spécifique à Lima ; -- le format EBP, +- le format EBP et 3 formats d'export: diff --git a/src/site/rst/install.rst b/src/site/rst/install.rst index b770e04f..08c1cd3f 100644 --- a/src/site/rst/install.rst +++ b/src/site/rst/install.rst @@ -86,9 +86,11 @@ Onglet Affichage -> Sous dossier 'Fichiers et dossiers cachés' -> cocher 'Affic Base de données Lima -------------------- -Les données de lima sont stockées dans une base de données H2. +Depuis la version 0.8.7 il est possible de définir une base de données Postgresql à la place de la base de données H2 utilisée par défaut. -**Il est conseillé de sauvegarder régulièrement ce dossier.** +**Base de données H2** + +Le dossier contenant la base de données est le suivant: Unix-like : ``$HOME/.lima/limadb.h2`` @@ -96,3 +98,35 @@ Windows 7\* et + : ``C:\Users\USER_NAME\.lima\limadb.h2`` Mac OS : ``$HOME/.lima/limadb.h2`` +**Il est conseillé de sauvegarder régulièrement ce dossier.** + +**Base de données Postgresql** + +Si vous souhaitez utiliser une base de données Postgresql il vous faudra au préalable créer la base de données. + +:: + + CREATE DATABASE "lima" OWNER limaUser; + +Il vous faudra ensuite indiquer à Lima d'utiliser cette base de données. +Pour ce faire éditez ou créez le fichier ``lima-business.config``: + +et ajouter les lignes suivantes (en remplaçant le nom de la base de données, de l'utilisateur et son mot de passe par ceux que vous aurez définit à la création de la base de données): + +:: + + hibernate.connection.driver_class=org.postgresql.Driver + hibernate.connection.password=le_mot_de_passe + hibernate.connection.url=jdbc\:postgresql\://localhost/lima + hibernate.connection.username=limaUser + hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect + + +Selon votre système vous trouverez ce fichier à cet emplacement (remplacez USER_NAME par le nom de l'utilisateur): + +Unix-like : ``$HOME/.config/lima-business.config`` + +Windows 7\* et + : ``C:\Users\USER_NAME\AppData\Roaming\lima-business.config`` + +Mac OS : ``$HOME/Library/Application Support/lima-business.config`` + diff --git a/src/site/rst/saisie.rst b/src/site/rst/saisie.rst index ebe4a784..6094a1da 100644 --- a/src/site/rst/saisie.rst +++ b/src/site/rst/saisie.rst @@ -44,11 +44,19 @@ Les transactions non équilibrées, ou dont le débit et crédit sont nuls, sont affichées en rouge dans l'interface de saisie, tandis que les entrées avec un débit et un crédit à zéro sont en rouge clair. -Note : Vous pouvez saisir plus rapidement en utilisant la touche 'Tab' pour -changer de cellule et tapper directement la valeur souhaitée. Si vous appuyez -sur 'Tab en fin de ligne, soit la transaction est équilibrée alors une nouvelle -transaction sera créée, soit la transaction n'est pas équilibrée et une nouvelle -entrée sera ajoutée. +Assistance à la saisie : + +- Le choix du compte peut se faire de 3 façons différentes: + + 1. Sélection du compte dans la liste déroulante + 2. Saisie du numéro de compte + 3. Saisie du nom du compte, pour cela commancez votre saisie par le charactère '*'. + +- Vous pouvez saisir plus rapidement en utilisant la touche 'Tab' pour + changer de cellule et tapper directement la valeur souhaitée. Si vous appuyez + sur 'Tab en fin de ligne, soit la transaction est équilibrée alors une nouvelle + transaction sera créée, soit la transaction n'est pas équilibrée et une nouvelle + entrée sera ajoutée. Les entrées et transactions non équilibrées ------------------------------------------- -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 6161aff9b650d8cc9f535716b0ec7c8d9b66de19 Author: David Cossé <cosse@codelutin.com> Date: Thu Oct 26 22:53:23 2017 +0200 refs #1373 Mise à jour de la documentation --- lima-business-api/pom.xml | 22 +++++++++++++++++++++ lima-business/pom.xml | 22 +++++++++++++++++++++ lima-callao/pom.xml | 22 +++++++++++++++++++++ lima-report/pom.xml | 22 +++++++++++++++++++++ lima-server/pom.xml | 22 +++++++++++++++++++++ lima-swing/pom.xml | 22 +++++++++++++++++++++ .../chorem/lima/enums/MainUiRefreshComponent.java | 22 +++++++++++++++++++++ pom.xml | 22 +++++++++++++++++++++ src/site/rst/backup.rst | 23 +++++++++++++++++++++- src/site/rst/contact.rst | 5 ++--- src/site/rst/importexport.rst | 2 +- src/site/rst/index.rst | 8 ++++---- src/site/rst/install.rst | 19 ++++++++++++++++-- 13 files changed, 222 insertions(+), 11 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 98e4762b..6c1889c8 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Business API + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index c302b482..ea0a2e07 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Business + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index c6b4b604..215b193e 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Callao + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-report/pom.xml b/lima-report/pom.xml index d97c60b5..8ed8fe41 100644 --- a/lima-report/pom.xml +++ b/lima-report/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Report + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index 47308440..397a98d3 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Server + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 864fdbdd..c1dfb444 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima :: Swing + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/MainUiRefreshComponent.java b/lima-swing/src/main/java/org/chorem/lima/enums/MainUiRefreshComponent.java index 0f23913c..292a9569 100644 --- a/lima-swing/src/main/java/org/chorem/lima/enums/MainUiRefreshComponent.java +++ b/lima-swing/src/main/java/org/chorem/lima/enums/MainUiRefreshComponent.java @@ -1,5 +1,27 @@ package org.chorem.lima.enums; +/*- + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2017 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + public enum MainUiRefreshComponent { ACCOUNT_PANE, ENTRY_BOOK_PANE, diff --git a/pom.xml b/pom.xml index 943ee1a9..c26e3b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Lima + %% + Copyright (C) 2008 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/src/site/rst/backup.rst b/src/site/rst/backup.rst index a2c196d9..f02d228c 100644 --- a/src/site/rst/backup.rst +++ b/src/site/rst/backup.rst @@ -1,3 +1,24 @@ +.. - +.. * #%L +.. * Lima +.. * %% +.. * Copyright (C) 2008 - 2017 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Sauvegarde / Restauration ------------------------- @@ -21,4 +42,4 @@ Base de données Postgresql Depuis la version 0.8.7 il est possible de définir une base de données Postgresql. -Dans ce cas utilisez les commandes **pg_dump** et **pg_restore**. \ No newline at end of file +Dans ce cas utilisez les commandes **pg_dump** et **pg_restore**. diff --git a/src/site/rst/contact.rst b/src/site/rst/contact.rst index d4331aa6..bf0d3876 100644 --- a/src/site/rst/contact.rst +++ b/src/site/rst/contact.rst @@ -2,7 +2,7 @@ .. * #%L .. * Lima .. * %% -.. * Copyright (C) 2008 - 2010 CodeLutin +.. * Copyright (C) 2008 - 2017 CodeLutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -39,8 +39,7 @@ un email à la(es) liste(s)). Support ~~~~~~~ -`Code Lutin`_ est une `Société de Services en Logiciels Libres`_ spécialisée dans les -technologies Java/J2EE, XML, UML. Son offre s'étend à l'audit, au conseil, à la +`Code Lutin`_ est une `Société de Services en Logiciels Libres`_ spécialiste du logiciel libre, des langages Java et Javascript depuis 2002. Son offre s'étend à l'audit, au conseil, à la Tierce Maintenance Applicative et à la formation. SASPO Code Lutin diff --git a/src/site/rst/importexport.rst b/src/site/rst/importexport.rst index b4bab5f3..813135ca 100644 --- a/src/site/rst/importexport.rst +++ b/src/site/rst/importexport.rst @@ -2,7 +2,7 @@ .. * #%L .. * Lima .. * %% -.. * Copyright (C) 2008 - 2010 CodeLutin +.. * Copyright (C) 2008 - 2017 CodeLutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 32227772..f7f4433c 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -2,7 +2,7 @@ .. * #%L .. * Lima .. * %% -.. * Copyright (C) 2008 - 2010 CodeLutin +.. * Copyright (C) 2008 - 2017 CodeLutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -66,9 +66,9 @@ Architecture Lima est un projet `Maven`_ multi-module, il est en réalité composé de trois projets Java : - * lima-business ; - * lima-callao ; - * lima-swing. + * lima-business + * lima-callao + * lima-swing Lima-callao ~~~~~~~~~~~ diff --git a/src/site/rst/install.rst b/src/site/rst/install.rst index 08c1cd3f..ee73a8b2 100644 --- a/src/site/rst/install.rst +++ b/src/site/rst/install.rst @@ -2,7 +2,7 @@ .. * #%L .. * Lima .. * %% -.. * Copyright (C) 2008 - 2010 CodeLutin +.. * Copyright (C) 2008 - 2017 CodeLutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -24,12 +24,27 @@ Installer et lancer Lima ------------------------- -Installez Lima en quelques instants : Téléchargez l'archive lima-VERSION-bin.zip sur la `page de téléchargement`_ puis décompressez le fichier téléchargé. +Pré-requis +---------- **Attention:** Depuis la version 0.6 de Lima nécessite `Java en version 7`_. **Attention:** Depuis la version 0.8.6 de Lima nécessite `Java en version 8`_. +Téléchargement +-------------- + +Rendez-vous sur notre `page de téléchargement`_ + +Pour une utilisation monoposte téléchargez l'archive **lima-VERSION-bin.zip** + +Pour une utilisation multi-poste en mode clients serveur téléchargez l'archive **lima-server-VERSION-bin.zip** + +Installation/Lancement +---------------------- + +Décompressez l'archive **lima-VERSION-bin.zip** ou **lima-server-VERSION-bin.zip** + Pour lancer l'application : - Sous Linux : via le script *lima* ou en ligne de commande *java -jar lima.jar* ; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm