Author: ymartel Date: 2014-08-06 18:34:52 +0200 (Wed, 06 Aug 2014) New Revision: 427 Url: http://forge.chorem.org/projects/chorem/repository/revisions/427 Log: fix toString and preload for Expense Account Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-08-06 16:34:06 UTC (rev 426) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-08-06 16:34:52 UTC (rev 427) @@ -191,18 +191,18 @@ # # ExpenseAccount # -org.chorem.entities.ExpenseAccount.class.tagvalue.version=1.0 -org.chorem.entities.ExpenseAccount.class.tagvalue.preload=ExpenseAccount.employee;ExpenseAccount.org.chorem.entities.Employee.class.tagvalue.preload +org.chorem.entities.ExpenseAccount.class.tagvalue.version=3.0 +org.chorem.entities.ExpenseAccount.class.tagvalue.preload=ExpenseAccount.employee;ExpenseAccount.expenseAccountEntry org.chorem.entities.ExpenseAccount.class.tagvalue.toString=%ExpenseAccount.employee$s - %Interval.beginDate$s/%Interval.endDate$s org.chorem.entities.ExpenseAccount.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate # # ExpenseAccountEntry # -org.chorem.entities.ExpenseAccountEntry.class.tagvalue.version=1.0 -org.chorem.entities.ExpenseAccountEntry.class.tagvalue.toString=%FinancialTransaction.reference$tF-%ExpenseAccountEntry.justificationNumber$tF +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.version=3.0 +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.toString=%FinancialTransaction.reference|noref$s - %FinancialTransaction.amount|noamount$s org.chorem.entities.ExpenseAccountEntry.class.tagvalue.preload=FinancialTransaction.beneficiary;FinancialTransaction.category;FinancialTransaction.target -org.chorem.entities.ExpenseAccountEntry.class.tagvalue.sortOrder=ExpenseAccountEntry.date +org.chorem.entities.ExpenseAccountEntry.class.tagvalue.sortOrder=FinancialTransaction.emittedDate # # Mission (a mettre ici) Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-08-06 16:34:06 UTC (rev 426) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-08-06 16:34:52 UTC (rev 427) @@ -25,8 +25,7 @@ <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <head> - <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.11.0.js"></script> - + <script type="text/javascript" src="<c:url value='/js/angular-ui-bootstrap-tpls-0.11.0.js'/>"></script> <script type="text/javascript" src="<c:url value='/js/financial/expenseAccount.js'/>"></script> <script> angular.module('expenseAccountPage').value('expenseAccountInit', {