This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4d97decb1569ef50cbdfb4d727ce08d101cce1b3 Merge: 3ced46d fe0ebb0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:46:32 2017 +0100 fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. .../faxtomail/beans/QuantitiesByRange.java | 19 ++++++++++- .../persistence/entities/EmailTopiaDao.java | 37 +++++++++++++++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35540 -> 35628 bytes .../services/service/EmailServiceImpl.java | 12 +++++-- ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 +++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++++ .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 10 files changed, 133 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.