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 67ec7114e29f4282f260cd8044c175edc59d4f59 Merge: 8d27e63 0f4e67d Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:23 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' 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(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.