merge branche dev
[auf_rh_dae.git] / project / budget / admin.py
1 # -*- encoding: utf-8 -*-
2
3 from django.contrib import admin
4
5 <<<<<<< HEAD
6 from rh.admin import (DossierAdmin, EvenementAdmin, EvenementRemunerationAdmin,
7 PosteAdmin, PosteFinancementAdmin, RemunerationAdmin)
8 from models import *
9
10 =======
11 from budget.models import *
12 from rh.lib import *
13
14 admin.site.register(Classement, ClassementAdmin)
15 >>>>>>> dev
16 admin.site.register(Dossier, DossierAdmin)
17 admin.site.register(Evenement, EvenementAdmin)
18 admin.site.register(EvenementRemuneration, EvenementRemunerationAdmin)
19 admin.site.register(Poste, PosteAdmin)
20 <<<<<<< HEAD
21 admin.site.register(PosteFinancement, PosteFinancementAdmin)
22 admin.site.register(Remuneration, RemunerationAdmin)
23 =======
24 admin.site.register(Remuneration, RemunerationAdmin)
25 admin.site.register(ValeurPoint, ValeurPointAdmin)
26 admin.site.register(TauxChange, TauxChangeAdmin)
27 >>>>>>> dev