Merge branch 'platal-0.9.15'

Conflicts:

	include/validations/paiements.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc include/validations/paiements.inc.php
index ece966d,f6c5964..5d9347d
--- 1/include/validations/paiements.inc.php
--- 2/include/validations/paiements.inc.php
+++ b/include/validations/paiements.inc.php
@@@ -198,6 -193,11 +193,11 @@@ class PayReq extends Validat
                  }
                  $topay = $u['montant'] - $u['paid'];
                  if ($topay > 0) {
 -                    $mailer = new PlMailer('xnetevents/mail.new_payment.tpl');
++                    $mailer = new PlMailer('xnetevents/newpayment.mail.tpl');
+                     $mailer->assign('asso', $nom);
+                     $mailer->assign('diminutif', $diminutif);
+                     $mailer->assign('evt', $evt);
+                     $mailer->assign('payment', $id);
                      $mailer->assign('prenom', $u['prenom']);
                      $mailer->assign('topay', $topay);
                      $mailer->assign('to', $u['email']);