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