branch feature/1176 created (now 56cfe4a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git at 56cfe4a refs #1176 : mise a jour de la documentation This branch includes the following new commits: new 3d4c252 Hide close tab button if you cannot close the tab new 1bc0d5c fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale new 56cfe4a refs #1176 : mise a jour de la documentation The 3 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 56cfe4a7f7efd1950a379c53deb15d8bccd85052 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 7 12:09:32 2015 +0200 refs #1176 : mise a jour de la documentation commit 1bc0d5c212e33c81e96382233ca10535d8a8e87e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 17:17:53 2015 +0100 fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale commit 3d4c252504714214486079d1283d13ce030148e7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 Hide close tab button if you cannot close the tab -- 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/1176 in repository lima. See http://git.chorem.org/lima.git commit 3d4c252504714214486079d1283d13ce030148e7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 Hide close tab button if you cannot close the tab --- .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../java/org/chorem/lima/ui/ClosableTabHeader.css | 2 + .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 6 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 275 +++++++++++++++++---- .../java/org/chorem/lima/ui/MainViewHandler.java | 1 + 5 files changed, 227 insertions(+), 58 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index d39ab37..4cec550 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -35,6 +35,7 @@ import org.chorem.lima.ui.opening.OpeningView; import javax.swing.*; import java.util.Arrays; import java.util.Date; +import java.util.Locale; import static org.nuiton.i18n.I18n.t; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css index 25fb9e4..712b8b9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css @@ -26,6 +26,7 @@ #label { opaque : false; font-size : 12; + text : {getTitle()}; } #closeTab { @@ -33,4 +34,5 @@ border : {BorderFactory.createEmptyBorder()}; focusPainted : false; actionIcon : closeTab; + visible: {isCanClose()}; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx index 061aa0a..3a94b7c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx @@ -29,8 +29,6 @@ <Boolean id="canClose" javaBean='true'/> - <JLabel id='label' - text='{getTitle()}'/> - <JButton id='closeTab' - enabled='{isCanClose()}'/> + <JLabel id='label'/> + <JButton id='closeTab'/> </JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css index 06b2b89..d08d492 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css @@ -21,79 +21,246 @@ */ #mainView { - title : "lima.title"; - width : 1024; - height : 768; - minimumSize : {new Dimension(320,240)}; - resizable : true; - extendedState : "{this.MAXIMIZED_BOTH}" ; - iconImage : "puzzle_icon.png"; + title : "lima.title"; + width : 1024; + height : 768; + minimumSize : {new Dimension(320,240)}; + resizable : true; + extendedState : "{this.MAXIMIZED_BOTH}" ; + iconImage : "puzzle_icon.png"; } -#file{ text : "lima.file"; mnemonic : "F"; } +#file{ + text : "lima.file"; + mnemonic : "F"; +} + +#csv { + text : "lima.importExport.csv"; +} + +#csvImport { + text : "lima.importExport.import"; + actionIcon : "import"; +} + +#csvImportAll { + text : "lima.importExport.all"; +} + +#csvImportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#csvImportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#csvImportFinancialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} + +#csvImportVatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} + +#csvImportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#csvExport { + text : "lima.importExport.export"; + actionIcon : "export"; +} + +#csvExportAll { + text : "lima.importExport.all"; +} + +#csvExportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#csvExportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#csvExportFinancialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} + +#csvExportVatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} + +#csvExportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#ebp { + text : "lima.importExport.ebp"; +} + +#ebpImport { + text : "lima.importExport.import"; + actionIcon : "import"; +} + +#ebpImportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#ebpImportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#ebpImportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#ebpExport { + text : "lima.importExport.export"; + actionIcon : "export"; +} + +#ebpExportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#ebpExportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#ebpExportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#documents { + text : "lima.documents" +} + +#identity { + text : "lima.identity"; + actionIcon : "identity"; +} + +#preferences { + text : "lima.preferences"; + actionIcon : "config"; +} + +#quit { + text : "lima.quit"; + actionIcon : "quit"; + mnemonic : "Q"; +} -#csv { text : "lima.importExport.csv"; } +#structure { + text : "lima.structure"; + mnemonic : "S"; +} -#csvImport { text : "lima.importExport.import"; actionIcon : "import"; } -#csvImportAll { text : "lima.importExport.all"; } -#csvImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#csvImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#csvImportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#csvImportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } -#csvImportEntries { text : "lima.entries"; actionIcon : "entries" } +#accounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} -#csvExport { text : "lima.importExport.export"; actionIcon : "export"; } -#csvExportAll { text : "lima.importExport.all"; } -#csvExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#csvExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#csvExportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#csvExportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } -#csvExportEntries { text : "lima.entries"; actionIcon : "entries" } +#entryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} +#fiscalYears { + text : "lima.fiscalYears"; + actionIcon : "fiscalPeriods"; +} -#ebp { text : "lima.importExport.ebp"; } +#financialPeriods { + text : "lima.financialPeriods"; + actionIcon : "financialPeriods"; +} -#ebpImport { text : "lima.importExport.import"; actionIcon : "import"; } -#ebpImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#ebpImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#ebpImportEntries { text : "lima.entries"; actionIcon : "entries" } +#financialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} -#ebpExport { text : "lima.importExport.export"; actionIcon : "export"; } -#ebpExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#ebpExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#ebpExportEntries { text : "lima.entries"; actionIcon : "entries" } +#vatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} -#documents { text : "lima.documents" } -#identity { text : "lima.identity"; actionIcon : "identity"; } -#preferences { text : "lima.preferences"; actionIcon : "config"; } -#quit { text : "lima.quit"; actionIcon : "quit"; mnemonic : "Q"; } +#enter { + text : "lima.entries"; + mnemonic : "E"; +} +#entries { + text : "lima.entries.enter"; + actionIcon : "entries"; +} -#structure { text : "lima.structure"; mnemonic : "S"; } +#unbalanced { + text : "lima.entries.unbalanced"; + actionIcon : "entries-unbalanced"; +} -#accounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#entryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#fiscalYears { text : "lima.fiscalYears"; actionIcon : "fiscalPeriods"; } -#financialPeriods { text : "lima.financialPeriods"; actionIcon : "financialPeriods"; } -#financialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#vatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } +#search { + text : "lima.entries.search"; + actionIcon : "entries-search"; +} +#lettering { + text : "lima.entries.lettering"; + actionIcon : "lettering"; +} -#enter { text : "lima.entries"; mnemonic : "E"; } +#help { + text : "lima.help"; + mnemonic : "H"; +} -#entries { text : "lima.entries.enter"; actionIcon : "entries"; } -#unbalanced { text : "lima.entries.unbalanced"; actionIcon : "entries-unbalanced"; } -#search { text : "lima.entries.search"; actionIcon : "entries-search"; } -#lettering { text : "lima.entries.lettering"; actionIcon : "lettering"; } +#site { + text : "lima.help.site"; + actionIcon : "site"; +} +#about { + text : "lima.help.about"; + actionIcon : "about"; +} -#help { text : "lima.help"; mnemonic : "H"; } +#i18n { + text : "lima.help.i18n"; + actionIcon : "translate"; + mnemonic : "L"; +} + +#fr { + text : "lima.help.i18n.fr"; + actionIcon : "i18n-fr"; +} -#site { text : "lima.help.site"; actionIcon : "site"; } -#about { text : "lima.help.about"; actionIcon : "about"; } -#i18n { text : "lima.help.i18n"; actionIcon : "translate"; mnemonic : "L"; } -#fr { text : "lima.help.i18n.fr"; actionIcon : "i18n-fr"; } -#uk { text : "lima.help.i18n.uk"; actionIcon : "i18n-uk"; } +#uk { + text : "lima.help.i18n.uk"; + actionIcon : "i18n-uk"; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index a1dd428..6612a25 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -70,6 +70,7 @@ import java.net.URI; import java.net.URL; import java.util.Locale; +import static org.nuiton.i18n.I18n.setDefaultLocale; import static org.nuiton.i18n.I18n.t; /** -- 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/1176 in repository lima. See http://git.chorem.org/lima.git commit 1bc0d5c212e33c81e96382233ca10535d8a8e87e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 17:17:53 2015 +0100 fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale --- .../FinancialTransactionSearchView.jaxx | 5 +++-- .../FinancialTransactionSearchViewHandler.java | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx index d2a4965..269e4a7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx @@ -92,8 +92,9 @@ </JToolBar> <JSplitPane constraints="BorderLayout.CENTER" - orientation='{JSplitPane.VERTICAL_SPLIT}'> - <JScrollPane> + orientation='{JSplitPane.VERTICAL_SPLIT}' + id="financialTransactionSplitpane"> + <JScrollPane id="financialTransactionConditionScrollPane"> <FinancialTransactionConditionView id="financialTransactionConditionView" /> </JScrollPane> <JScrollPane> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java index 37119d1..d0936fb 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java @@ -88,7 +88,7 @@ public class FinancialTransactionSearchViewHandler { // add action on F5 binding = "refresh"; - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0) , binding); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), binding); actionMap.put(binding, new AbstractAction() { private static final long serialVersionUID = 5877340693755869036L; @@ -103,6 +103,17 @@ public class FinancialTransactionSearchViewHandler { FinancialTransactionConditionView filterView = view.getFinancialTransactionConditionView(); FinancialTransactionConditionHandler handler = filterView.getHandler(); handler.addCondition(conditionHandler); + + // cf #1193 La zone des critères de recherche apparait réduite, + // les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale + JSplitPane financialTransactionSplitpane = view.getFinancialTransactionSplitpane(); + int dividerLocation = financialTransactionSplitpane.getDividerLocation(); + + int height = view.getFinancialTransactionConditionScrollPane().getPreferredSize().height + 5; + if (dividerLocation < height) { + financialTransactionSplitpane.setDividerLocation(height); + } + view.validate(); view.repaint(); } -- 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/1176 in repository lima. See http://git.chorem.org/lima.git commit 56cfe4a7f7efd1950a379c53deb15d8bccd85052 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 7 12:09:32 2015 +0200 refs #1176 : mise a jour de la documentation --- src/site/resources/extras/exemple_ecritures.csv | 162 +++++++++------------ .../resources/screens/lima_charts_accounts.png | Bin 133980 -> 61792 bytes .../resources/screens/lima_charts_entrybooks.png | Bin 43275 -> 38145 bytes .../screens/lima_charts_financialperiod.png | Bin 136544 -> 86110 bytes .../screens/lima_charts_financialstatement.png | Bin 92981 -> 94567 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 53467 -> 38747 bytes src/site/resources/screens/lima_entries.png | Bin 140056 -> 72215 bytes .../resources/screens/lima_financialstatement.png | Bin 71670 -> 78172 bytes src/site/resources/screens/lima_home.png | Bin 50198 -> 48068 bytes .../resources/screens/lima_incorrectEntries.png | Bin 110247 -> 35914 bytes src/site/resources/screens/lima_lettering.png | Bin 170873 -> 40778 bytes .../resources/screens/lima_reports_accounts.png | Bin 64174 -> 38541 bytes .../resources/screens/lima_reports_balance.png | Bin 56936 -> 34936 bytes src/site/resources/screens/lima_searchEntry.png | Bin 66603 -> 63811 bytes src/site/rst/assistant.rst | 18 +-- src/site/rst/features.rst | 31 +--- src/site/rst/install.rst | 4 +- 17 files changed, 85 insertions(+), 130 deletions(-) diff --git a/src/site/resources/extras/exemple_ecritures.csv b/src/site/resources/extras/exemple_ecritures.csv index ba4296a..95a7435 100644 --- a/src/site/resources/extras/exemple_ecritures.csv +++ b/src/site/resources/extras/exemple_ecritures.csv @@ -1,96 +1,66 @@ -"FTRC";"0";"23,03,2010 00:00:00";"60.0";"60.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"VTE" -"NTRY";"0";"vente de poisson";"60.0";"false";"";;"fact 2";;"707" -"NTRY";"0";"vente de poisson";"60.0";"true";"";;"fact 2";;"410" -"FTRC";"1";"23,03,2010 00:00:00";"60.0";"60.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"BQE" -"NTRY";"1";"encaissement vente";"60.0";"false";"";;"fact 2";;"410" -"NTRY";"1";"encaissement vente";"60.0";"true";"";;"fact 2";;"530" -"FTRC";"2";"23,03,2010 00:00:00";"40.0";"40.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"VTE" -"NTRY";"2";"vente de poisson";"40.0";"false";"";;"fact 1";;"707" -"NTRY";"2";"vente de poisson";"40.0";"true";"";;"fact 1";;"410" -"FTRC";"3";"23,03,2010 00:00:00";"10.0";"10.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"ODT" -"NTRY";"3";"impot et taxe";"10.0";"true";"";;"fact 700";;"633" -"NTRY";"3";"impot et taxe";"10.0";"false";"";;"fact 700";;"400" -"FTRC";"4";"23,04,2010 00:00:00";"10.0";"10.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"ACH" -"NTRY";"4";"achat de poisson";"10.0";"true";"";;"fact 715";;"607" -"NTRY";"4";"achat de poisson";"10.0";"false";"";;"fact 715";;"400" -"FTRC";"5";"23,04,2010 00:00:00";"10.0";"10.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE" -"NTRY";"5";"achat de poisson";"10.0";"true";"";;"fact 715";;"400" -"NTRY";"5";"achat de poisson";"10.0";"false";"";;"fact 715";;"530" -"FTRC";"6";"23,04,2010 00:00:00";"30.0";"30.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"ACH" -"NTRY";"6";"achat de poisson";"30.0";"true";"";;"fact 738";;"607" -"NTRY";"6";"achat de poisson";"30.0";"false";"";;"fact 738";;"400" -"FTRC";"7";"23,04,2010 00:00:00";"30.0";"30.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE" -"NTRY";"7";"achat de poisson";"30.0";"true";"";;"fact 738";;"400" -"NTRY";"7";"achat de poisson";"30.0";"false";"";;"fact 738";;"530" -"FTRC";"8";"23,03,2010 00:00:00";"10.0";"10.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"BQE" -"NTRY";"8";"impot et taxe";"10.0";"true";"";;"fact 700";;"400" -"NTRY";"8";"impot et taxe";"10.0";"false";"";;"fact 700";;"530" -"FTRC";"9";"23,05,2010 00:00:00";"50.0";"50.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE" -"NTRY";"9";"réglements facts 326 532 603";"50.0";"true";"";;"piece de caisse";;"400" -"NTRY";"9";"réglements facts 326 532 603";"50.0";"false";"";;"piece de caisse";;"530" -"FTRC";"10";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"ACH" -"NTRY";"10";"achat de glace";"20.0";"true";"";;"fact 801";;"606" -"NTRY";"10";"achat de glace";"20.0";"false";"";;"fact 801";;"400" -"FTRC";"11";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE" -"NTRY";"11";"achat de fourniture";"20.0";"true";"";;"fact 801";;"400" -"NTRY";"11";"achat de fourniture";"20.0";"false";"";;"fact 801";;"530" -"FTRC";"12";"23,05,2010 00:00:00";"30.0";"30.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"ACH" -"NTRY";"12";"achat frigo";"30.0";"true";"";;"fact 5328";;"215" -"NTRY";"12";"achat frigo";"30.0";"false";"";;"fact 5328";;"400" -"FTRC";"13";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE" -"NTRY";"13";"reglement";"20.0";"true";"";;"piece de caisse";;"400" -"NTRY";"13";"reglement";"20.0";"false";"";;"piece de caisse";;"530" -"FTRC";"14";"23,06,2010 00:00:00";"80.0";"80.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"VTE" -"NTRY";"14";"ventede poisson";"80.0";"false";"";;"fact 5";;"707" -"NTRY";"14";"ventede poisson";"80.0";"true";"";;"fact 5";;"410" -"FTRC";"15";"23,06,2010 00:00:00";"40.0";"40.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"BQE" -"NTRY";"15";"reglement";"40.0";"false";"";;"fact 1";;"410" -"NTRY";"15";"reglement";"40.0";"true";"";;"fact 1";;"530" -"FTRC";"16";"07,01,2010 00:00:00";"200.0";"200.0";"01,01,2010 00:00:00";"31,01,2010 23:59:59";"ODT" -"NTRY";"16";"Machine";"40.0";"true";"";;"statuts";;"215" -"NTRY";"16";"Magasin";"100.0";"true";"";;"statuts";;"213" -"NTRY";"16";"Capital";"200.0";"false";"";;"statuts";;"101" -"NTRY";"16";"Camionnette";"50.0";"true";"";;"statuts";;"218" -"NTRY";"16";"Caisse";"10.0";"true";"";;"statuts";;"530" -"FTRC";"17";"23,04,2010 00:00:00";"50.0";"50.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE" -"NTRY";"17";"vente de poisson";"50.0";"false";"";;"fact 4";;"410" -"NTRY";"17";"vente de poisson";"50.0";"true";"";;"fact 4";;"530" -"FTRC";"18";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"VTE" -"NTRY";"18";"vente de poisson";"20.0";"false";"";;"fact 6";;"707" -"NTRY";"18";"vente de poisson";"20.0";"true";"";;"fact 6";;"410" -"FTRC";"19";"23,04,2010 00:00:00";"20.0";"20.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE" -"NTRY";"19";"vente de poisson";"20.0";"false";"";;"fact 3";;"410" -"NTRY";"19";"vente de poisson";"20.0";"true";"";;"fact 3";;"530" -"FTRC";"20";"23,06,2010 00:00:00";"50.0";"50.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"ACH" -"NTRY";"20";"achat de poisson";"50.0";"true";"";;"fact 910";;"607" -"NTRY";"20";"achat de poisson";"50.0";"false";"";;"fact 910";;"400" -"FTRC";"21";"23,04,2010 00:00:00";"20.0";"20.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"VTE" -"NTRY";"21";"vente de poisson";"20.0";"false";"";;"fact 3";;"707" -"NTRY";"21";"vente de poisson";"20.0";"true";"";;"fact 3";;"410" -"FTRC";"22";"17,02,2010 00:00:00";"10.0";"10.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH" -"NTRY";"22";"Achat poisson port de Lorient";"10.0";"true";"";;"FACT 603";;"607" -"NTRY";"22";"Achat poisson port de Lorient";"10.0";"false";"";;"FACT 603";;"400" -"FTRC";"23";"23,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT" -"NTRY";"23";"dotation aux amortissements";"10.0";"true";"";;"inventaire";;"68112" -"NTRY";"23";"amortissement du matériel de transport";"10.0";"false";"";;"inventaire";;"281" -"FTRC";"24";"28,02,2010 00:00:00";"30.0";"30.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH" -"NTRY";"24";"Achat poisson port de Lorient";"30.0";"true";;;"FACT 532";;"607" -"NTRY";"24";"Achat poisson port de Lorient";"30.0";"false";;;"FACT 532";;"400" -"FTRC";"25";"28,02,2010 00:00:00";"10.0";"10.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH" -"NTRY";"25";"Achat poisson port de Lorient";"10.0";"true";;;"FACT 326";;"607" -"NTRY";"25";"Achat poisson port de Lorient";"10.0";"false";;;"FACT 326";;"400" -"FTRC";"26";"23,04,2010 00:00:00";"50.0";"50.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"VTE" -"NTRY";"26";"vente de poisson";"50.0";"false";;;"fact 4";;"707" -"NTRY";"26";"vente de poisson";"50.0";"true";;;"fact 4";;"410" -"FTRC";"27";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"ACH" -"NTRY";"27";"achat de sachet";"20.0";"true";;;"fact 011475";;"601" -"NTRY";"27";"achat de sachet";"20.0";"false";;;"fact 011475";;"400" -"FTRC";"28";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"BQE" -"NTRY";"28";"achat de sachet - réglement";"20.0";"true";"";;"fact 011475";;"400" -"NTRY";"28";"achat de sachet - réglement";"20.0";"false";"";;"fact 011475";;"530" -"FTRC";"29";"30,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT" -"NTRY";"29";"stock sachet";"10.0";"true";;;"inventaire";;"326" -"NTRY";"29";"variation de stocks sachet";"10.0";"false";;;"inventaire";;"6031" -"FTRC";"30";"30,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT" -"NTRY";"30";"charges de personnel";"10.0";"true";;;"inventaire";;"6411" -"NTRY";"30";"paiement personel - caisse";"10.0";"false";;;"inventaire";;"530" +date;entryBook;transactionId;voucher;account;detail;amount;debit +23/03/14;VTE;0;fact 2;707;vente de poisson;60.0;N +23/03/14;VTE;0;fact 2;410;vente de poisson;60.0;O +23/03/14;BQE;1;fact 2;410;encaissement vente;60.0;N +23/03/14;BQE;1;fact 2;530;encaissement vente;60.0;O +23/03/14;VTE;2;fact 1;707;vente de poisson;40.0;N +23/03/14;VTE;2;fact 1;410;vente de poisson;40.0;O +23/03/14;ODT;3;fact 700;633;impot et taxe;10.0;O +23/03/14;ODT;3;fact 700;400;impot et taxe;10.0;N +23/04/14;ACH;4;fact 715;607;achat de poisson;10.0;O +23/04/14;ACH;4;fact 715;400;achat de poisson;10.0;N +23/04/14;BQE;5;fact 715;400;achat de poisson;10.0;O +23/04/14;BQE;5;fact 715;530;achat de poisson;10.0;N +23/04/14;ACH;6;fact 738;607;achat de poisson;30.0;O +23/04/14;ACH;6;fact 738;400;achat de poisson;30.0;N +23/04/14;BQE;7;fact 738;400;achat de poisson;30.0;O +23/04/14;BQE;7;fact 738;530;achat de poisson;30.0;N +23/03/14;BQE;8;fact 700;400;impot et taxe;10.0;O +23/03/14;BQE;8;fact 700;530;impot et taxe;10.0;N +23/05/14;BQE;9;piece de caisse;400;réglements facts 326 532 603;50.0;O +23/05/14;BQE;9;piece de caisse;530;réglements facts 326 532 603;50.0;N +23/05/14;ACH;10;fact 801;606;achat de glace;20.0;O +23/05/14;ACH;10;fact 801;400;achat de glace;20.0;N +23/05/14;BQE;11;fact 801;400;achat de fourniture;20.0;O +23/05/14;BQE;11;fact 801;530;achat de fourniture;20.0;N +23/05/14;ACH;12;fact 5328;215;achat frigo;30.0;O +23/05/14;ACH;12;fact 5328;400;achat frigo;30.0;N +23/05/14;BQE;13;piece de caisse;400;reglement;20.0;O +23/05/14;BQE;13;piece de caisse;530;reglement;20.0;N +23/06/14;VTE;14;fact 5;707;ventede poisson;80.0;N +23/06/14;VTE;14;fact 5;410;ventede poisson;80.0;O +23/06/14;BQE;15;fact 1;410;reglement;40.0;N +23/06/14;BQE;15;fact 1;530;reglement;40.0;O +07/01/14;ODT;16;statuts;215;Machine;40.0;O +07/01/14;ODT;16;statuts;213;Magasin;100.0;O +07/01/14;ODT;16;statuts;101;Capital;200.0;N +07/01/14;ODT;16;statuts;218;Camionnette;50.0;O +07/01/14;ODT;16;statuts;530;Caisse;10.0;O +23/04/14;BQE;17;fact 4;410;vente de poisson;50.0;N +23/04/14;BQE;17;fact 4;530;vente de poisson;50.0;O +23/06/14;VTE;18;fact 6;707;vente de poisson;20.0;N +23/06/14;VTE;18;fact 6;410;vente de poisson;20.0;O +23/04/14;BQE;19;fact 3;410;vente de poisson;20.0;N +23/04/14;BQE;19;fact 3;530;vente de poisson;20.0;O +23/06/14;ACH;20;fact 910;607;achat de poisson;50.0;O +23/06/14;ACH;20;fact 910;400;achat de poisson;50.0;N +23/04/14;VTE;21;fact 3;707;vente de poisson;20.0;N +23/04/14;VTE;21;fact 3;410;vente de poisson;20.0;O +17/02/14;ACH;22;FACT 603;607;Achat poisson port de Lorient;10.0;O +17/02/14;ACH;22;FACT 603;400;Achat poisson port de Lorient;10.0;N +23/07/14;ODT;23;inventaire;68112;dotation aux amortissements;10.0;O +23/07/14;ODT;23;inventaire;281;amortissement du matériel de transport;10.0;N +28/02/14;ACH;24;FACT 532;607;Achat poisson port de Lorient;30.0;O +28/02/14;ACH;24;FACT 532;400;Achat poisson port de Lorient;30.0;N +28/02/14;ACH;25;FACT 326;607;Achat poisson port de Lorient;10.0;O +28/02/14;ACH;25;FACT 326;400;Achat poisson port de Lorient;10.0;N +23/04/14;VTE;26;fact 4;707;vente de poisson;50.0;N +23/04/14;VTE;26;fact 4;410;vente de poisson;50.0;O +23/06/14;ACH;27;fact 011475;601;achat de sachet;20.0;O +23/06/14;ACH;27;fact 011475;400;achat de sachet;20.0;N +23/06/14;BQE;28;fact 011475;400;achat de sachet - réglement;20.0;O +23/06/14;BQE;28;fact 011475;530;achat de sachet - réglement;20.0;N +30/07/14;ODT;29;inventaire;326;stock sachet;10.0;O +30/07/14;ODT;29;inventaire;6031;variation de stocks sachet;10.0;N +30/07/14;ODT;30;inventaire;6411;charges de personnel;10.0;O +30/07/14;ODT;30;inventaire;530;paiement personel - caisse;10.0;N diff --git a/src/site/resources/screens/lima_charts_accounts.png b/src/site/resources/screens/lima_charts_accounts.png index 233413f..bafc009 100644 Binary files a/src/site/resources/screens/lima_charts_accounts.png and b/src/site/resources/screens/lima_charts_accounts.png differ diff --git a/src/site/resources/screens/lima_charts_entrybooks.png b/src/site/resources/screens/lima_charts_entrybooks.png index 5ca0b6b..4f4a40d 100644 Binary files a/src/site/resources/screens/lima_charts_entrybooks.png and b/src/site/resources/screens/lima_charts_entrybooks.png differ diff --git a/src/site/resources/screens/lima_charts_financialperiod.png b/src/site/resources/screens/lima_charts_financialperiod.png index 722f1e8..df3ff75 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_financialstatement.png b/src/site/resources/screens/lima_charts_financialstatement.png index e1f9d32..ecadff2 100644 Binary files a/src/site/resources/screens/lima_charts_financialstatement.png and b/src/site/resources/screens/lima_charts_financialstatement.png differ diff --git a/src/site/resources/screens/lima_charts_fiscalperiod.png b/src/site/resources/screens/lima_charts_fiscalperiod.png index 3b775c9..907a36f 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 59aa451..da426f4 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_financialstatement.png b/src/site/resources/screens/lima_financialstatement.png index 27019bc..5de4817 100644 Binary files a/src/site/resources/screens/lima_financialstatement.png and b/src/site/resources/screens/lima_financialstatement.png differ diff --git a/src/site/resources/screens/lima_home.png b/src/site/resources/screens/lima_home.png index d0d6d11..82c7725 100644 Binary files a/src/site/resources/screens/lima_home.png and b/src/site/resources/screens/lima_home.png differ diff --git a/src/site/resources/screens/lima_incorrectEntries.png b/src/site/resources/screens/lima_incorrectEntries.png index 2627c11..924eee6 100644 Binary files a/src/site/resources/screens/lima_incorrectEntries.png and b/src/site/resources/screens/lima_incorrectEntries.png differ diff --git a/src/site/resources/screens/lima_lettering.png b/src/site/resources/screens/lima_lettering.png index 799c394..6c69592 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_reports_accounts.png b/src/site/resources/screens/lima_reports_accounts.png index 8bb7612..b548d41 100644 Binary files a/src/site/resources/screens/lima_reports_accounts.png and b/src/site/resources/screens/lima_reports_accounts.png differ diff --git a/src/site/resources/screens/lima_reports_balance.png b/src/site/resources/screens/lima_reports_balance.png index 21f3324..a91a6e8 100644 Binary files a/src/site/resources/screens/lima_reports_balance.png and b/src/site/resources/screens/lima_reports_balance.png differ diff --git a/src/site/resources/screens/lima_searchEntry.png b/src/site/resources/screens/lima_searchEntry.png index 57668fa..62a4408 100644 Binary files a/src/site/resources/screens/lima_searchEntry.png and b/src/site/resources/screens/lima_searchEntry.png differ diff --git a/src/site/rst/assistant.rst b/src/site/rst/assistant.rst index cdaa830..cf03e39 100644 --- a/src/site/rst/assistant.rst +++ b/src/site/rst/assistant.rst @@ -58,8 +58,7 @@ Ce plan comptable est modifiable à volonté : ajout, modification, suppression Menu Structure -> Plan comptable Il est également possible d'importer un plan comptable au format Lima CSV, ou provenant -du logiciel EBP. Pour plus d'information sur le format d'import/export EBP. -(Cf. `IMPORT-EXPORT`_) +du logiciel EBP. Pour plus d'information sur les imports et les exports Lima, vous pouvez consulter la page `Import/Export`_. Lors de l'import d'un plan comptable abregé, de base, ou développé. Le générateur de bilan / compte de résultat, charge le plan de passage des compte au poste @@ -73,10 +72,11 @@ Journaux Par défaut les quatres journaux les plus courants sont proposés au chargement : -- achat ; -- vente ; -- opérations diverses ; -- trésorerie. +- Achat ; +- Vente ; +- Opérations diverses ; +- Caisse ; +- Trésorerie. Il est possible d'ajouter, modifier et supprimer des journaux en fonction de votre activité. Menu Structure -> Journaux @@ -86,13 +86,13 @@ Menu Structure -> Journaux Exercice ~~~~~~~~ -Séléctionner la date et fin du nouvel exercice, une fois crée un exercice ne -peut-être supprimé ou sa date modifiée. +Séléctionner la date de début et de fin du nouvel exercice, une fois crée un exercice ne +peut-être supprimé ou sa date de début modifiée. .. image:: screens/lima_open_fiscalperiod.png -.. _`IMPORT-EXPORT`: ../importexport.rst +.. _`Import/Export`: ../importexport.html diff --git a/src/site/rst/features.rst b/src/site/rst/features.rst index 2b85098..5c9f745 100644 --- a/src/site/rst/features.rst +++ b/src/site/rst/features.rst @@ -68,7 +68,7 @@ La partie traitement regroupe les fonctions utiles au quotidien : - Recherche -.. image:: screens/lima_searchtransaction.png +.. image:: screens/lima_searchEntry.png - Lettrage @@ -77,34 +77,19 @@ La partie traitement regroupe les fonctions utiles au quotidien : Rapports ~~~~~~~~ -Permet de visualiser les documents usuels de la comptabilité : +Permet de visualiser les documents usuels de la comptabilité. +Ils sont atteignables via un site internet embarqué par le menu de Lima 'Fichier -> Documents...' . -- Journal +.. image:: screens/lima_reports_accounts.png -.. image:: screens/lima_reports_entrybooks.png +Les documents disponibles sont : - Comptes - -.. image:: screens/lima_reports_accounts.png - - Balance - -.. image:: screens/lima_reports_balance.png - -- Grand-livre - -.. image:: screens/lima_reports_ledger.png - +- Journal - Bilan et compte de résultat - -.. image:: screens/lima_reports_financialstatement.png - -- TVA - -.. image:: screens/lima_reports_vat.png - - -Les documents sont atteignables par les menu de Lima et via un site internet embarqué. +- Journal Général +- Grand-livre Import / Export ~~~~~~~~~~~~~~~ diff --git a/src/site/rst/install.rst b/src/site/rst/install.rst index 40bbc3d..b155843 100644 --- a/src/site/rst/install.rst +++ b/src/site/rst/install.rst @@ -27,13 +27,13 @@ Installer et lancer Lima Installez Lima en quelques instants : Téléchargez l'archive au format zip sur la `page de téléchargement`_ puis décompressez le fichier téléchargé. -**Attention:** La version 0.6 de Lima nécessite `Java en version 7`_. +**Attention:** Depuis la version 0.6 de Lima nécessite `Java en version 7`_. Pour lancer l'application : - Sous Linux : via le script *lima* ou en ligne de commande *java -jar lima.jar* ; - Sous Mac OS X : en double-cliquant sur le jar *lima.jar* ; -- Sous Windows : en double-cliquant sur l'éxécutable *lima.exe*. +- Sous Windows : en double-cliquant sur le script *lima.bat*. .. image:: screens/lima_splashscreen.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm