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@gmail.com> Date: Sat Feb 6 15:56:14 2016 +0100 Merge branch 'feature/1313' into develop commit d0ddcd51ade5cbd1fd32008cc89c39ad513d8ab9 Author: Jean Couteau <jean.couteau@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@gmail.com> Date: Sat Feb 6 15:53:09 2016 +0100 refs #1313 : Fix project billing report commit 85e3a92842f52eb5f7914605d1c28179dad57154 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 5 17:14:22 2016 +0100 refs #1313 : Fix account billing report commit b847cbe2c6b89186e419fdf3f3209011b9b9cecb Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 5 16:15:28 2016 +0100 Organise imports commit 79a93ec73bcdf0224187d223d5b8b57b81628618 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 5 16:08:33 2016 +0100 refs #1313 : Fix BillingPerAccount report commit 9858179a2b09d9b99fd780e7acdbae519b85dc43 Author: Jean Couteau <jean.couteau@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@chorem.org>.