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 1e945cc refs #1162: Add all import results if there are no error adds ac28667 refs #769 merge de mes modification en cours adds 5e5d8f2 refs #769 création d'un nouveau module pour la partie web de lima et création du rapport balance avec jasper report adds faab6df refs #769 mise à jour des dépendances et des pom adds 94b7adb refs #769 nettoyage suite à la création du module web adds 7592a6d refs #769 affichage des montants sur les sous comptes adds dc86e67 refs #769 ajout du numéro de page en bas de page adds 52a5eb0 refs #769 modification du l'affichage des données du rapport de balance adds b39b384 refs #769 Ajout génération rappor Journal Général Provisoire adds c98fe93 refs #769 ajout d'un fichier adds 862b042 refs #769 génération des rapports pour journaux adds 2c66058 refs #769 correction sur rapports pour journaux adds 895be8f refs #769 correction sur rapports pour journaux adds b3a2a4f refs #769 ajout saut de page entre les différents journaux adds 2fc5766 refs #769 affichage correct des soldes de journaux adds b82fc56 refs #769 uniformasation des thèmes adds 4e1051d refs #769 path for generating report can be set through config file, it allows user to set it's own report builder file adds 801d27a refs #769 String -> Bigdecimal when there are numeric account values adds c34e00d refs #769 set BigDecimal format for general entry book report adds d93ebd0 refs #769 fix Balance report fill-up adds d7a7b32 refs #769 Mise à jour des rapports adds 8138d5b refs #769 services for Leger report adds 988f41d refs #769 Leger report generation adds ecf8a6c refs #769 amélioration sur la récupération et la mise à jour des paramètres adds c060107 refs #934 mise à jour version Topia adds 189a555 refs #769 fix in case of no identity is provided adds 5007fb8 refs #769 add general ledger report adds 5c96a75 Merge branch 'develop' into feature/newReportBuilder new d3b231b Merge remote-tracking branch 'origin/develop' into develop The 1 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 d3b231b33f897f9319f3ff31d9ea2c11033207fa Merge: 5c96a75 1e945cc Author: dcosse <japbiw74> Date: Mon Feb 9 09:33:30 2015 +0100 Merge remote-tracking branch 'origin/develop' into develop Summary of changes: .../chorem/lima/business/api/AccountService.java | 1 + .../api/ClosedPeriodicEntryBookService.java | 7 + .../chorem/lima/business/api/DocumentService.java | 48 - .../chorem/lima/business/api/EntryBookService.java | 7 + .../org/chorem/lima/business/api/EntryService.java | 22 + .../lima/business/api/HttpServerService.java | 31 - .../chorem/lima/business/api/OptionsService.java | 39 +- .../chorem/lima/business/api/ReportService.java | 2 +- .../report/BalanceReportService.java} | 23 +- .../api/report/GeneralEntryBookReportService.java | 21 + .../business/api/report/LedgerReportService.java | 20 + .../report/ProvisionalEntryBookReportService.java | 22 + lima-business/pom.xml | 53 +- .../lima/business/LimaConfigurationHelper.java | 22 + .../chorem/lima/business/LimaServiceConfig.java | 244 ++++- .../lima/business/ejb/AbstractLimaService.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 9 + .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 23 +- .../lima/business/ejb/DocumentServiceImpl.java | 985 --------------------- .../lima/business/ejb/EntryBookServiceImpl.java | 18 +- .../chorem/lima/business/ejb/EntryServiceImpl.java | 31 + .../lima/business/ejb/OptionsServiceImpl.java | 91 +- .../lima/business/ejb/ReportServiceImpl.java | 1 - .../ejb/report/BalanceReportServiceImpl.java | 222 +++++ .../report/GeneralEntryBookReportServiceImpl.java | 188 ++++ .../ejb/report/LedgerReportServiceImpl.java | 143 +++ .../ProvisionalEntryBookReportServiceImpl.java | 189 ++++ .../lima/business/utils}/BigDecimalToString.java | 28 +- .../chorem/lima/business/utils/DocumentsEnum.java | 2 +- .../java/org/chorem/lima/service/package-info.java | 27 - .../resources/i18n/lima-business_en_GB.properties | 14 + .../resources/i18n/lima-business_fr_FR.properties | 19 + .../org/chorem/lima/business/AbstractLimaTest.java | 476 ++++++++++ .../lima/business/EntryBookServiceImplTest.java | 9 +- .../src/test/resources/reports/AccountReport.jrxml | 144 +++ .../org/chorem/lima/beans/BalanceAccountImpl.java | 54 ++ .../java/org/chorem/lima/entity/EntryTopiaDao.java | 15 +- .../entity/LimaCallaoTopiaPersistenceContext.java | 6 +- .../org/chorem/lima/filter/FilterGenerator.java | 20 +- lima-callao/src/main/xmi/accounting-model.zargo | Bin 46061 -> 56954 bytes lima-swing/pom.xml | 15 + lima-swing/src/license/THIRD-PARTY.properties | 15 +- lima-swing/src/main/assembly/bin.xml | 4 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 38 +- .../src/main/java/org/chorem/lima/LimaSplash.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 153 +++- .../main/java/org/chorem/lima/ui/BetaLayerUI.java | 23 +- .../AccountCondition/AccountConditionView.css | 21 + .../BigDecimalConditionView.css | 21 + .../EntryBookConditionHandler.java | 2 +- .../EntryBookCondition/EntryBookConditionView.css | 21 + .../Filter/StringCondition/StringConditionView.css | 21 + .../ui/Filter/dateCondition/DateConditionView.css | 21 + .../DateIntervalConditionView.css | 21 + .../FinancialPeriodConditionHandler.java | 2 +- .../FinancialPeriodConditionView.css | 21 + .../FinancialTransactionConditionView.css | 21 + .../FiscalPeriodConditionHandler.java | 2 +- .../FiscalPeriodConditionView.css | 21 + .../java/org/chorem/lima/ui/MainViewHandler.java | 6 +- .../lima/ui/account/AccountTreeTableRenderer.java | 9 +- .../ui/celleditor/BigDecimalTableCellRenderer.java | 6 +- .../lima/ui/combobox/LetterComboBoxModel.java | 3 +- .../chorem/lima/ui/common/AccountListRenderer.java | 6 +- .../lima/ui/common/EntryBookListRenderer.java | 8 +- .../ui/common/FinancialPeriodListRenderer.java | 10 +- .../lima/ui/common/FiscalPeriodListRenderer.java | 10 +- .../lima/ui/common/GenericComboBoxModel.java | 3 +- .../FinancialPeriodViewHandler.java | 7 +- .../FinancialTransactionSearchTableModel.java | 2 +- .../FinancialTransactionSearchView.css | 21 + .../FinancialTransactionUnbalancedView.jaxx | 7 +- .../org/chorem/lima/ui/home/AbstractHomePane.java | 5 +- .../lima/ui/importexport/ImportExportWaitView.css | 21 + .../org/chorem/lima/ui/lettering/LetteringView.css | 21 + .../lima/ui/lettering/LetteringViewHandler.java | 13 +- .../lima/ui/lettering/LettringSelectionModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 7 +- .../org/chorem/lima/util/BigDecimalToString.java | 31 +- .../java/org/chorem/lima/util/ReportDialogView.css | 21 + .../org/chorem/lima/widgets/JWideComboBox.java | 5 +- .../chorem/lima/widgets/ScrollBasicComboPopup.java | 3 +- .../resources/i18n/lima-swing_en_GB.properties | 15 + .../resources/i18n/lima-swing_fr_FR.properties | 21 + .../src/main/resources/import/vat_shortened.csv | 2 +- .../java/org/chorem/lima/ui/AbstractLimaTest.java | 653 ++++++++++++++ .../java/org/chorem/lima/ui}/LimaTestsConfig.java | 3 +- .../lima/ui/account/AccountViewHandlerTest.java | 7 +- LICENSE.txt => lima-web/LICENSE.txt | 0 {lima-swing => lima-web}/README.txt | 0 {lima-business => lima-web}/pom.xml | 121 +-- .../src/license/THIRD-PARTY.properties | 14 +- .../src/main/assembly/bin.xml | 35 + .../src/main/assembly/lima-server | 0 .../balance/BalanceReportAccountReport.jrxml | 41 + .../balance/BalanceSubAccountsReport.jrxml | 383 ++++++++ .../jasperreports/balance/DocumentReport.jrxml | 275 ++++++ .../jasperreports/entryBook/DocumentReport.jrxml | 365 ++++++++ .../jasperreports/entryBook/EntryBookReport.jrxml | 109 +++ .../entryBook/FinancialPeriodReport.jrxml | 271 ++++++ .../entryBook/TransactionReport.jrxml | 297 +++++++ .../generalEntryBook/DocumentReport.jrxml | 320 +++++++ .../generalEntryBook/EntryBookPeriodReport.jrxml | 146 +++ .../GeneralEntryBookEntryReport.jrxml | 82 ++ .../generalLedger/DocumentReport.jrxml | 286 ++++++ .../generalLedger/GeneralLedgerEntryReport.jrxml | 252 ++++++ .../generalLedger/GeneralLedgerReport.jrxml | 189 ++++ .../src/main/java/org/chorem/lima/LimaServer.java | 2 +- .../org/chorem/lima/web/action/ReportBuilder.java | 97 ++ .../chorem/lima/web/service/DocumentService.java | 569 ++++++++++++ .../chorem/lima/web/service/HttpServerService.java | 108 +-- .../org/chorem/lima/web}/utils/DocumentsEnum.java | 8 +- .../main/resources/i18n/lima-web_en_GB.properties | 55 ++ .../main/resources/i18n/lima-web_fr_FR.properties | 55 ++ .../src/main/resources/images/accounts.png | Bin .../src/main/resources/images/entries.png | Bin .../src/main/resources/images/entrybooks.png | Bin .../src/main/resources/images/fiscalperiods.png | Bin .../src/main/resources/images/identity.png | Bin .../src/main/resources/images/puzzle_icon_mini.png | Bin .../src/main/resources/reports/vat_form_fr.pdf | Bin .../org/chorem/lima/web/action/ReportTest.java | 60 ++ ofbizNeogia/src/org/ofbiz/lima/AccountService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/EntryService.java | 7 +- ofbizNeogia/src/org/ofbiz/lima/JournalService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/PeriodService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/StatusService.java | 5 +- .../src/org/ofbiz/lima/TransactionService.java | 11 +- pom.xml | 73 +- 130 files changed, 7410 insertions(+), 1502 deletions(-) delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/HttpServerService.java copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions/BeforeFirstFiscalPeriodException.java => api/report/BalanceReportService.java} (58%) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java copy {lima-swing/src/main/java/org/chorem/lima/util => lima-business/src/main/java/org/chorem/lima/business/utils}/BigDecimalToString.java (54%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/service/package-info.java create mode 100644 lima-business/src/test/resources/reports/AccountReport.jrxml create mode 100644 lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java create mode 100644 lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java copy {lima-business/src/test/java/org/chorem/lima/business => lima-swing/src/test/java/org/chorem/lima/ui}/LimaTestsConfig.java (97%) copy LICENSE.txt => lima-web/LICENSE.txt (100%) copy {lima-swing => lima-web}/README.txt (100%) copy {lima-business => lima-web}/pom.xml (78%) copy {lima-business => lima-web}/src/license/THIRD-PARTY.properties (74%) rename {lima-business => lima-web}/src/main/assembly/bin.xml (66%) rename {lima-business => lima-web}/src/main/assembly/lima-server (100%) create mode 100644 lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml create mode 100644 lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml create mode 100644 lima-web/src/main/jasperreports/balance/DocumentReport.jrxml create mode 100644 lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml create mode 100644 lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml create mode 100644 lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml create mode 100644 lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalLedger/DocumentReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml create mode 100644 lima-web/src/main/jasperreports/generalLedger/GeneralLedgerReport.jrxml rename {lima-business => lima-web}/src/main/java/org/chorem/lima/LimaServer.java (98%) create mode 100644 lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java create mode 100644 lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java rename lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java => lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java (76%) copy {lima-business/src/main/java/org/chorem/lima/business => lima-web/src/main/java/org/chorem/lima/web}/utils/DocumentsEnum.java (85%) create mode 100644 lima-web/src/main/resources/i18n/lima-web_en_GB.properties create mode 100644 lima-web/src/main/resources/i18n/lima-web_fr_FR.properties rename {lima-business => lima-web}/src/main/resources/images/accounts.png (100%) rename {lima-business => lima-web}/src/main/resources/images/entries.png (100%) rename {lima-business => lima-web}/src/main/resources/images/entrybooks.png (100%) rename {lima-business => lima-web}/src/main/resources/images/fiscalperiods.png (100%) rename {lima-business => lima-web}/src/main/resources/images/identity.png (100%) rename {lima-business => lima-web}/src/main/resources/images/puzzle_icon_mini.png (100%) rename {lima-business => lima-web}/src/main/resources/reports/vat_form_fr.pdf (100%) create mode 100644 lima-web/src/test/java/org/chorem/lima/web/action/ReportTest.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.