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 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 .../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>.