branch feature/1373-MAJ_documentation updated (c9582e7 -> ab2196c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git discards c9582e7 refs #1373 changement de text discards 999f235 refs #1373 renommage de fichier discards 80936c5 refs #1373 modification du text de l'écran d'acceuil discards e0fe28a refs #1373 modification du text de l'écran d'acceuil discards d92df7c refs #1373 ajout de captures d'écran discards f6ee1d9 refs #1373 ajout de captures d'écran discards 66f80ca refs #1373 ajout de captures d'écran discards d0f43b8 refs #1373 ajout et maj des captures d'écran new 6942d31 refs 1380 execute l'export même si aucune entitée new 716dbd4 refs #1380 ferme la boite de dialogue de mise en attente dans tous les cas new 83f1431 Merge branch 'feature/1380-terminate_export' into develop new cd622d7 refs #1373 ajout et maj des captures d'écran new ced3805 refs #1373 ajout de captures d'écran new a04ad84 refs #1373 ajout de captures d'écran new 166d977 refs #1373 ajout de captures d'écran new 6a5a001 refs #1373 modification du text de l'écran d'acceuil new 18b778c refs #1373 modification du text de l'écran d'acceuil new f5bdecb refs #1373 renommage de fichier new ab2196c refs #1373 changement de text This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c9582e7) \ N -- N -- N refs/heads/feature/1373-MAJ_documentation (ab2196c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 11 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 ab2196c7dbd70f594c5f5b95791624010be9cc5b Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 21:41:29 2017 +0100 refs #1373 changement de text commit f5bdecb5bd145f43de9771fe672e4334e6573c8c Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 21:40:38 2017 +0100 refs #1373 renommage de fichier commit 18b778cf961a809f2214f70ce0031862b92b1771 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:47:13 2017 +0100 refs #1373 modification du text de l'écran d'acceuil commit 6a5a00180dcc2155abca10e1e18b2bfd483de61e Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:44:38 2017 +0100 refs #1373 modification du text de l'écran d'acceuil commit 166d977425fbb45d873dba98d3aeea082c0bbdb2 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:18:47 2017 +0100 refs #1373 ajout de captures d'écran commit a04ad84b91b46a7195dea49d961b6ccd60bcdbf5 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:17:31 2017 +0100 refs #1373 ajout de captures d'écran commit ced3805999287757ed5f6f8b2b3a9d0dae358cd9 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:17:11 2017 +0100 refs #1373 ajout de captures d'écran commit cd622d7bcacf354d60efaefc0423ca93d3c188fd Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:13:38 2017 +0100 refs #1373 ajout et maj des captures d'écran commit 83f1431d7485920e3e0efd1416ed8c8de3324e9e Merge: d0115dd 716dbd4 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:48:26 2017 +0100 Merge branch 'feature/1380-terminate_export' into develop commit 716dbd4737a4999cfb7c456c6f41f1e192ae3328 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:47:30 2017 +0100 refs #1380 ferme la boite de dialogue de mise en attente dans tous les cas commit 6942d31cbccb5bcb717b5447587e312bcdcf1626 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:46:47 2017 +0100 refs 1380 execute l'export même si aucune entitée Summary of changes: .../lima/business/ejb/ExportServiceImpl.java | 73 ++++++++-------------- .../chorem/lima/ui/importexport/ImportExport.java | 6 +- 2 files changed, 28 insertions(+), 51 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 6942d31cbccb5bcb717b5447587e312bcdcf1626 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:46:47 2017 +0100 refs 1380 execute l'export même si aucune entitée --- .../lima/business/ejb/ExportServiceImpl.java | 73 ++++++++-------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java index ca0d7bb..7ceea96 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java @@ -50,11 +50,9 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountTopiaDao; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.EntryBookTopiaDao; import org.chorem.lima.entity.EntryTopiaDao; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.entity.FinancialTransactionTopiaDao; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.VatStatement; @@ -125,10 +123,9 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); List<Account> entities = accountTopiaDao.findAll(); - if (entities != null && !entities.isEmpty()) { - AccountModel model = new AccountModel(); - processExport(charset, exportedClass, exportResult, entities, model); - } + + AccountModel model = new AccountModel(); + processExport(charset, exportedClass, exportResult, entities, model); return results; } @@ -138,10 +135,8 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ Class exportedClass = EntryBook.class; ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); - List<EntryBook> entities = entryBookTopiaDao.findAll(); + List<EntryBook> entities = getDaoHelper().getEntryBookDao().findAll(); - entities = entities == null ? Lists.newArrayList() : entities; EntryBookModel model = new EntryBookModel(); processExport(charset, exportedClass, exportResult, entities, model); @@ -156,7 +151,6 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ List<FiscalPeriod> entities = fiscalPeriodService.getAllFiscalPeriods(); - entities = entities == null ? Lists.newArrayList() : entities; FiscalPeriodModel model = new FiscalPeriodModel(); processExport(charset, exportedClass, exportResult, entities, model); @@ -168,11 +162,8 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ Class<FinancialTransaction> exportedClass = FinancialTransaction.class; ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); - FinancialTransactionTopiaDao financialTransactionTopiaDao = - getDaoHelper().getFinancialTransactionDao(); - List<FinancialTransaction> entities = financialTransactionTopiaDao.findAll(); + List<FinancialTransaction> entities = getDaoHelper().getFinancialTransactionDao().findAll(); - entities = entities == null ? Lists.newArrayList() : entities; FinancialTransactionModel model = new FinancialTransactionModel(entryBookService); processExport(charset, exportedClass, exportResult, entities, model); @@ -185,9 +176,8 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ Class<Entry> exportedClass = Entry.class; ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); - EntryTopiaDao dao = getDaoHelper().getEntryDao(); - List<Entry> entities = dao.findAll(); - entities = entities == null ? Lists.newArrayList() : entities; + List<Entry> entities = getDaoHelper().getEntryDao().findAll(); + EntryModel model = new EntryModel(accountService, entryBookService, financialTransactionService , humanReadable); processExport(charset, exportedClass, exportResult, entities, model); @@ -210,12 +200,11 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); List<FinancialStatement> rootFinancialStatements = financialStatementService.getRootFinancialStatements(); - if (rootFinancialStatements != null) { - FinancialStatementModel model = new FinancialStatementModel(); - List<FinancialStatement> financialStatements = new ArrayList<>(); - addAllSubFinancialStatements(financialStatements, rootFinancialStatements); - processExport(charset, exportedClass, exportResult, financialStatements, model); - } + FinancialStatementModel model = new FinancialStatementModel(); + List<FinancialStatement> financialStatements = new ArrayList<>(); + addAllSubFinancialStatements(financialStatements, rootFinancialStatements); + processExport(charset, exportedClass, exportResult, financialStatements, model); + return results; } @@ -236,12 +225,10 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); List<VatStatement> rootVatStatements = vatStatementService.getRootVatStatements(); - if (rootVatStatements != null) { - VatStatementModel model = new VatStatementModel(); - List<VatStatement> vatStatements = new ArrayList<>(); - getAllSubVATStatements(vatStatements, rootVatStatements); - processExport(charset, exportedClass, exportResult, vatStatements, model); - } + VatStatementModel model = new VatStatementModel(); + List<VatStatement> vatStatements = new ArrayList<>(); + getAllSubVATStatements(vatStatements, rootVatStatements); + processExport(charset, exportedClass, exportResult, vatStatements, model); return results; } @@ -282,10 +269,9 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); List<Account> accounts = accountService.getAllAccounts(); - if (accounts != null && !accounts.isEmpty()) { - AccountEBPModel model = new AccountEBPModel(); - processExport(charset, exportedClass, exportResult, accounts, model); - } + + AccountEBPModel model = new AccountEBPModel(); + processExport(charset, exportedClass, exportResult, accounts, model); return results; } @@ -296,12 +282,9 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); List<Entry> entries = getDaoHelper().getEntryDao().findAll(); - if (entries != null && !entries.isEmpty()) { - EntryEBPModel model = new EntryEBPModel(); - processExport(charset, exportedClass, exportResult, entries, model); - + EntryEBPModel model = new EntryEBPModel(); + processExport(charset, exportedClass, exportResult, entries, model); - } return results; } @@ -312,11 +295,8 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); - if (entryBooks != null && !entryBooks.isEmpty()) { - - EntryBookModel model = new EntryBookModel(); - processExport(charset, exportedClass, exportResult, entryBooks, model); - } + EntryBookModel model = new EntryBookModel(); + processExport(charset, exportedClass, exportResult, entryBooks, model); return results; } @@ -335,11 +315,8 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ entries.addAll(entriesAtNew); entries.addAll(entities); - if (!entries.isEmpty()) { - FiscalControlExportModel model = new FiscalControlExportModel(); - processExport(charset, exportedClass, exportResult, entities, model); - } - + FiscalControlExportModel model = new FiscalControlExportModel(); + processExport(charset, exportedClass, exportResult, entities, model); return exportResult; } -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 716dbd4737a4999cfb7c456c6f41f1e192ae3328 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:47:30 2017 +0100 refs #1380 ferme la boite de dialogue de mise en attente dans tous les cas --- .../src/main/java/org/chorem/lima/ui/importexport/ImportExport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index 299fa6b..8327202 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -358,9 +358,6 @@ public class ImportExport { log.debug("importMode : " + importMode); } - //hidde wait dialog panel - waitView.setVisible(false); - // display result dialog if (verboseMode) { ImportExportResults globalResult = get(); @@ -386,6 +383,9 @@ public class ImportExport { if (log.isErrorEnabled()) { log.error("Can't get result message", ex); } + } finally { + //hidde wait dialog panel + waitView.dispose(); } } }.execute(); -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 83f1431d7485920e3e0efd1416ed8c8de3324e9e Merge: d0115dd 716dbd4 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 22:48:26 2017 +0100 Merge branch 'feature/1380-terminate_export' into develop .../lima/business/ejb/ExportServiceImpl.java | 73 ++++++++-------------- .../chorem/lima/ui/importexport/ImportExport.java | 6 +- 2 files changed, 28 insertions(+), 51 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit cd622d7bcacf354d60efaefc0423ca93d3c188fd Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:13:38 2017 +0100 refs #1373 ajout et maj des captures d'écran --- .../screens/lima_charts_financialperiod.png | Bin 55293 -> 57813 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 36434 -> 32422 bytes src/site/resources/screens/lima_entries.png | Bin 37587 -> 37183 bytes src/site/resources/screens/lima_lettering.png | Bin 59893 -> 70752 bytes src/site/resources/screens/lima_open_account.png | Bin 26602 -> 31102 bytes src/site/resources/screens/lima_open_welcome.png | Bin 24208 -> 29635 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/resources/screens/lima_charts_financialperiod.png b/src/site/resources/screens/lima_charts_financialperiod.png index e3d00ce..957ee82 100644 Binary files a/src/site/resources/screens/lima_charts_financialperiod.png and b/src/site/resources/screens/lima_charts_financialperiod.png differ diff --git a/src/site/resources/screens/lima_charts_fiscalperiod.png b/src/site/resources/screens/lima_charts_fiscalperiod.png index 80b336c..6ce9e38 100644 Binary files a/src/site/resources/screens/lima_charts_fiscalperiod.png and b/src/site/resources/screens/lima_charts_fiscalperiod.png differ diff --git a/src/site/resources/screens/lima_entries.png b/src/site/resources/screens/lima_entries.png index 5f6d4fd..5998480 100644 Binary files a/src/site/resources/screens/lima_entries.png and b/src/site/resources/screens/lima_entries.png differ diff --git a/src/site/resources/screens/lima_lettering.png b/src/site/resources/screens/lima_lettering.png index d2083f4..a1afdb5 100644 Binary files a/src/site/resources/screens/lima_lettering.png and b/src/site/resources/screens/lima_lettering.png differ diff --git a/src/site/resources/screens/lima_open_account.png b/src/site/resources/screens/lima_open_account.png index f56a245..2ecffa9 100644 Binary files a/src/site/resources/screens/lima_open_account.png and b/src/site/resources/screens/lima_open_account.png differ diff --git a/src/site/resources/screens/lima_open_welcome.png b/src/site/resources/screens/lima_open_welcome.png index 90bee38..a2d6a10 100644 Binary files a/src/site/resources/screens/lima_open_welcome.png and b/src/site/resources/screens/lima_open_welcome.png differ -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit ced3805999287757ed5f6f8b2b3a9d0dae358cd9 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:17:11 2017 +0100 refs #1373 ajout de captures d'écran --- src/site/resources/screens/report_balance.png | Bin 0 -> 93093 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/resources/screens/report_balance.png b/src/site/resources/screens/report_balance.png new file mode 100644 index 0000000..d8ba1c3 Binary files /dev/null and b/src/site/resources/screens/report_balance.png differ -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit a04ad84b91b46a7195dea49d961b6ccd60bcdbf5 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:17:31 2017 +0100 refs #1373 ajout de captures d'écran --- src/site/resources/screens/report_bcr.png | Bin 0 -> 38765 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/resources/screens/report_bcr.png b/src/site/resources/screens/report_bcr.png new file mode 100644 index 0000000..ca22974 Binary files /dev/null and b/src/site/resources/screens/report_bcr.png differ -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 166d977425fbb45d873dba98d3aeea082c0bbdb2 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:18:47 2017 +0100 refs #1373 ajout de captures d'écran --- src/site/resources/screens/report_entrybook.png | Bin 0 -> 88753 bytes src/site/resources/screens/report_global_balance.png | Bin 0 -> 93848 bytes src/site/resources/screens/report_ledger.png | Bin 0 -> 102439 bytes src/site/resources/screens/report_vat.png | Bin 0 -> 75758 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/resources/screens/report_entrybook.png b/src/site/resources/screens/report_entrybook.png new file mode 100644 index 0000000..7f67039 Binary files /dev/null and b/src/site/resources/screens/report_entrybook.png differ diff --git a/src/site/resources/screens/report_global_balance.png b/src/site/resources/screens/report_global_balance.png new file mode 100644 index 0000000..aa10f7e Binary files /dev/null and b/src/site/resources/screens/report_global_balance.png differ diff --git a/src/site/resources/screens/report_ledger.png b/src/site/resources/screens/report_ledger.png new file mode 100644 index 0000000..7b4b498 Binary files /dev/null and b/src/site/resources/screens/report_ledger.png differ diff --git a/src/site/resources/screens/report_vat.png b/src/site/resources/screens/report_vat.png new file mode 100644 index 0000000..ad76358 Binary files /dev/null and b/src/site/resources/screens/report_vat.png differ -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 6a5a00180dcc2155abca10e1e18b2bfd483de61e Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:44:38 2017 +0100 refs #1373 modification du text de l'écran d'acceuil --- lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties | 2 +- lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index ae85c0b..57fc467 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -476,7 +476,7 @@ lima.opening.fiscalPeriod=Create fiscal period lima.opening.import=Import a ZIP backup lima.opening.next=Next lima.opening.previous=Previous -lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantly your already existing save in CSV format<br/><br/><br/><br/></center></html> +lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR backup Lima from a ZIP archive<br/><br/><br/><br/></center></html> lima.preferences=Preferences lima.quit=Exit lima.refresh=Refresh diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 6cf01e0..ffcc840 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -482,7 +482,7 @@ lima.opening.fiscalPeriod=Création de l'exercice lima.opening.import=Importer une sauvegarde ZIP lima.opening.next=Suivant lima.opening.previous=Retour -lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants <br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> +lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants<br/>Ou importez une sauvegarde de LIMA au format ZIP<br/><br/><br/><br/></center></html> lima.preferences=Préférences lima.quit=Quitter lima.refresh=Actualiser -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 18b778cf961a809f2214f70ce0031862b92b1771 Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 16:47:13 2017 +0100 refs #1373 modification du text de l'écran d'acceuil --- lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties | 2 +- lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- src/site/rst/assistant.rst | 6 ++++++ src/site/rst/install.rst | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 57fc467..253e77d 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -476,7 +476,7 @@ lima.opening.fiscalPeriod=Create fiscal period lima.opening.import=Import a ZIP backup lima.opening.next=Next lima.opening.previous=Previous -lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR backup Lima from a ZIP archive<br/><br/><br/><br/></center></html> +lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>oR backup Lima from a ZIP archive.<br/><br/><br/><br/></center></html> lima.preferences=Preferences lima.quit=Exit lima.refresh=Refresh diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index ffcc840..c7ea51f 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -482,7 +482,7 @@ lima.opening.fiscalPeriod=Création de l'exercice lima.opening.import=Importer une sauvegarde ZIP lima.opening.next=Suivant lima.opening.previous=Retour -lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants<br/>Ou importez une sauvegarde de LIMA au format ZIP<br/><br/><br/><br/></center></html> +lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants<br/>ou importez une sauvegarde de LIMA au format ZIP.<br/><br/><br/><br/></center></html> lima.preferences=Préférences lima.quit=Quitter lima.refresh=Actualiser diff --git a/src/site/rst/assistant.rst b/src/site/rst/assistant.rst index 97966f1..e72404c 100644 --- a/src/site/rst/assistant.rst +++ b/src/site/rst/assistant.rst @@ -33,6 +33,12 @@ Ou de fermer l'assistant pour créer sa comptabilité sans l'assistant. Les différentes étapes de l'assistant ------------------------------------- +Restauration +~~~~~~~~~~~~ + +Vous avez la possibilité de restaurer une sauvegarde. + + Fiche d'identité ~~~~~~~~~~~~~~~~ diff --git a/src/site/rst/install.rst b/src/site/rst/install.rst index b155843..cffd3a6 100644 --- a/src/site/rst/install.rst +++ b/src/site/rst/install.rst @@ -29,6 +29,8 @@ Installez Lima en quelques instants : Téléchargez l'archive au format zip sur **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`_. + Pour lancer l'application : - Sous Linux : via le script *lima* ou en ligne de commande *java -jar lima.jar* ; @@ -40,4 +42,5 @@ Pour lancer l'application : .. _`page de téléchargement`: http://chorem.org/projects/lima/files .. _`Java en version 7`: http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-18802... +.. _`Java en version 8`: http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-21331... -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit f5bdecb5bd145f43de9771fe672e4334e6573c8c Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 21:40:38 2017 +0100 refs #1373 renommage de fichier --- .../{lima_import_limaall.png => lima_import_lima_all.png} | Bin src/site/rst/importexport.rst | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/resources/screens/lima_import_limaall.png b/src/site/resources/screens/lima_import_lima_all.png similarity index 100% rename from src/site/resources/screens/lima_import_limaall.png rename to src/site/resources/screens/lima_import_lima_all.png diff --git a/src/site/rst/importexport.rst b/src/site/rst/importexport.rst index 3eadd61..bec04c5 100644 --- a/src/site/rst/importexport.rst +++ b/src/site/rst/importexport.rst @@ -46,10 +46,10 @@ Tous les contribuables Français qui tiennent leur comptabilité au moyen de sys Format CSV ---------- -La comptabilité de Lima peut-être sauvegardée en intégralité via la fonction +La comptabilité de Lima peut-être sauvegardée/retaurée en intégralité via la fonction Import -> Tout. Ou seulement le plan des comptes, le plan BCR ou les journaux. -.. image:: screens/lima_import_limaall.png +.. image:: screens/lima_import_lima_all.png +-------------------------------------------------------------------------------------------------------------+ | Structure des champs correspondant aux imports et export au format CSV Lima | -- 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 feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit ab2196c7dbd70f594c5f5b95791624010be9cc5b Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 21:41:29 2017 +0100 refs #1373 changement de text --- src/site/rst/assistant.rst | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/site/rst/assistant.rst b/src/site/rst/assistant.rst index e72404c..2b1108c 100644 --- a/src/site/rst/assistant.rst +++ b/src/site/rst/assistant.rst @@ -25,19 +25,17 @@ Assistant ========= Au premier démarrage de Lima un assistant vous guide pour créer votre comptabilité. -Il est également possible de charger une précédente sauvegarde de Lima au format CSV. -Dans le cas par exemple d'une réinstallation du logiciel. -Ou de fermer l'assistant pour créer sa comptabilité sans l'assistant. - +Il est également possible de charger une précédente sauvegarde de Lima au format ZIP. Les différentes étapes de l'assistant ------------------------------------- -Restauration -~~~~~~~~~~~~ +Acceuil +~~~~~~~ -Vous avez la possibilité de restaurer une sauvegarde. +Vous avez la possibilité de restaurer une sauvegarde ou continuer le processus de configuration de Lima. +.. image:: screens/lima_open_welcome.png Fiche d'identité ~~~~~~~~~~~~~~~~ @@ -84,7 +82,7 @@ Par défaut les quatres journaux les plus courants sont proposés au chargement - Caisse ; - Trésorerie. -Il est possible d'importer des jouranux depuis un fichier csv ou bien encore duis un fichier d'export généré par EBP. +Il est possible d'importer des jouranux depuis un fichier CSV ou encore depuis un fichier d'export généré par EBP. .. image:: screens/lima_open_entrybook.png @@ -96,8 +94,7 @@ peut-être supprimé ou sa date de début modifiée. .. image:: screens/lima_open_fiscalperiod.png - - -.. _`Import/Export`: ../importexport.html +.. +.. _`Import/Export`: importexport.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm