- Chorem-commits - mailman.cloud.codelutin.com

branch master updated (8d27e63 -> 67ec711)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository chorem. See http://git.chorem.org/chorem.git from 8d27e63 Merge branch 'release/0.3.1' adds a9caf06 [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development adds ee89c24 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a097986 Merge branch 'master' into develop adds 4e47cc6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e41f78b fixes #1153 : Mauvaises informations dans le tunnel de commande adds 32ed258 fixes #1154 : Erreur graphique sur le nom de projet dans le tunnel de commande, onglet Sent adds 0869812 fixes #1155 : Incohérences dans les tableaux de facturation adds 19fbc52 Fix refactoring adds 3108193 fixes #1156 : Dans le tunnel de commande, le mauvais devis est supprimé de la liste Sent adds ad12bdc refs #1155 : Commit forgotten file adds a728d75 some upgrade adds 3fa1595 is expense account page cuter ? adds 1b5889e Fix too quick angularjs update -> copy ui-date into sources and allowGlobals on salesFunnel module adds 920e649 Fix pom before release adds 21af656 Migration sous gitlab adds 5ae40d1 Merge branch 'develop' of gitlab.nuiton.org:chorem/chorem into develop adds 4784937 httpS adds 725570c Fix module parent version adds c6f5413 Mise à jour de la configuration du site adds 5d8d0fd Fix licences adds 268e77a [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development adds d399f98 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions adds 0f4e67d [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions adds 67ec711 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' No new revisions were added by this update. Summary of changes: chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 17 ++- .../financial/AccountBillingReportAction.java | 6 +- .../financial/BillingPerAccountReportAction.java | 74 ++++++---- .../financial/BillingPerProjectReportAction.java | 96 ++++++++----- .../financial/ProjectBillingReportAction.java | 6 +- .../actions/sales/AccountSalesReportAction.java | 6 +- .../actions/sales/ProjectSalesReportAction.java | 6 +- .../chorem/webmotion/actions/sales/SalesData.java | 18 +-- .../actions/sales/SalesPerAccountReportAction.java | 2 +- .../actions/sales/SalesPerProjectReportAction.java | 2 +- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 6 +- .../jsp/financial/expenseAccountEntryEdit.html | 1 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 62 ++++---- .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 6 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 17 +-- chorem-webmotion/src/main/webapp/js/ui-date.js | 158 +++++++++++++++++++++ pom.xml | 41 +++--- src/site/site.xml | 13 +- 20 files changed, 376 insertions(+), 165 deletions(-) create mode 100644 chorem-webmotion/src/main/webapp/js/ui-date.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/05: [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 0f4e67dda3210f783a98f2ea029f460f9ea8218c Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:40:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index bf18569..d4d70ee 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2-SNAPSHOT</version> + <version>0.3.2</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 009dca5..69bf1cd 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2-SNAPSHOT</version> + <version>0.3.2</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index a866163..48a8b1d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2-SNAPSHOT</version> + <version>0.3.2</version> <packaging>pom</packaging> <name>Chorem</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[ANN] - Chorem 0.3.2 released
by chorem.org Release Notification 04 Feb '16

04 Feb '16

The Chorem team is pleased to announce the chorem-0.3.2 release! Project management Documentation of the project can be found here: http://chorem.chorem.org Changes ------- Changes in this version include: Fixed Bugs: o Mauvaises informations dans le tunnel de commande Issue: 1153. Thanks to Jean Couteau. Resolved by jcouteau. o Erreur graphique sur le nom de projet dans le tunnel de commande, onglet Sent Issue: 1154. Thanks to Jean Couteau. Resolved by jcouteau. o Incohérences dans les tableaux de facturation Issue: 1155. Thanks to Jean Couteau. Resolved by jcouteau. o Dans le tunnel de commande, le mauvais devis est supprimé de la liste Sent Issue: 1156. Thanks to Jean Couteau. Resolved by jcouteau. Downloads --------- For a manual installation, you can download files here: https://forge.chorem.org/projects/chorem/files * chorem-webmotion-0.3.2.war - https://forge.chorem.org/attachments/download/219 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Chorem team

1 0

branch release/0.3.2 created (now d399f98)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/0.3.2 in repository chorem. See http://git.chorem.org/chorem.git at d399f98 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions This branch includes the following new commits: new 268e77a [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development new d399f98 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions The 2 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 d399f984130d64bfc72354f474f61b9361fd41cd Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:35:35 2016 +0100 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions commit 268e77adf8c199bab5ed7a496e07fc23a65fefc2 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:33:33 2016 +0100 [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (5d8d0fd -> 268e77a)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 5d8d0fd Fix licences new 268e77a [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development 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 268e77adf8c199bab5ed7a496e07fc23a65fefc2 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:33:33 2016 +0100 [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development Summary of changes: chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (c6f5413 -> 5d8d0fd)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from c6f5413 Mise à jour de la configuration du site new 5d8d0fd Fix licences 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 5d8d0fd2112f7fc220fbd8ad62098810877f4c56 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Feb 4 14:44:24 2016 +0100 Fix licences Summary of changes: chorem-webmotion/src/license/THIRD-PARTY.properties | 17 ++++++++--------- chorem-webmotion/src/main/webapp/js/ui-date.js | 3 ++- 2 files changed, 10 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (725570c -> c6f5413)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 725570c Fix module parent version new c6f5413 Mise à jour de la configuration du site 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 c6f541387af9ab15a6960e939d636a99cbaa373a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 4 12:21:44 2016 +0100 Mise à jour de la configuration du site Summary of changes: pom.xml | 3 ++- src/site/site.xml | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (4784937 -> 725570c)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 4784937 httpS new 725570c Fix module parent version 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 725570cc9e01e2274a4e31b1778094e66cb6d49d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 4 12:17:25 2016 +0100 Fix module parent version Summary of changes: chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (5ae40d1 -> 4784937)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 5ae40d1 Merge branch 'develop' of gitlab.nuiton.org:chorem/chorem into develop new 4784937 httpS 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 478493715c830328a0f7bffd2861bba59a27c742 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Feb 4 11:46:00 2016 +0100 httpS Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (21af656 -> 5ae40d1)
by chorem.org scm 04 Feb '16

04 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 21af656 Migration sous gitlab new 920e649 Fix pom before release new 5ae40d1 Merge branch 'develop' of gitlab.nuiton.org:chorem/chorem into develop The 2 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 5ae40d14d74ee22c872d63645454a7c30159361d Merge: 920e649 21af656 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Feb 4 11:38:40 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:chorem/chorem into develop commit 920e649de5c96098363dce2837aa769fc55b8855 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Feb 4 11:33:36 2016 +0100 Fix pom before release Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2