Author: jcouteau Date: 2014-10-17 14:55:29 +0200 (Fri, 17 Oct 2014) New Revision: 436 Url: http://forge.chorem.org/projects/chorem/repository/revisions/436 Log: Finish sales reports : - sales per project - sales per account Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-08-13 09:03:36 UTC (rev 435) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-10-17 12:55:29 UTC (rev 436) @@ -22,7 +22,7 @@ --%> <ul class="list-group"> <li class="list-group-item"><a href="sales"><i class="icon-chevron-right"></i> Ventes</a></li> - <li class="list-group-item"><a href="#"><i class="icon-chevron-right"></i> Ventes par client</a></li> + <li class="list-group-item"><a href="salesPerAccount"><i class="icon-chevron-right"></i> Ventes par client</a></li> <li class="list-group-item"><a href="salesPerProject"><i class="icon-chevron-right"></i> Ventes par projet</a></li> <li class="list-group-item"><a href="sentQuotation"><i class="icon-chevron-right"></i> Devis envoy�s</a></li> <li class="list-group-item"><a href="acceptedQuotation"><i class="icon-chevron-right"></i> Devis accept�s</a></li> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-08-13 09:03:36 UTC (rev 435) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-10-17 12:55:29 UTC (rev 436) @@ -62,7 +62,7 @@ <h2>Ventes</h2> - <form action="sales" method="get"> + <form action="salesPerAccount" method="get"> <select name="from"> <c:forEach var="entry" items="${allYears}" varStatus="counter"> <option value="${entry}" <c:if test="${entry==fromYear}">selected</c:if>>${entry}</option> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-08-13 09:03:36 UTC (rev 435) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-10-17 12:55:29 UTC (rev 436) @@ -62,7 +62,7 @@ <h2>Ventes</h2> - <form action="sales" method="get"> + <form action="salesPerProject" method="get"> <select name="from"> <c:forEach var="entry" items="${allYears}" varStatus="counter"> <option value="${entry}" <c:if test="${entry==fromYear}">selected</c:if>>${entry}</option>