From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sun, 6 Jun 2010 20:39:23 +0000 (+0200)
Subject: Adds the date of linked event in payments admin listing. Closes #932.
X-Git-Tag: xorg/1.0.0~167
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9c966750fa1f2e5eb429b237c8b1bf593a07c334;p=platal.git

Adds the date of linked event in payments admin listing. Closes #932.
---

diff --git a/ChangeLog b/ChangeLog
index e88c01b..4326dc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ Bug/Wish:
     * Email:
         - #1077: Removes email redirections <tr> line when ajax returns    -Car
 
+    * Payments:
+        - #932: Adds the date of linked event in payments admin listing    -Car
+
     * Profile:
         - #16, #528, #917: Changes job interface, updates business sectors -JAC
         - #188: Adds informations about the Corps d'État                   -JAC
diff --git a/core b/core
index cad1faa..b08bfbc 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit cad1faad342a685aaab293aae3905887cc0bf178
+Subproject commit b08bfbce605c3632f240794556a6a0828c8bf153
diff --git a/modules/payment.php b/modules/payment.php
index edee6fe..1fa7639 100644
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -454,6 +454,11 @@ class PaymentModule extends PLModule
         $table_editor->describe('amount_max','montant maximum',false);
         $table_editor->describe('mail','email contact',true);
         $table_editor->describe('confirmation','message confirmation',false);
+
+        // adds a column with the start date of the linked event if there is one
+        $table_editor->add_option_table('group_events','group_events.paiement_id = t.id');
+        $table_editor->add_option_field('group_events.debut', 'related_event', 'évènement', 'timestamp');
+
         $table_editor->apply($page, $action, $id);
     }
 }