This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 96c285ba2c9245b0d82cb0aef4e703a9e7ce81b1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 4 12:37:29 2015 +0200 refs #1176 : mise a jours des impressions d'écrans. et correction --- .../src/main/java/org/chorem/lima/ui/MainView.css | 2 +- src/site/procedure.txt | 15 ++ src/site/resources/extras/exemple_ecritures.csv | 162 +++++++++------------ src/site/resources/screens/export_ebp_1.png | Bin 114103 -> 94362 bytes src/site/resources/screens/export_ebp_2.png | Bin 17856 -> 8139 bytes src/site/resources/screens/export_ebp_3.png | Bin 71482 -> 54392 bytes src/site/resources/screens/export_ebp_4.png | Bin 24204 -> 14348 bytes src/site/resources/screens/export_ebp_5.png | Bin 30588 -> 14741 bytes src/site/resources/screens/export_ebp_6.png | Bin 26990 -> 11937 bytes src/site/resources/screens/export_ebp_7.png | Bin 17221 -> 6030 bytes .../resources/screens/lima_charts_accounts.png | Bin 133980 -> 66178 bytes .../resources/screens/lima_charts_entrybooks.png | Bin 43275 -> 34352 bytes .../screens/lima_charts_financialperiod.png | Bin 136544 -> 55293 bytes .../screens/lima_charts_financialstatement.png | Bin 92981 -> 53248 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 53467 -> 36434 bytes src/site/resources/screens/lima_entries.png | Bin 140056 -> 37587 bytes .../resources/screens/lima_financialstatement.png | Bin 71670 -> 66083 bytes src/site/resources/screens/lima_home.png | Bin 50198 -> 36968 bytes src/site/resources/screens/lima_import_charset.png | Bin 56032 -> 42025 bytes src/site/resources/screens/lima_import_limaall.png | Bin 64072 -> 46841 bytes .../resources/screens/lima_incorrectEntries.png | Bin 110247 -> 30473 bytes src/site/resources/screens/lima_open_account.png | Bin 39308 -> 26602 bytes src/site/resources/screens/lima_open_entrybook.png | Bin 31108 -> 21208 bytes .../resources/screens/lima_open_fiscalperiod.png | Bin 28827 -> 19797 bytes src/site/resources/screens/lima_open_identity.png | Bin 31849 -> 27903 bytes src/site/resources/screens/lima_open_welcome.png | Bin 35463 -> 24208 bytes .../resources/screens/lima_reports_accounts.png | Bin 64174 -> 38541 bytes .../resources/screens/lima_reports_balance.png | Bin 56936 -> 34936 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 61887 -> 0 bytes .../screens/lima_reports_financialstatement.png | Bin 57424 -> 0 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 57008 -> 0 bytes src/site/resources/screens/lima_searchEntry.png | Bin 66603 -> 47531 bytes .../resources/screens/lima_searchtransaction.png | Bin 93053 -> 0 bytes src/site/rst/assistant.rst | 18 +-- src/site/rst/features.rst | 31 +--- src/site/rst/install.rst | 4 +- 36 files changed, 101 insertions(+), 131 deletions(-) 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 186f683..dbf81c5 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 @@ -24,7 +24,7 @@ title : "lima.title"; width : 1024; height : 768; - minimumSize : {new Dimension(320,240)}; + minimumSize : {new Dimension(800 ,500)}; resizable : true; extendedState : "{this.MAXIMIZED_BOTH}" ; iconImage : "puzzle_icon.png"; diff --git a/src/site/procedure.txt b/src/site/procedure.txt new file mode 100644 index 0000000..87486cd --- /dev/null +++ b/src/site/procedure.txt @@ -0,0 +1,15 @@ +Ce doccument décrit comment réalisé les impréssion d'écran de Lima pour la documentation + +- Decoration de fenêtre : Système XFCE avec le style Greybird + +- Fond d'écran : Blanc (FFFFFF) + +- Taille de fenêtre : 800 par 500 (modifier la taille minimale dans org/chorem/lima/ui/MainView.css ) + +- Garder une marge de 20px autour de la fenêtre pour affiché les ombres + +- Données : exercices 01/01/2014 au 31/12/2014 et 01/01/2015 au 31/12/2015 + plan comptable abgrégé + journaux par défaut + importé le fichier des écritures "src/site/resources/extras/exemple_ecritures.csv" + diff --git a/src/site/resources/extras/exemple_ecritures.csv b/src/site/resources/extras/exemple_ecritures.csv index ba4296a..2b26497 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;financialTransaction;voucher;account;description;amount;debit +23/03/2014;VTE;0;fact 2;707;vente de poisson;60.0;N +23/03/2014;VTE;0;fact 2;410;vente de poisson;60.0;O +23/03/2014;BQE;1;fact 2;410;encaissement vente;60.0;N +23/03/2014;BQE;1;fact 2;530;encaissement vente;60.0;O +23/03/2014;VTE;2;fact 1;707;vente de poisson;40.0;N +23/03/2014;VTE;2;fact 1;410;vente de poisson;40.0;O +23/03/2014;ODT;3;fact 700;633;impot et taxe;10.0;O +23/03/2014;ODT;3;fact 700;400;impot et taxe;10.0;N +23/04/2014;ACH;4;fact 715;607;achat de poisson;10.0;O +23/04/2014;ACH;4;fact 715;400;achat de poisson;10.0;N +23/04/2014;BQE;5;fact 715;400;achat de poisson;10.0;O +23/04/2014;BQE;5;fact 715;530;achat de poisson;10.0;N +23/04/2014;ACH;6;fact 738;607;achat de poisson;30.0;O +23/04/2014;ACH;6;fact 738;400;achat de poisson;30.0;N +23/04/2014;BQE;7;fact 738;400;achat de poisson;30.0;O +23/04/2014;BQE;7;fact 738;530;achat de poisson;30.0;N +23/03/2014;BQE;8;fact 700;400;impot et taxe;10.0;O +23/03/2014;BQE;8;fact 700;530;impot et taxe;10.0;N +23/05/2014;BQE;9;piece de caisse;400;réglements facts 326 532 603;50.0;O +23/05/2014;BQE;9;piece de caisse;530;réglements facts 326 532 603;50.0;N +23/05/2014;ACH;10;fact 801;606;achat de glace;20.0;O +23/05/2014;ACH;10;fact 801;400;achat de glace;20.0;N +23/05/2014;BQE;11;fact 801;400;achat de fourniture;20.0;O +23/05/2014;BQE;11;fact 801;530;achat de fourniture;20.0;N +23/05/2014;ACH;12;fact 5328;215;achat frigo;30.0;O +23/05/2014;ACH;12;fact 5328;400;achat frigo;30.0;N +23/05/2014;BQE;13;piece de caisse;400;reglement;20.0;O +23/05/2014;BQE;13;piece de caisse;530;reglement;20.0;N +23/06/2014;VTE;14;fact 5;707;ventede poisson;80.0;N +23/06/2014;VTE;14;fact 5;410;ventede poisson;80.0;O +23/06/2014;BQE;15;fact 1;410;reglement;40.0;N +23/06/2014;BQE;15;fact 1;530;reglement;40.0;O +07/01/2014;ODT;16;statuts;215;Machine;40.0;O +07/01/2014;ODT;16;statuts;213;Magasin;100.0;O +07/01/2014;ODT;16;statuts;101;Capital;200.0;N +07/01/2014;ODT;16;statuts;218;Camionnette;50.0;O +07/01/2014;ODT;16;statuts;530;Caisse;10.0;O +23/04/2014;BQE;17;fact 4;410;vente de poisson;50.0;N +23/04/2014;BQE;17;fact 4;530;vente de poisson;50.0;O +23/06/2014;VTE;18;fact 6;707;vente de poisson;20.0;N +23/06/2014;VTE;18;fact 6;410;vente de poisson;20.0;O +23/04/2014;BQE;19;fact 3;410;vente de poisson;20.0;N +23/04/2014;BQE;19;fact 3;530;vente de poisson;20.0;O +23/06/2014;ACH;20;fact 910;607;achat de poisson;50.0;O +23/06/2014;ACH;20;fact 910;400;achat de poisson;50.0;N +23/04/2014;VTE;21;fact 3;707;vente de poisson;20.0;N +23/04/2014;VTE;21;fact 3;410;vente de poisson;20.0;O +17/02/2014;ACH;22;FACT 603;607;Achat poisson port de Lorient;10.0;O +17/02/2014;ACH;22;FACT 603;400;Achat poisson port de Lorient;10.0;N +23/07/2014;ODT;23;inventaire;68112;dotation aux amortissements;10.0;O +23/07/2014;ODT;23;inventaire;281;amortissement du matériel de transport;10.0;N +28/02/2014;ACH;24;FACT 532;607;Achat poisson port de Lorient;30.0;O +28/02/2014;ACH;24;FACT 532;400;Achat poisson port de Lorient;30.0;N +28/02/2014;ACH;25;FACT 326;607;Achat poisson port de Lorient;10.0;O +28/02/2014;ACH;25;FACT 326;400;Achat poisson port de Lorient;10.0;N +23/04/2014;VTE;26;fact 4;707;vente de poisson;50.0;N +23/04/2014;VTE;26;fact 4;410;vente de poisson;50.0;O +23/06/2014;ACH;27;fact 011475;601;achat de sachet;20.0;O +23/06/2014;ACH;27;fact 011475;400;achat de sachet;20.0;N +23/06/2014;BQE;28;fact 011475;400;achat de sachet - réglement;20.0;O +23/06/2014;BQE;28;fact 011475;530;achat de sachet - réglement;20.0;N +30/07/2014;ODT;29;inventaire;326;stock sachet;10.0;O +30/07/2014;ODT;29;inventaire;6031;variation de stocks sachet;10.0;N +30/07/2014;ODT;30;inventaire;6411;charges de personnel;10.0;O +30/07/2014;ODT;30;inventaire;530;paiement personel - caisse;10.0;N diff --git a/src/site/resources/screens/export_ebp_1.png b/src/site/resources/screens/export_ebp_1.png index d47d2b0..5428fb2 100644 Binary files a/src/site/resources/screens/export_ebp_1.png and b/src/site/resources/screens/export_ebp_1.png differ diff --git a/src/site/resources/screens/export_ebp_2.png b/src/site/resources/screens/export_ebp_2.png index aa6cf10..6ca19f9 100644 Binary files a/src/site/resources/screens/export_ebp_2.png and b/src/site/resources/screens/export_ebp_2.png differ diff --git a/src/site/resources/screens/export_ebp_3.png b/src/site/resources/screens/export_ebp_3.png index 47a2cf6..ecce7fe 100644 Binary files a/src/site/resources/screens/export_ebp_3.png and b/src/site/resources/screens/export_ebp_3.png differ diff --git a/src/site/resources/screens/export_ebp_4.png b/src/site/resources/screens/export_ebp_4.png index 59c1e5c..90c9f7a 100644 Binary files a/src/site/resources/screens/export_ebp_4.png and b/src/site/resources/screens/export_ebp_4.png differ diff --git a/src/site/resources/screens/export_ebp_5.png b/src/site/resources/screens/export_ebp_5.png index 9c24e24..a8f15ff 100644 Binary files a/src/site/resources/screens/export_ebp_5.png and b/src/site/resources/screens/export_ebp_5.png differ diff --git a/src/site/resources/screens/export_ebp_6.png b/src/site/resources/screens/export_ebp_6.png index 72fb807..3ffc205 100644 Binary files a/src/site/resources/screens/export_ebp_6.png and b/src/site/resources/screens/export_ebp_6.png differ diff --git a/src/site/resources/screens/export_ebp_7.png b/src/site/resources/screens/export_ebp_7.png index afe5c7d..6ab8bad 100644 Binary files a/src/site/resources/screens/export_ebp_7.png and b/src/site/resources/screens/export_ebp_7.png differ diff --git a/src/site/resources/screens/lima_charts_accounts.png b/src/site/resources/screens/lima_charts_accounts.png index 233413f..244103e 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..ac7f243 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..e3d00ce 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..f2ce264 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..80b336c 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..5f6d4fd 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..30ed642 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..6298c4e 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_import_charset.png b/src/site/resources/screens/lima_import_charset.png index 43814c3..1850653 100644 Binary files a/src/site/resources/screens/lima_import_charset.png and b/src/site/resources/screens/lima_import_charset.png differ diff --git a/src/site/resources/screens/lima_import_limaall.png b/src/site/resources/screens/lima_import_limaall.png index 33ededb..ba7a9f0 100644 Binary files a/src/site/resources/screens/lima_import_limaall.png and b/src/site/resources/screens/lima_import_limaall.png differ diff --git a/src/site/resources/screens/lima_incorrectEntries.png b/src/site/resources/screens/lima_incorrectEntries.png index 2627c11..98447a7 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_open_account.png b/src/site/resources/screens/lima_open_account.png index dfec7f3..f56a245 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_entrybook.png b/src/site/resources/screens/lima_open_entrybook.png index c7f32a6..6ca91a3 100644 Binary files a/src/site/resources/screens/lima_open_entrybook.png and b/src/site/resources/screens/lima_open_entrybook.png differ diff --git a/src/site/resources/screens/lima_open_fiscalperiod.png b/src/site/resources/screens/lima_open_fiscalperiod.png index c6f1507..50f7791 100644 Binary files a/src/site/resources/screens/lima_open_fiscalperiod.png and b/src/site/resources/screens/lima_open_fiscalperiod.png differ diff --git a/src/site/resources/screens/lima_open_identity.png b/src/site/resources/screens/lima_open_identity.png index 79cd6db..c4b7543 100644 Binary files a/src/site/resources/screens/lima_open_identity.png and b/src/site/resources/screens/lima_open_identity.png differ diff --git a/src/site/resources/screens/lima_open_welcome.png b/src/site/resources/screens/lima_open_welcome.png index ca61cbf..90bee38 100644 Binary files a/src/site/resources/screens/lima_open_welcome.png and b/src/site/resources/screens/lima_open_welcome.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_reports_entrybooks.png b/src/site/resources/screens/lima_reports_entrybooks.png deleted file mode 100644 index c3f6eea..0000000 Binary files a/src/site/resources/screens/lima_reports_entrybooks.png and /dev/null differ diff --git a/src/site/resources/screens/lima_reports_financialstatement.png b/src/site/resources/screens/lima_reports_financialstatement.png deleted file mode 100644 index 40a4db4..0000000 Binary files a/src/site/resources/screens/lima_reports_financialstatement.png and /dev/null differ diff --git a/src/site/resources/screens/lima_reports_ledger.png b/src/site/resources/screens/lima_reports_ledger.png deleted file mode 100644 index 478dcbc..0000000 Binary files a/src/site/resources/screens/lima_reports_ledger.png and /dev/null differ diff --git a/src/site/resources/screens/lima_searchEntry.png b/src/site/resources/screens/lima_searchEntry.png index 57668fa..a8097d7 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/resources/screens/lima_searchtransaction.png b/src/site/resources/screens/lima_searchtransaction.png deleted file mode 100644 index 640c7c7..0000000 Binary files a/src/site/resources/screens/lima_searchtransaction.png and /dev/null 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>.