Author: meynier Date: 2013-07-17 16:34:12 +0200 (Wed, 17 Jul 2013) New Revision: 367 Url: http://chorem.org/projects/chorem/repository/revisions/367 Log: Updated model Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-entities/src/main/xmi/chorem-model.zargo Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-07-17 14:12:16 UTC (rev 366) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-07-17 14:34:12 UTC (rev 367) @@ -94,9 +94,16 @@ org.chorem.entities.Employee.attribute.person.tagvalue.help=Autocompl\u00e8tion possible org.chorem.entities.Employee.attribute.company.tagvalue.help=Autocompl\u00e8tion possible # +# Contract +# +org.chorem.entities.Contract.class.tagvalue.version=2.0 +org.chorem.entities.Contract.class.tagvalue.toString=%Employee.person$s - %Contract.dailyReturn$s (%Contract.salary$s) +org.chorem.entities.Contract.class.tagvalue.sortOrder=Contract.salary,Contract.dailyReturn +org.chorem.entities.Contract.attribute.dailyReturn.tagvalue.help=Seuil rentabilit\u00e8 productif +# # EmployeeHR # -org.chorem.entities.EmployeeHR.class.tagvalue.version=1.0 +org.chorem.entities.EmployeeHR.class.tagvalue.version=2.0 org.chorem.entities.EmployeeHR.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) HR org.chorem.entities.EmployeeHR.attribute.type.tagvalue.help=Le type de contrat de travail (CDI, CDD, Stage, ...) org.chorem.entities.EmployeeHR.attribute.type.tagvalue.choiceQuery=SELECT EmployeeHR.type WHERE extension=EmployeeHR @@ -370,12 +377,12 @@ # # Worker # -org.chorem.entities.Worker.class.tagvalue.version=8.0 -org.chorem.entities.Worker.class.tagvalue.toString=%Worker.person$s - %Worker.task$s - %Worker.percentage|nopercentage$s +org.chorem.entities.Worker.class.tagvalue.version=9.0 +org.chorem.entities.Worker.class.tagvalue.toString=%Worker.employee$s - %Worker.task$s - %Worker.percentage|nopercentage$s org.chorem.entities.Worker.class.tagvalue.sortOrder=Worker.percentage -org.chorem.entities.Worker.class.tagvalue.preload=Worker.person;Work.task +org.chorem.entities.Worker.class.tagvalue.preload=Worker.employee;Work.task org.chorem.entities.Worker.attribute.task.tagvalue.help=La t\u00e2che auquel on assigne quelqu'un -org.chorem.entities.Worker.attribute.person.tagvalue.help=La personne \u00e0 ajouter en tant que travaillant sur cette t\u00e2che +org.chorem.entities.Worker.attribute.employee.tagvalue.help=La personne \u00e0 ajouter en tant que travaillant sur cette t\u00e2che org.chorem.entities.Worker.attribute.percentage.tagvalue.help=Le pourcentage de temps de la personne sur cette t\u00e2che org.chorem.entities.Worker.attribute.percentage.tagvalue.fieldIndex=10 org.chorem.entities.Worker.attribute.percentage.tagvalue.subtype=percent Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)