branch develop updated (3108193 -> ad12bdc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 3108193 fixes #1156 : Dans le tunnel de commande, le mauvais devis est supprimé de la liste Sent new ad12bdc refs #1155 : Commit forgotten file The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ad12bdc0d23ac70594001c7330d85c21657c6844 Author: kootox <jean.couteau@gmail.com> Date: Fri Jan 30 15:14:21 2015 +0100 refs #1155 : Commit forgotten file Summary of changes: .../chorem/webmotion/actions/sales/ProjectSalesReportAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 ad12bdc0d23ac70594001c7330d85c21657c6844 Author: kootox <jean.couteau@gmail.com> Date: Fri Jan 30 15:14:21 2015 +0100 refs #1155 : Commit forgotten file --- .../chorem/webmotion/actions/sales/ProjectSalesReportAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java index 7d5382d..f5b572c 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java @@ -63,7 +63,7 @@ public class ProjectSalesReportAction extends WebMotionController { List<Integer> listAllYearsInChorem = SalesReportHelper.listAllYears(client); - int previousYearValue = 0; + double previousYearValue = 0; for (Integer year:listAllYears){ Date yearFirstDay = SalesReportHelper.getFirstDayOfYear(year); @@ -78,7 +78,7 @@ public class ProjectSalesReportAction extends WebMotionController { yearLastDay) .end(); - Integer sales = client.findByQuery(Integer.class, projectQuery); + Double sales = client.findByQuery(Double.class, projectQuery); //TODO JC 2012-01-22 Find a way to replace two queries into one. WikittyQuery quotationsQuery = new WikittyQueryMaker().and() @@ -91,7 +91,7 @@ public class ProjectSalesReportAction extends WebMotionController { quotationsQuery).getAll(); //Progression devis envoyés - int salesProgression = 0; + double salesProgression = 0; if (previousYearValue != 0){ salesProgression = 100 * (sales - previousYearValue) / previousYearValue; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm