get back commentaire

diff --git a/project/dae/migrations/0062_auto__del_field_contrat_type__add_field_contrat_user_desactivation__ad.py b/project/dae/migrations/0062_auto__del_field_contrat_type__add_field_contrat_user_desactivation__ad.py
index 2688b6a..2d402fa 100644 (file)
--- a/project/dae/migrations/0062_auto__del_field_contrat_type__add_field_contrat_user_desactivation__ad.py
+++ b/project/dae/migrations/0062_auto__del_field_contrat_type__add_field_contrat_user_desactivation__ad.py
@@ -70,7 +70,8 @@ class Migration(SchemaMigration):
         db.alter_column('dae_dossierpiece', 'dossier', self.gf('django.db.models.fields.related.ForeignKey')(db_column='dossier', to=orm['dae.Dossier']))
 
         # Deleting field 'Remuneration.precision'
-        db.delete_column('dae_remuneration', 'precision')
+        #db.delete_column('dae_remuneration', 'precision')
+        db.rename_column('dae_remuneration', 'precision', 'commentaire')
 
         # Adding field 'Remuneration.user_desactivation'
         db.add_column('dae_remuneration', 'user_desactivation', self.gf('django.db.models.fields.related.ForeignKey')(related_name='+', blank=True, null=True, db_column='user_desactivation', to=orm['auth.User']), keep_default=False)
@@ -106,7 +107,7 @@ class Migration(SchemaMigration):
         db.add_column('dae_remuneration', 'actif', self.gf('django.db.models.fields.BooleanField')(default=True, blank=True), keep_default=False)
 
         # Adding field 'Remuneration.commentaire'
-        db.add_column('dae_remuneration', 'commentaire', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+        #db.add_column('dae_remuneration', 'commentaire', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
 
         # Changing field 'Remuneration.montant'
         db.alter_column('dae_remuneration', 'montant', self.gf('django.db.models.fields.FloatField')(null=True, blank=True))
@@ -191,7 +192,8 @@ class Migration(SchemaMigration):
         db.alter_column('dae_dossierpiece', 'dossier_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['dae.Dossier']))
 
         # Adding field 'Remuneration.precision'
-        db.add_column('dae_remuneration', 'precision', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+        #db.add_column('dae_remuneration', 'precision', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+        db.rename_column('dae_remuneration', 'commentaire', 'precision')
 
         # Deleting field 'Remuneration.user_desactivation'
         db.delete_column('dae_remuneration', 'user_desactivation')
@@ -227,7 +229,7 @@ class Migration(SchemaMigration):
         db.delete_column('dae_remuneration', 'actif')
 
         # Deleting field 'Remuneration.commentaire'
-        db.delete_column('dae_remuneration', 'commentaire')
+        #db.delete_column('dae_remuneration', 'commentaire')
 
         # Changing field 'Remuneration.montant'
         db.alter_column('dae_remuneration', 'montant', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=12, decimal_places=2))

diff --git a/project/dae/templates/dae/embauche-remun.html b/project/dae/templates/dae/embauche-remun.html
index c6964d6..6076b46 100644 (file)
--- a/project/dae/templates/dae/embauche-remun.html
+++ b/project/dae/templates/dae/embauche-remun.html
@@ -22,7 +22,7 @@
     <td>{{ f.montant.errors }} {{ f.montant }}</td>
     <td id="id_{{ f.prefix }}-montant_mensuel_euros"></td>
     <td id="id_{{ f.prefix }}-montant_annuel_euros"></td>
-    <td>{{ f.precision.errors }} {{ f.precision }}</td>
+    <td>{{ f.commentaire.errors }} {{ f.commentaire }}</td>
     <td>{{ f.DELETE }}</td>
 </tr>
 {% endfor %}