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@chorem.org>.