This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from cb5581f fixes #1181 mettre à jour les traductions Merge branch 'feature/1181-internationalisation' into develop new d289283 correction des scopes de dépendances new fa9429a debut de correction sur les resources new 4c7a5a5 fixes #1184 Mise à jour du compilateur jasper. Les fichiers sources permettant la génération des rapports et déplacé dans la partie ressource du module web. Dans les fichiers Jasper contenant des sous rapports on ne passe plus le chemin vers les fichiers sources enfants mais on passe directement les rapports Jasper compilés. Correction de la génération du rapport du grand livre qui n'affichait ni les entetes de compte ni les soldes. new d85f38d fixes #1184 Ajout de commentaires et d'un fichier non précédement commité The 4 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 d85f38d1ff429b50b6fac14f190d5a53d93d57a6 Author: dcosse <cosse@codelutin.com> Date: Mon Mar 2 17:40:51 2015 +0100 fixes #1184 Ajout de commentaires et d'un fichier non précédement commité commit 4c7a5a54538b71cedf195be335a3a8c7f718d64b Author: dcosse <cosse@codelutin.com> Date: Mon Mar 2 17:17:35 2015 +0100 fixes #1184 Mise à jour du compilateur jasper. Les fichiers sources permettant la génération des rapports et déplacé dans la partie ressource du module web. Dans les fichiers Jasper contenant des sous rapports on ne passe plus le chemin vers les fichiers sources enfants mais on passe directement les rapports Jasper compilés. Correction de la génération du rapport du grand livre qui n'affichait ni les entetes de compte ni les soldes. commit fa9429a57ac26add223c8acb402397a3d065b1c4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 2 10:36:29 2015 +0100 debut de correction sur les resources commit d2892832e882cc29835bc9b17fcc322fc62cc822 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 2 09:14:36 2015 +0100 correction des scopes de dépendances Summary of changes: .../business/api/report/BalanceReportService.java | 8 +- .../api/report/GeneralEntryBookReportService.java | 11 +- .../business/api/report/LedgerReportService.java | 7 +- .../report/ProvisionalEntryBookReportService.java | 9 +- .../chorem/lima/business/LimaServiceConfig.java | 109 +++++++++++++++---- .../lima/business/ejb/ReportServiceImpl.java | 33 ++++-- .../ejb/report/BalanceReportServiceImpl.java | 11 +- .../report/GeneralEntryBookReportServiceImpl.java | 10 +- .../ejb/report/LedgerReportServiceImpl.java | 26 ++--- .../ProvisionalEntryBookReportServiceImpl.java | 20 +--- .../lima/business/utils/DocumentReportTypes.java | 23 ++++ .../chorem/lima/business/utils/DocumentsEnum.java | 11 +- lima-callao/pom.xml | 5 + lima-callao/src/main/xmi/accounting-model.zargo | Bin 56954 -> 57335 bytes lima-swing/pom.xml | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 26 +++-- .../src/main/java/org/chorem/lima/LimaMain.java | 5 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 35 +++--- .../org/chorem/lima/web/action/ReportBuilder.java | 117 ++++++++++++++++++--- .../chorem/lima/web/service/DocumentService.java | 41 ++++---- .../chorem/lima/web/service/HttpServerService.java | 11 +- .../balance/BalanceReportAccountReport.jrxml | 8 +- .../balance/BalanceSubAccountsReport.jrxml | 0 .../jasperreports/balance/DocumentReport.jrxml | 8 +- .../jasperreports/entryBook/DocumentReport.jrxml | 8 +- .../jasperreports/entryBook/EntryBookReport.jrxml | 8 +- .../entryBook/FinancialPeriodReport.jrxml | 10 +- .../entryBook/TransactionReport.jrxml | 4 +- .../generalEntryBook/DocumentReport.jrxml | 8 +- .../generalEntryBook/EntryBookPeriodReport.jrxml | 8 +- .../GeneralEntryBookEntryReport.jrxml | 4 +- .../generalLedger/DocumentReport.jrxml | 8 +- .../generalLedger/GeneralLedgerEntryReport.jrxml | 8 +- .../generalLedger/GeneralLedgerReport.jrxml | 41 +++----- pom.xml | 2 +- 35 files changed, 415 insertions(+), 234 deletions(-) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java rename lima-web/src/main/{ => resources}/jasperreports/balance/BalanceReportAccountReport.jrxml (87%) rename lima-web/src/main/{ => resources}/jasperreports/balance/BalanceSubAccountsReport.jrxml (100%) rename lima-web/src/main/{ => resources}/jasperreports/balance/DocumentReport.jrxml (97%) rename lima-web/src/main/{ => resources}/jasperreports/entryBook/DocumentReport.jrxml (98%) rename lima-web/src/main/{ => resources}/jasperreports/entryBook/EntryBookReport.jrxml (95%) rename lima-web/src/main/{ => resources}/jasperreports/entryBook/FinancialPeriodReport.jrxml (97%) rename lima-web/src/main/{ => resources}/jasperreports/entryBook/TransactionReport.jrxml (99%) rename lima-web/src/main/{ => resources}/jasperreports/generalEntryBook/DocumentReport.jrxml (98%) rename lima-web/src/main/{ => resources}/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml (96%) rename lima-web/src/main/{ => resources}/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml (97%) rename lima-web/src/main/{ => resources}/jasperreports/generalLedger/DocumentReport.jrxml (97%) rename lima-web/src/main/{ => resources}/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml (98%) rename lima-web/src/main/{ => resources}/jasperreports/generalLedger/GeneralLedgerReport.jrxml (85%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.