lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Title in member subscriptions

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-09 10:27:21 +00:00
parent 47dda9f8ed
commit 567100671b
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/adherents/cotisations.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -53,7 +53,7 @@ $date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_selec
// pas actif c'est qu'on voulait pas d'insertion en banque. // pas actif c'est qu'on voulait pas d'insertion en banque.
// si on active apres coup, on va pas modifier toutes les adhesions pour avoir une ecriture // si on active apres coup, on va pas modifier toutes les adhesions pour avoir une ecriture
// en banque mais on va mettre le solde banque direct a la valeur apres toutes les adh<64>sions. // en banque mais on va mettre le solde banque direct a la valeur apres toutes les adh<64>sions.
$allowinsertbankafter=0; $allowinsertbankafter=0;
if (! $user->rights->adherent->cotisation->lire) if (! $user->rights->adherent->cotisation->lire)
accessforbidden(); accessforbidden();
@ -79,18 +79,18 @@ if ($allowinsertbankafter && $_POST["action"] == '2bank' && $_POST["rowid"] !=''
// Cr<43>er un tiers + facture et enregistrer son paiement ? -> Non requis avec module compta expert // Cr<43>er un tiers + facture et enregistrer son paiement ? -> Non requis avec module compta expert
// Eventuellement offrir option a la creation adhesion // Eventuellement offrir option a la creation adhesion
if (! $msg) if (! $msg)
{ {
$db->begin(); $db->begin();
$dateop=time(); $dateop=time();
$cotisation=new Cotisation($db); $cotisation=new Cotisation($db);
$result=$cotisation->fetch($_POST["rowid"]); $result=$cotisation->fetch($_POST["rowid"]);
$adherent=new Adherent($db); $adherent=new Adherent($db);
$result=$adherent->fetch($cotisation->fk_adherent); $result=$adherent->fetch($cotisation->fk_adherent);
if ($result > 0) if ($result > 0)
{ {
$amount=$cotisation->amount; $amount=$cotisation->amount;
@ -161,13 +161,15 @@ $sql.= " ORDER BY $sortfield $sortorder";
$sql.= $db->plimit($conf->liste_limit+1, $offset); $sql.= $db->plimit($conf->liste_limit+1, $offset);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
$title=$langs->trans("ListOfSubscriptions");
if (! empty($date_select)) $title.=' ('.$langs->trans("Year").' '.$date_select.')';
$param.="&amp;statut=$statut&amp;date_select=$date_select"; $param.="&amp;statut=$statut&amp;date_select=$date_select";
print_barre_liste($langs->trans("ListOfSubscriptions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -212,16 +214,16 @@ if ($result)
print "<form method=\"post\" action=\"cotisations.php\">"; print "<form method=\"post\" action=\"cotisations.php\">";
} }
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
// Ref // Ref
print '<td>'.$cotisation->getNomUrl(1).'</td>'; print '<td>'.$cotisation->getNomUrl(1).'</td>';
// Nom // Nom
print '<td>'.$adherent->getNomUrl(1).'</td>'; print '<td>'.$adherent->getNomUrl(1).'</td>';
// Login // Login
print '<td>'.$adherent->login.'</td>'; print '<td>'.$adherent->login.'</td>';
// Libelle // Libelle
print '<td>'; print '<td>';
if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation)
@ -270,13 +272,13 @@ if ($result)
// Date start // Date start
print '<td align="center">'.dol_print_date($objp->dateadh,'day')."</td>\n"; print '<td align="center">'.dol_print_date($objp->dateadh,'day')."</td>\n";
// Date end // Date end
print '<td align="center">'.dol_print_date($objp->datef,'day')."</td>\n"; print '<td align="center">'.dol_print_date($objp->datef,'day')."</td>\n";
// Price // Price
print '<td align="right">'.price($objp->cotisation).'</td>'; print '<td align="right">'.price($objp->cotisation).'</td>';
print "</tr>"; print "</tr>";
if ($allowinsertbankafter && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) if ($allowinsertbankafter && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation)
{ {
@ -300,7 +302,7 @@ if ($result)
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print "<td align=\"right\">".price($total)."</td>\n"; print "<td align=\"right\">".price($total)."</td>\n";
print "</tr>\n"; print "</tr>\n";
print "</table>"; print "</table>";
print "<br>\n"; print "<br>\n";

8
htdocs/adherents/index.php
View File

@ -84,7 +84,7 @@ if ($result)
} }
// List members up to date // List members up to date
// current rule: uptodate = the end date is in future whatever is type // current rule: uptodate = the end date is in future whatever is type
// old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future) // old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
$sql = "SELECT count(*) as somme , d.fk_adherent_type"; $sql = "SELECT count(*) as somme , d.fk_adherent_type";
@ -178,7 +178,7 @@ print "</table>\n";
print "<br>\n"; print "<br>\n";
/* /*
* Dernieres adherent * Last modified members
*/ */
$max=5; $max=5;
@ -211,8 +211,8 @@ if ($resql)
$staticmember->ref=trim($obj->prenom.' '.$obj->nom); $staticmember->ref=trim($obj->prenom.' '.$obj->nom);
$statictype->id=$obj->typeid; $statictype->id=$obj->typeid;
$statictype->libelle=$obj->libelle; $statictype->libelle=$obj->libelle;
print '<td>'.$staticmember->getNomUrl(1).'</td>'; print '<td>'.$staticmember->getNomUrl(1,24).'</td>';
print '<td>'.$statictype->getNomUrl(1).'</td>'; print '<td>'.$statictype->getNomUrl(1,16).'</td>';
print '<td>'.dol_print_date($obj->datem,'dayhour').'</td>'; print '<td>'.dol_print_date($obj->datem,'dayhour').'</td>';
print '<td align="right">'.$staticmember->LibStatut($obj->statut,($obj->cotisation=='yes'?1:0),$obj->date_end_subscription,5).'</td>'; print '<td align="right">'.$staticmember->LibStatut($obj->statut,($obj->cotisation=='yes'?1:0),$obj->date_end_subscription,5).'</td>';
print '</tr>'; print '</tr>';