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

branch master updated (67ec711 -> 6d1b46e)
by chorem.org scm 08 Feb '16

08 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 67ec711 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' adds 84bfe5f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e5fe9c3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 965a77e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9858179 refs #1313 Fix BillingPerProject report adds 79a93ec refs #1313 : Fix BillingPerAccount report adds b847cbe Organise imports adds 85e3a92 refs #1313 : Fix account billing report adds 5908028 refs #1313 : Fix project billing report adds d0ddcd5 refs #1313 : Add total on account billing report adds 929d3e1 Merge branch 'feature/1313' into develop adds 556b732 [jgitflow-maven-plugin]updating poms for 0.3.3 branch with snapshot versions adds 5eac43e [jgitflow-maven-plugin]updating poms for branch'release/0.3.3' with non-snapshot versions adds 6d1b46e [jgitflow-maven-plugin]merging 'release/0.3.3' into 'master' No new revisions were added by this update. Summary of changes: chorem-entities/pom.xml | 2 +- .../src/main/java/org/chorem/ChoremQueryMaker.java | 13 ++++ chorem-webmotion/pom.xml | 2 +- .../financial/AccountBillingReportAction.java | 32 +++++--- .../financial/BillingPerAccountReportAction.java | 90 +++++++++++++++++----- .../financial/BillingPerProjectReportAction.java | 44 ++++++++--- .../financial/ProjectBillingReportAction.java | 31 +++++--- chorem-webmotion/src/main/resources/mapping | 2 +- .../jsp/financial/reports/accountBillingReport.jsp | 6 +- .../financial/reports/billingPerAccountReport.jsp | 4 + .../financial/reports/billingPerProjectReport.jsp | 6 +- .../jsp/financial/reports/projectBillingReport.jsp | 6 +- pom.xml | 4 +- 13 files changed, 183 insertions(+), 59 deletions(-) -- 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.3 released
by chorem.org Release Notification 08 Feb '16

08 Feb '16

The Chorem team is pleased to announce the chorem-0.3.3 release! Project management Documentation of the project can be found here: http://chorem.chorem.org Changes ------- Changes in this version include: Fixed Bugs: o Les rapports de facturation donnent des informations incohérentes Issue: 1313. 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.3.war - https://forge.chorem.org/attachments/download/220 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.3 created (now 556b732)
by chorem.org scm 08 Feb '16

08 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/0.3.3 in repository chorem. See http://git.chorem.org/chorem.git at 556b732 [jgitflow-maven-plugin]updating poms for 0.3.3 branch with snapshot versions This branch includes the following new commits: new 556b732 [jgitflow-maven-plugin]updating poms for 0.3.3 branch with snapshot versions 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 556b73237324ad4aff5bf75284e4a758c0bd5309 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 8 09:13:26 2016 +0100 [jgitflow-maven-plugin]updating poms for 0.3.3 branch with snapshot versions -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (929d3e1 -> a9431c9)
by chorem.org scm 08 Feb '16

08 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 929d3e1 Merge branch 'feature/1313' into develop new a9431c9 [jgitflow-maven-plugin]updating poms for 0.4.0-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 a9431c98c65397768b73f4d93c22340eb9b5322e Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Feb 8 09:13:37 2016 +0100 [jgitflow-maven-plugin]updating poms for 0.4.0-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 0

branch develop updated (965a77e -> 929d3e1)
by chorem.org scm 06 Feb '16

06 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 965a77e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 9858179 refs #1313 Fix BillingPerProject report new 79a93ec refs #1313 : Fix BillingPerAccount report new b847cbe Organise imports new 85e3a92 refs #1313 : Fix account billing report new 5908028 refs #1313 : Fix project billing report new d0ddcd5 refs #1313 : Add total on account billing report new 929d3e1 Merge branch 'feature/1313' into develop The 7 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 929d3e1c1addd6cb52bb99e7ac24280f9de8d9b4 Merge: 965a77e d0ddcd5 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Sat Feb 6 15:56:14 2016 +0100 Merge branch 'feature/1313' into develop commit d0ddcd51ade5cbd1fd32008cc89c39ad513d8ab9 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Sat Feb 6 15:53:44 2016 +0100 refs #1313 : Add total on account billing report commit 590802817b8546f0e8d353f1930d425633c933e9 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Sat Feb 6 15:53:09 2016 +0100 refs #1313 : Fix project billing report commit 85e3a92842f52eb5f7914605d1c28179dad57154 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Fri Feb 5 17:14:22 2016 +0100 refs #1313 : Fix account billing report commit b847cbe2c6b89186e419fdf3f3209011b9b9cecb Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Fri Feb 5 16:15:28 2016 +0100 Organise imports commit 79a93ec73bcdf0224187d223d5b8b57b81628618 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Fri Feb 5 16:08:33 2016 +0100 refs #1313 : Fix BillingPerAccount report commit 9858179a2b09d9b99fd780e7acdbae519b85dc43 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Fri Feb 5 15:18:03 2016 +0100 refs #1313 Fix BillingPerProject report Summary of changes: .../src/main/java/org/chorem/ChoremQueryMaker.java | 13 ++++ .../financial/AccountBillingReportAction.java | 32 +++++--- .../financial/BillingPerAccountReportAction.java | 90 +++++++++++++++++----- .../financial/BillingPerProjectReportAction.java | 44 ++++++++--- .../financial/ProjectBillingReportAction.java | 31 +++++--- chorem-webmotion/src/main/resources/mapping | 2 +- .../jsp/financial/reports/accountBillingReport.jsp | 6 +- .../financial/reports/billingPerAccountReport.jsp | 4 + .../financial/reports/billingPerProjectReport.jsp | 6 +- .../jsp/financial/reports/projectBillingReport.jsp | 6 +- pom.xml | 2 +- 11 files changed, 180 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 7

branch release/0.3.2 deleted (was 0f4e67d)
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 was 0f4e67d [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

annotated tag chorem-0.3.2 created (now beda075)
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 annotated tag chorem-0.3.2 in repository chorem. See http://git.chorem.org/chorem.git at beda075 (tag) tagging 67ec7114e29f4282f260cd8044c175edc59d4f59 (commit) replaces chorem-0.3.1 tagged by Maven Release on Thu Feb 4 15:41:23 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 0.3.2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch release/0.3.2 updated (d399f98 -> 0f4e67d)
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 from 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 No new revisions were added by this update. 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 0

branch develop updated (268e77a -> 965a77e)
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 268e77a [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development new 84bfe5f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d399f98 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions new 0f4e67d [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions new 67ec711 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' new e5fe9c3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 965a77e [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 965a77e7bfdad7cf2e342bd042e4e5c953337957 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e5fe9c37aa392c6cf39537030deb101bc06a7ff8 Merge: 84bfe5f 67ec711 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 84bfe5ff5d67c985a1086937489bdc7e2879a6b6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 67ec7114e29f4282f260cd8044c175edc59d4f59 Merge: 8d27e63 0f4e67d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 4 15:41:23 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' 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 Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

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