Author: bleny Date: 2013-03-28 11:05:24 +0100 (Thu, 28 Mar 2013) New Revision: 54 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fix report.jsp after adding destination site Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-27 15:52:22 UTC (rev 53) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 10:05:24 UTC (rev 54) @@ -21,10 +21,10 @@ Id </th> <th> - Magasin + Emplacement d'origine </th> <th> - Emplacement + Emplacement destination </th> <th> Article @@ -48,10 +48,16 @@ <s:property value="id" /> </td> <td> - <s:property value="site.storeCode" /> + <s:property value="originSite.storeCode" /> + - + <s:property value="originSite.locationCode" /> </td> <td> - <s:property value="site.locationCode" /> + <s:if test="destinationSite"> + <s:property value="destinationSite.storeCode" /> + - + <s:property value="destinationSite.locationCode" /> + </s:if> </td> <td> <s:property value="article.code" /> @@ -81,10 +87,10 @@ Id </th> <th> - Magasin + Emplacement d'origine </th> <th> - Emplacement + Emplacement destination </th> <th> Article @@ -111,10 +117,16 @@ <s:property value="id" /> </td> <td> - <s:property value="site.storeCode" /> + <s:property value="originSite.storeCode" /> + - + <s:property value="originSite.locationCode" /> </td> <td> - <s:property value="site.locationCode" /> + <s:if test="destinationSite"> + <s:property value="destinationSite.storeCode" /> + - + <s:property value="destinationSite.locationCode" /> + </s:if> </td> <td> <s:property value="article.code" />