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

Feature: Add end subscription date in members module

Browse Source
This commit is contained in:
Laurent Destailleur 2007-09-09 10:43:26 +00:00
parent 2c84461a1a
commit 1a50dd475e
4 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/adherents/card_subscriptions.php
View File

@ -265,7 +265,10 @@ print '<td valign="top" width="50%">';
*
*/
$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 "<table class=\"noborder\" width=\"100%\">\n";
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("DateSubscription").'</td>';
print '<td align="center">'.$langs->trans("DateSubscription").'</td>';
print '<td align="center">'.$langs->trans("DateEnd").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>';
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 '<td>'.$cotisationstatic->getNomUrl(1).'</td>';
print "<td>".dolibarr_print_date($objp->dateadh,'day')."</td>\n";
print '<td align="center">'.dolibarr_print_date($objp->dateadh,'day')."</td>\n";
print '<td align="center">'.dolibarr_print_date($objp->datef,'day')."</td>\n";
print '<td align="right">'.price($objp->cotisation).'</td>';
if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE)
{

59
htdocs/adherents/cotisations.php
View File

@ -151,7 +151,10 @@ if ($msg) print $msg.'<br>';
// 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 '<tr class="liste_titre">';
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 "</tr>\n";
@ -212,9 +216,29 @@ if ($result)
print "<form method=\"post\" action=\"cotisations.php\">";
}
print "<tr $bc[$var]>";
print '<td>'.$cotisation->getNomUrl(1).'</td>';
print '<td>'.dolibarr_print_date($objp->dateadh,'day')."</td>\n";
print '<td>'.$adherent->getNomUrl(1).'</td>';
// Ref
print '<td>'.$cotisation->getNomUrl(1).'</td>';
// Nom
print '<td>'.$adherent->getNomUrl(1).'</td>';
// Libelle
print '<td>';
if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation)
{
print "<input name=\"label\" type=\"text\" class=\"flat\" size=\"30\" value=\"".$langs->trans("Subscriptions").' '.strftime("%Y",$objp->dateadh)."\" >\n";
// print "<td><input name=\"debit\" type=\"text\" size=8></td>";
// print "<td><input name=\"credit\" type=\"text\" size=8></td>";
print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
}
else
{
print dolibarr_trunc($objp->note,32);
}
print '</td>';
// Banque
if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE)
{
if ($objp->fk_account)
@ -244,20 +268,16 @@ if ($result)
print "</td>\n";
}
}
print '<td>';
if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation)
{
print "<input name=\"label\" type=\"text\" class=\"flat\" size=\"30\" value=\"".$langs->trans("Subscriptions").' '.strftime("%Y",$objp->dateadh)."\" >\n";
// print "<td><input name=\"debit\" type=\"text\" size=8></td>";
// print "<td><input name=\"credit\" type=\"text\" size=8></td>";
print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
}
else
{
print dolibarr_trunc($objp->note,32);
}
print '</td>';
// Date start
print '<td align="center">'.dolibarr_print_date($objp->dateadh,'day')."</td>\n";
// Date end
print '<td align="center">'.dolibarr_print_date($objp->datef,'day')."</td>\n";
// Price
print '<td align="right">'.price($objp->cotisation).'</td>';
print "</tr>";
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 "<td>".$langs->trans("Total")."</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
print "<td align=\"right\">&nbsp;</td>\n";
if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE)
{
print '<td>&nbsp;</td>';

1
htdocs/langs/en_US/main.lang
View File

@ -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

1
htdocs/langs/fr_FR/main.lang
View File

@ -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