projets
/
auf_rh_dae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52a7e74
)
Masse salariale: ajuster les montants au régime de travail
author
Eric Mc Sween
<eric.mcsween@auf.org>
Fri, 15 Jun 2012 20:20:11 +0000
(16:20 -0400)
committer
Eric Mc Sween
<eric.mcsween@auf.org>
Fri, 15 Jun 2012 20:20:11 +0000
(16:20 -0400)
project/rh/views.py
patch
|
blob
|
blame
|
history
diff --git
a/project/rh/views.py
b/project/rh/views.py
index
b65eef3
..
6c711d4
100644
(file)
--- a/
project/rh/views.py
+++ b/
project/rh/views.py
@@
-303,7
+303,8
@@
def rapports_masse_salariale(request):
montant_remun(remun) * ((
min(remun.date_fin or fin_annee, fin_annee) -
max(remun.date_debut or debut_annee, debut_annee)
- ).days + 1) / jours_annee
+ ).days + 1) / jours_annee *
+ dossier.regime_travail / 100
).quantize(TWOPLACES)
traitements = [
remuns_par_type[type.id]