Author: meynier Date: 2013-08-01 16:16:31 +0200 (Thu, 01 Aug 2013) New Revision: 379 Url: http://chorem.org/projects/chorem/repository/revisions/379 Log: Added otherPayments in extension EmployeeHR 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-29 14:51:52 UTC (rev 378) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2013-08-01 14:16:31 UTC (rev 379) @@ -104,7 +104,7 @@ # # EmployeeHR # -org.chorem.entities.EmployeeHR.class.tagvalue.version=3.0 +org.chorem.entities.EmployeeHR.class.tagvalue.version=4.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 @@ -117,6 +117,7 @@ org.chorem.entities.EmployeeHR.attribute.productivityRate.tagvalue.help=Taux de productivité org.chorem.entities.EmployeeHR.attribute.partialTime.tagvalue.help=Taux de travail (temps complet:100, mi-temps:50) org.chorem.entities.EmployeeHR.attribute.partialTime.tagvalue.default=100 +org.chorem.entities.EmployeeHR.attribute.otherPayments.tagvalue.help=Remuneration autre que salaire (prime, etc.) # # Evaluation (a mettre ici) # Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)