commit du 25/11
Merge amelioration
commit du 2/12 repect charte
3/12 amelioration des calcul totaux