branch develop updated (a091a07 -> c834d79)
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 a091a07 [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development new b6d8ad4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4c76397 prepare release 0.8.1 new 215ef70 [jgitflow-maven-plugin]updating poms for branch'release/0.8.1' with non-snapshot versions new 953e04b Merge branch 'release/0.8.1' new 67a1114 Merge branch 'master' into develop new c834d79 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 c834d793c56ee0fe08bb37a4da9f238ca96f2854 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:23 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 67a1114bbddcfff3a28fe493316e767a424b8dc3 Merge: b6d8ad4 953e04b Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:22 2015 +0000 Merge branch 'master' into develop commit b6d8ad4739ca888ffa585f0f50ed8bc083b5cde3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:22 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 953e04b8a1450df12c205070415ff4eb81a24d66 Merge: b5c8f29 215ef70 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:20 2015 +0000 Merge branch 'release/0.8.1' commit 215ef70fe1fa4cf9cac2d139dde962cbdc1c7d33 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:06:22 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.8.1' with non-snapshot versions commit 4c7639756f9141b4f6e7557c674236dfbc9ab25d Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:06:14 2015 +0000 prepare release 0.8.1 Summary of changes: .../lima/business/utils/DocumentReportTypes.java | 22 ++++++++++++++++++++++ .../resources/i18n/lima-business_en_GB.properties | 1 + .../resources/i18n/lima-business_fr_FR.properties | 1 + .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + 5 files changed, 26 insertions(+) -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 4c7639756f9141b4f6e7557c674236dfbc9ab25d Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:06:14 2015 +0000 prepare release 0.8.1 --- .../lima/business/utils/DocumentReportTypes.java | 22 ++++++++++++++++++++++ .../resources/i18n/lima-business_en_GB.properties | 1 + .../resources/i18n/lima-business_fr_FR.properties | 1 + .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + 5 files changed, 26 insertions(+) diff --git a/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java index 11cae94..3bac31f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java +++ b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.utils; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2015 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by davidcosse on 02/03/15. diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index cb7f451..7245b4d 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -1,4 +1,5 @@ application.version=Version +blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-business.document.account=Account lima-business.document.accounts=Accounts lima-business.document.address=Address diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index 3df07d9..8d32a20 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -1,4 +1,5 @@ application.version=Version +blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-business.document.account=Compte lima-business.document.accounts=Comptes lima-business.document.address=Adresse 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 7e44fda..3bdaec0 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 @@ -1,3 +1,4 @@ +blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.account=Account lima.account.add=Add account (Ctrl+A) lima.account.add.error.InvalidAccountNumber=Invalid account number\:%1$s 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 c3f9a48..73550e7 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 @@ -1,3 +1,4 @@ +blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.account=Compte lima.account.add=Nouveau compte (Ctrl+A) lima.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 215ef70fe1fa4cf9cac2d139dde962cbdc1c7d33 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:06:22 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.8.1' with non-snapshot versions --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-swing/pom.xml | 2 +- lima-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 587ff2d..a6748b0 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index df0df61..b9facc6 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index 7dbdcc3..ec418ea 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index eab1929..9839412 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-web/pom.xml b/lima-web/pom.xml index cb9a356..660f4ad 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index c8c296c..07a0143 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> <packaging>pom</packaging> <name>Lima</name> -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 953e04b8a1450df12c205070415ff4eb81a24d66 Merge: b5c8f29 215ef70 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:20 2015 +0000 Merge branch 'release/0.8.1' lima-business-api/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 20 +- .../business/api/report/BalanceReportService.java | 8 +- .../api/report/GeneralEntryBookReportService.java | 11 +- .../business/api/report/LedgerReportService.java | 7 +- .../report/ProvisionalEntryBookReportService.java | 9 +- lima-business/pom.xml | 10 +- lima-business/src/license/THIRD-PARTY.properties | 22 +- .../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 | 35 +- .../chorem/lima/business/utils/DocumentsEnum.java | 11 +- .../resources/i18n/lima-business_en_GB.properties | 133 +--- .../resources/i18n/lima-business_fr_FR.properties | 119 +--- lima-callao/pom.xml | 7 +- lima-callao/src/license/THIRD-PARTY.properties | 20 +- .../resources/i18n/lima-callao_en_GB.properties | 31 +- lima-callao/src/main/xmi/accounting-model.zargo | Bin 56954 -> 57335 bytes lima-swing/pom.xml | 15 +- lima-swing/src/license/THIRD-PARTY.properties | 26 +- .../src/main/java/org/chorem/lima/LimaMain.java | 5 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 33 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 22 +- .../resources/i18n/lima-swing_en_GB.properties | 673 +++++++++++---------- .../resources/i18n/lima-swing_fr_FR.properties | 8 +- .../src/main/resources/lima-config.properties | 2 +- lima-web/pom.xml | 11 +- lima-web/src/license/THIRD-PARTY.properties | 20 +- .../org/chorem/lima/web/action/ReportBuilder.java | 117 +++- .../chorem/lima/web/service/DocumentService.java | 49 +- .../chorem/lima/web/service/HttpServerService.java | 11 +- .../main/resources/i18n/lima-web_en_GB.properties | 5 + .../main/resources/i18n/lima-web_fr_FR.properties | 5 + .../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 | 4 +- 51 files changed, 937 insertions(+), 850 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 develop in repository lima. See http://git.chorem.org/lima.git commit b6d8ad4739ca888ffa585f0f50ed8bc083b5cde3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:22 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-swing/pom.xml | 2 +- lima-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index b6891aa..a6748b0 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 36844a0..b9facc6 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index fa23405..ec418ea 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 0c50419..9839412 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 62e5957..660f4ad 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index 1b8ffd5..07a0143 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8.1</version> <packaging>pom</packaging> <name>Lima</name> -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 67a1114bbddcfff3a28fe493316e767a424b8dc3 Merge: b6d8ad4 953e04b Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:22 2015 +0000 Merge branch 'master' into develop .../lima/business/utils/DocumentReportTypes.java | 22 ++++++++++++++++++++++ .../resources/i18n/lima-business_en_GB.properties | 1 + .../resources/i18n/lima-business_fr_FR.properties | 1 + .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + 5 files changed, 26 insertions(+) -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit c834d793c56ee0fe08bb37a4da9f238ca96f2854 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 3 19:09:23 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-swing/pom.xml | 2 +- lima-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index a6748b0..b6891aa 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index b9facc6..36844a0 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index ec418ea..fa23405 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 9839412..0c50419 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 660f4ad..62e5957 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index 07a0143..1b8ffd5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.1</version> + <version>0.9-SNAPSHOT</version> <packaging>pom</packaging> <name>Lima</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm