Merge commit 'origin/master' into account

[platal.git] / templates / payment / index.tpl

diff --git a/templates/payment/index.tpl b/templates/payment/index.tpl
index 0931e41..c9dc2ef 100644 (file)
--- a/templates/payment/index.tpl
+++ b/templates/payment/index.tpl
@@ -116,7 +116,7 @@ function payment_submit(form)
         <select name="ref" onchange="payment_submit(this.form)">
           {select_db_table table="`$prefix`paiements" valeur=$pay->id
                            where="WHERE FIND_IN_SET(\'old\',t.flags)=0"
-                           join="LEFT JOIN #groupex#.asso AS g ON (t.asso_id = g.id)" group="g.nom"}
+                           join="LEFT JOIN groups AS g ON (t.asso_id = g.id)" group="g.nom"}
         </select>
         {/if}
         {if $pay->url}
@@ -129,7 +129,7 @@ function payment_submit(form)
       <td>Méthode</td>
       <td>
         <select name="methode">
-          {select_db_table table="#paiement#.methodes" valeur=$smarty.request.methode}
+          {select_db_table table="payment_methods" valeur=$smarty.request.methode}
         </select>
       </td>
     </tr>
@@ -158,7 +158,7 @@ function payment_submit(form)
 {iterate from=$transactions item=t}
   <tr class="{cycle values="pair,impair"}">
     <td>{$t.timestamp|date_format}</td>
-    <td>{$t.montant|replace:'EUR':'&euro;'}</td>
+    <td>{$t.amount|replace:'EUR':'&euro;'}</td>
   </tr>
 {/iterate}
 </table>