diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 39466e8ae8a..9961471fdd6 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -5,6 +5,7 @@ * Copyright (C) 2012-2017 Regis Houssin * Copyright (C) 2015-2016 Alexandre Spangaro * Copyright (C) 2018 Frédéric France + * Copyright (C) 2019 Thibault FOUCART * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -668,7 +669,7 @@ if ($rowid > 0) { $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe,"; $sql.= " c.rowid as crowid, c.subscription,"; - $sql.= " c.datec,"; + $sql.= " c.datec, c.fk_type as cfk_type,"; $sql.= " c.dateadh as dateh,"; $sql.= " c.datef,"; $sql.= " c.fk_bank,"; @@ -693,6 +694,7 @@ if ($rowid > 0) print ''; print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder); print ''.$langs->trans("DateCreation").''; + print ''.$langs->trans("Type").''; print ''.$langs->trans("DateStart").''; print ''.$langs->trans("DateEnd").''; print ''.$langs->trans("Amount").''; @@ -711,9 +713,15 @@ if ($rowid > 0) $subscriptionstatic->ref=$objp->crowid; $subscriptionstatic->id=$objp->crowid; + $adht = new AdherentType($db); + $adht->fetch($objp->cfk_type); + print ''; print ''.$subscriptionstatic->getNomUrl(1).''; print ''.dol_print_date($db->jdate($objp->datec), 'dayhour')."\n"; + print ''; + if ( ! empty($objp->cfk_type) ) print $adht->getNomUrl(1); + print ''; print ''.dol_print_date($db->jdate($objp->dateh), 'day')."\n"; print ''.dol_print_date($db->jdate($objp->datef), 'day')."\n"; print ''.price($objp->subscription).'';