diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index be9430becd7..98d624566a4 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -265,7 +265,10 @@ print ''; * */ $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,"; -$sql.= " c.rowid as crowid, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh, c.fk_bank,"; +$sql.= " c.rowid as crowid, c.cotisation,"; +$sql.= " ".$db->pdate("c.dateadh")." as dateadh,"; +$sql.= " ".$db->pdate("c.datef")." as datef,"; +$sql.= " c.fk_bank,"; $sql.= " b.rowid as bid,"; $sql.= " ba.rowid as baid, ba.label, ba.bank"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; @@ -286,7 +289,8 @@ print "\n"; print ''; print ''; -print ''; +print ''; +print ''; print ''; if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { @@ -303,7 +307,8 @@ while ($i < $num) $cotisationstatic->ref=$objp->crowid; $cotisationstatic->id=$objp->crowid; print ''; - print "\n"; + print '\n"; + print '\n"; print ''; if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index c15d2cd708d..97016c9b973 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -151,7 +151,10 @@ if ($msg) print $msg.'
'; // Liste des cotisations $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,"; -$sql.= " c.rowid as crowid, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh, c.fk_bank as bank, c.note,"; +$sql.= " c.rowid as crowid, c.cotisation,"; +$sql.= " ".$db->pdate("c.dateadh")." as dateadh,"; +$sql.= " ".$db->pdate("c.datef")." as datef,"; +$sql.= " c.fk_bank as bank, c.note,"; $sql.= " b.fk_account"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid"; @@ -177,13 +180,14 @@ if ($result) print ''; print_liste_field_titre($langs->trans("Ref"),"cotisations.php","c.rowid",$param,"","",$sortfield); - print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.nom",$param,"","",$sortfield); + print_liste_field_titre($langs->trans("Label"),"cotisations.php","c.note",$param,"",'align="left"',$sortfield); if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { print_liste_field_titre($langs->trans("Bank"),"cotisations.php","b.fk_account",$pram,"","",$sortfield); } - print_liste_field_titre($langs->trans("Label"),"cotisations.php","c.note",$param,"",'align="left"',$sortfield); + print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh",$param,"",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("DateEnd"),"cotisations.php","c.datef",$param,"",'align="center"',$sortfield); print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation",$param,"",'align="right"',$sortfield); print "\n"; @@ -212,9 +216,29 @@ if ($result) print ""; } print ""; - print ''; - print '\n"; - print ''; + + // Ref + print ''; + + // Nom + print ''; + + // Libelle + print '"; + // print ""; + print ''; + } + else + { + print dolibarr_trunc($objp->note,32); + } + print ''; + + // Banque if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { if ($objp->fk_account) @@ -244,20 +268,16 @@ if ($result) print "\n"; } } - print '"; - // print ""; - print ''; - } - else - { - print dolibarr_trunc($objp->note,32); - } - print ''; + + // Date start + print '\n"; + + // Date end + print '\n"; + + // Price print ''; + print ""; if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) { @@ -271,6 +291,7 @@ if ($result) print "\n"; print "\n"; print "\n"; + print "\n"; if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { print ''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 1cbd8d74804..3525ea769b1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -148,6 +148,7 @@ Next=Next Cards=Cards Card=Card Date=Date +DateEnd=Date end DateCreation=Creation date DateModification=Modification date DateLastModification=Last modification date diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 004b0b12a75..b6341f80def 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -149,6 +149,7 @@ Next=Suivant Cards=Fiches Card=Fiche Date=Date +DateEnd=Date fin DateCreation=Date création DateModification=Date modification DateLastModification=Date dernière modification
'.$langs->trans("Ref").''.$langs->trans("DateSubscription").''.$langs->trans("DateSubscription").''.$langs->trans("DateEnd").''.$langs->trans("Amount").''.$cotisationstatic->getNomUrl(1).'".dolibarr_print_date($objp->dateadh,'day')."'.dolibarr_print_date($objp->dateadh,'day')."'.dolibarr_print_date($objp->datef,'day')."'.price($objp->cotisation).'
'.$cotisation->getNomUrl(1).''.dolibarr_print_date($objp->dateadh,'day')."'.$adherent->getNomUrl(1).''.$cotisation->getNomUrl(1).''.$adherent->getNomUrl(1).''; + if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) + { + print "trans("Subscriptions").' '.strftime("%Y",$objp->dateadh)."\" >\n"; + // print "'; - if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) - { - print "trans("Subscriptions").' '.strftime("%Y",$objp->dateadh)."\" >\n"; - // print "'.dolibarr_print_date($objp->dateadh,'day')."'.dolibarr_print_date($objp->datef,'day')."'.price($objp->cotisation).'
".$langs->trans("Total")."