wip

[auf_rh_dae.git] / project / budget / admin.py

diff --git a/project/budget/admin.py b/project/budget/admin.py
index fb2eb1c..9d35efa 100644 (file)
--- a/project/budget/admin.py
+++ b/project/budget/admin.py
@@ -2,26 +2,18 @@
 
 from django.contrib import admin
 
-<<<<<<< HEAD
-from rh.admin import (DossierAdmin, EvenementAdmin, EvenementRemunerationAdmin,
-                      PosteAdmin, PosteFinancementAdmin, RemunerationAdmin)
-from models import *
-
-=======
 from budget.models import *
-from rh.lib import *
+from rh.lib import (ClassementAdmin, DossierAdmin, EvenementAdmin,
+                    EvenementRemunerationAdmin, PosteAdmin, RemunerationAdmin,
+                    ValeurPointAdmin, TauxChangeAdmin)
+
 
 admin.site.register(Classement, ClassementAdmin)
->>>>>>> dev
 admin.site.register(Dossier, DossierAdmin)
 admin.site.register(Evenement, EvenementAdmin)
 admin.site.register(EvenementRemuneration, EvenementRemunerationAdmin)
+# import ipdb; ipdb.set_trace()
 admin.site.register(Poste, PosteAdmin)
-<<<<<<< HEAD
-admin.site.register(PosteFinancement, PosteFinancementAdmin)
-admin.site.register(Remuneration, RemunerationAdmin)
-=======
 admin.site.register(Remuneration, RemunerationAdmin)
 admin.site.register(ValeurPoint, ValeurPointAdmin)
 admin.site.register(TauxChange, TauxChangeAdmin)
->>>>>>> dev