Merge xorg/maint into xorg/master

diff --git a/ChangeLog b/ChangeLog
index b3e1cc7..8246733 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ================================================================================
+VERSION 1.1.7                                                         XX XX XXXX
+
+================================================================================
 VERSION 1.1.6                                                         15 11 2012
 
     * AX:

diff --git a/modules/payment.php b/modules/payment.php
index e3788e5..183c723 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -127,7 +127,7 @@ class PaymentModule extends PLModule
             'admin/reconcile'              => $this->make_hook('adm_reconcile',    AUTH_PASSWD, 'admin'),
             'admin/reconcile/importlogs'   => $this->make_hook('adm_importlogs',   AUTH_PASSWD, 'admin'),
             'admin/reconcile/transfers'    => $this->make_hook('adm_transfers',    AUTH_PASSWD, 'admin'),
-            'admin/reconcile/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_PASSWD, 'admin'),
+            'admin/payments/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_PASSWD, 'admin'),
         );
     }
 
@@ -618,7 +618,7 @@ class PaymentModule extends PLModule
         $page->assign('title', "Liste des RIBs");
 
         $table_editor = new PLTableEditor('admin/payments/bankaccounts', 'payment_bankaccounts', 'id');
-        $table_editor->describe('asso_id', 'ID du groupe', false, false);
+        $table_editor->describe('asso_id', 'ID du groupe', false, true);
         $table_editor->describe('owner', 'titulaire', true);
         $table_editor->add_option_table('groups', 'groups.id = t.asso_id');
         $table_editor->add_option_field('groups.diminutif', 'group_name', 'groupe', 'varchar','account');

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index d7cf838..5f9b5b9 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -75,7 +75,7 @@
         |  
       <a href="admin/reconcile">Virements</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="admin/reconcile/bankaccounts">RIBs</a>
+      <a href="admin/payments/bankaccounts">RIBs</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
       <a href="admin/payments/methods">Méthodes de paiement</a>
     </td>