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

Amlioration gestion des dons

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-11 20:28:11 +00:00
parent bc4fdea1f7
commit 569d3f6a45
4 changed files with 169 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

304
htdocs/compta/dons/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
@ -21,7 +21,8 @@
* *
*/ */
/*! \file htdocs/compta/dons/fiche.php /**
\file htdocs/compta/dons/fiche.php
\ingroup don \ingroup don
\brief Page de fiche de don \brief Page de fiche de don
\version $Revision$ \version $Revision$
@ -43,34 +44,34 @@ if ($_POST["action"] == 'update')
if ($_POST["amount"] > 0) if ($_POST["amount"] > 0)
{ {
$don = new Don($db); $don = new Don($db);
$don->id = $_POST["rowid"]; $don->id = $_POST["rowid"];
$don->fetch($_POST["rowid"]); $don->fetch($_POST["rowid"]);
$don->prenom = $_POST["prenom"]; $don->prenom = $_POST["prenom"];
$don->nom = $_POST["nom"]; $don->nom = $_POST["nom"];
$don->societe = $_POST["societe"]; $don->societe = $_POST["societe"];
$don->adresse = $_POST["adresse"]; $don->adresse = $_POST["adresse"];
$don->amount = $_POST["amount"]; $don->amount = $_POST["amount"];
$don->cp = $_POST["cp"]; $don->cp = $_POST["cp"];
$don->ville = $_POST["ville"]; $don->ville = $_POST["ville"];
$don->email = $_POST["email"]; $don->email = $_POST["email"];
$don->date = mktime(12, 0 , 0, $remonth, $reday, $reyear); $don->date = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$don->note = $_POST["note"]; $don->note = $_POST["note"];
$don->pays = $_POST["pays"]; $don->pays = $_POST["pays"];
$don->public = $_POST["public"]; $don->public = $_POST["public"];
$don->projetid = $_POST["projetid"]; $don->projetid = $_POST["projetid"];
$don->commentaire = $_POST["comment"]; $don->commentaire = $_POST["comment"];
$don->modepaiementid = $_POST["modepaiement"]; $don->modepaiementid = $_POST["modepaiement"];
if ($don->update($user->id) ) if ($don->update($user) > 0)
{ {
Header("Location: index.php"); Header("Location: fiche.php?rowid=".$don->id);
} }
} }
else else
{ {
$mesg="Montant non défini"; $mesg="Montant non défini";
} }
} }
@ -80,70 +81,70 @@ if ($_POST["action"] == 'add')
if ($_POST["amount"] > 0) if ($_POST["amount"] > 0)
{ {
$don = new Don($db); $don = new Don($db);
$don->prenom = $_POST["prenom"]; $don->prenom = $_POST["prenom"];
$don->nom = $_POST["nom"]; $don->nom = $_POST["nom"];
$don->societe = $_POST["societe"]; $don->societe = $_POST["societe"];
$don->adresse = $_POST["adresse"]; $don->adresse = $_POST["adresse"];
$don->amount = $_POST["amount"]; $don->amount = $_POST["amount"];
$don->cp = $_POST["cp"]; $don->cp = $_POST["cp"];
$don->ville = $_POST["ville"]; $don->ville = $_POST["ville"];
$don->email = $_POST["email"]; $don->email = $_POST["email"];
$don->date = mktime(12, 0 , 0, $remonth, $reday, $reyear); $don->date = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$don->note = $_POST["note"]; $don->note = $_POST["note"];
$don->pays = $_POST["pays"]; $don->pays = $_POST["pays"];
$don->public = $_POST["public"]; $don->public = $_POST["public"];
$don->projetid = $_POST["projetid"]; $don->projetid = $_POST["projetid"];
$don->commentaire = $_POST["comment"]; $don->commentaire = $_POST["comment"];
$don->modepaiementid = $_POST["modepaiement"]; $don->modepaiementid = $_POST["modepaiement"];
if ($don->create($user->id) ) if ($don->create($user) > 0)
{ {
Header("Location: index.php"); Header("Location: index.php");
} }
} }
else else
{ {
$mesg="Montant non défini"; $mesg="Montant non défini";
$_GET["action"] = "create"; $_GET["action"] = "create";
} }
} }
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
$don = new Don($db); $don = new Don($db);
$don->delete($_GET["rowid"]); $don->delete($_GET["rowid"]);
Header("Location: liste.php"); Header("Location: liste.php");
} }
if ($_POST["action"] == 'commentaire') if ($_POST["action"] == 'commentaire')
{ {
$don = new Don($db); $don = new Don($db);
$don->set_commentaire($_POST["rowid"],$_POST["commentaire"]); $don->set_commentaire($_POST["rowid"],$_POST["commentaire"]);
$_GET["rowid"] = $_POST["rowid"]; $_GET["rowid"] = $_POST["rowid"];
} }
if ($_GET["action"] == 'valid_promesse') if ($_GET["action"] == 'valid_promesse')
{ {
$don = new Don($db); $don = new Don($db);
if ($don->valid_promesse($_GET["rowid"], $user->id)) if ($don->valid_promesse($_GET["rowid"], $user->id))
{ {
Header("Location: liste.php"); Header("Location: liste.php");
} }
} }
if ($_GET["action"] == 'set_payed') if ($_GET["action"] == 'set_payed')
{ {
$don = new Don($db); $don = new Don($db);
if ($don->set_paye($_GET["rowid"], $modepaiement)) if ($don->set_paye($_GET["rowid"], $modepaiement))
{ {
Header("Location: liste.php"); Header("Location: liste.php");
} }
} }
if ($_GET["action"] == 'set_encaisse') if ($_GET["action"] == 'set_encaisse')
{ {
$don = new Don($db); $don = new Don($db);
if ($don->set_encaisse($_GET["rowid"])) if ($don->set_encaisse($_GET["rowid"]))
{ {
Header("Location: liste.php"); Header("Location: liste.php");
} }
} }
@ -169,13 +170,13 @@ if ($_GET["action"] == 'create') {
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print "<tr $bc[1]>".'<td>'.$langs->trans("Date").'</td><td>'; print '<tr><td>'.$langs->trans("Date").'</td><td>';
$html->select_date(); $html->select_date();
print '</td>'; print '</td>';
print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>'; print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\"></textarea></td></tr>"; print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\"></textarea></td></tr>";
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>\n"; print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db); $paiement = new Paiement($db);
@ -183,45 +184,30 @@ if ($_GET["action"] == 'create') {
print "</td></tr>\n"; print "</td></tr>\n";
if ($conf->projet->enabled) { if ($conf->projet->enabled)
{
// Si module projet actif // Si module projet actif
print "<tr $bc[1]><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n"; print "<tr><td>".$langs->trans("Project")."</td><td>";
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet ORDER BY rowid"; $html->select_projects('','','',"projetid");
if ($db->query($sql))
{
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objopt = $db->fetch_object();
print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
$i++;
}
}
else
{
dolibarr_print_error($db);
}
print "</select><br>";
print "</td></tr>\n"; print "</td></tr>\n";
} }
print "<tr $bc[1]><td>".$langs->trans("PublicDonation")."</td><td>"; print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db); $html=new Form($db);
$html->selectyesno("public",1,1); $html->selectyesno("public",1,1);
print "</td></tr>\n"; print "</td></tr>\n";
$langs->load("companies"); $langs->load("companies");
print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>'; print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>'; print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>'; print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr $bc[1]>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>'; print "<tr>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n"; print "</table>\n";
print "</form>\n"; print "</form>\n";
@ -255,59 +241,62 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="rowid" value="'.$don->id.'">'; print '<input type="hidden" name="rowid" value="'.$don->id.'">';
print "<tr $bc[1]>".'<td>'.$langs->trans("Date").'</td><td>'; print "<tr>".'<td>'.$langs->trans("Date").'</td><td>';
$html->select_date($don->date); $html->select_date($don->date);
print '</td>'; print '</td>';
print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>'; print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">$don->commentaire</textarea></td></tr>"; print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">$don->commentaire</textarea></td></tr>";
print "<tr $bc[1]><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n"; if ($conf->projet->enabled)
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet ORDER BY rowid"; {
if ($db->query($sql)) print "<tr><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n";
{ $sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet ORDER BY rowid";
$num = $db->num_rows(); if ($db->query($sql))
$i = 0; {
while ($i < $num) $num = $db->num_rows();
{ $i = 0;
$objopt = $db->fetch_object(); while ($i < $num)
print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n"; {
$i++; $objopt = $db->fetch_object();
} print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
} $i++;
else }
{ }
dolibarr_print_error($db); else
} {
print "</select><br>"; dolibarr_print_error($db);
print "</td></tr>\n"; }
print "</select><br>";
print "</td></tr>\n";
}
print "<tr $bc[1]><td>".$langs->trans("PublicDonation")."</td><td>"; print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db); $html=new Form($db);
$html->selectyesno("public",1,1); $html->selectyesno("public",1,1);
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
$langs->load("companies"); $langs->load("companies");
print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>'; print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="3">'.$don->adresse.'</textarea></td></tr>'; print '<textarea name="adresse" wrap="soft" cols="40" rows="3">'.$don->adresse.'</textarea></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>'; print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>\n"; print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT"); $paiement->select("modepaiement","CRDT");
print "</td></tr>\n"; print "</td></tr>\n";
print "<tr $bc[1]>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>'; print "<tr>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n"; print "</table>\n";
print "</form><br>\n"; print "</form>\n";
print "</div>\n"; print "</div>\n";
} }
@ -338,83 +327,70 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
print "<form action=\"fiche.php\" method=\"post\">"; print "<form action=\"fiche.php\" method=\"post\">";
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr $bc[1]><td>".$langs->trans("Date")."</td><td>"; print "<tr><td>".$langs->trans("Date")."</td><td>";
print strftime("%d %B %Y",$don->date); print dolibarr_print_date($don->date,"%d %B %Y");
print "</td>"; print "</td>";
print '<td rowspan="12" valign="top" width="50%">'.$langs->trans("Comments").' :<br>'; print '<td rowspan="12" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
print nl2br($don->commentaire).'</td></tr>'; print nl2br($don->commentaire).'</td></tr>';
if ($conf->project->enabled) { if ($conf->projet->enabled) {
print "<tr $bc[1]>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';
} }
print "<tr $bc[1]><td>".$langs->trans("PublicDonation")."</td><td>"; print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
print $yn[$don->public]; print $yn[$don->public];
print "</td></tr>\n"; print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.nl2br($don->adresse).'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Address").'</td><td>'.nl2br($don->adresse).'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.$don->email.'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("EMail").'</td><td>'.$don->email.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr $bc[1]>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
if ($don->statut == 1) print $don->modepaiement;
{ print "</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>";
$paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT", $don->modepaiementid);
print "</td></tr>\n";
}
else
{
print "<tr $bc[1]><td>".$langs->trans("PaymentMode")."</td><td>";
print $don->modepaiement;
print "</td></tr>\n";
}
print "</table>\n"; print "</table>\n";
print "</form><br>\n"; print "</form>\n";
print "</div>"; print "</div>";
/* /**
* Barre d'actions * Barre d'actions
*
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
print '<a class="tabAction" href="fiche.php?action=edit&rowid='.$don->id.'">'.$langs->trans('Edit').'</a>'; print '<a class="butAction" href="fiche.php?action=edit&rowid='.$don->id.'">'.$langs->trans('Edit').'</a>';
if ($don->statut == 0) if ($don->statut == 0)
{ {
print "<a class=\"tabAction\" href=\"fiche.php?rowid=$don->id&action=valid_promesse\">".$langs->trans("Valid")."</a>"; print '<a class="butAction" href="fiche.php?rowid='.$don->id.'&action=valid_promesse">'.$langs->trans("Valid").'</a>';
} }
// \todo Gérer action émettre paiement // \todo Gérer action émettre paiement
if ($don->statut == 1 && $resteapayer > 0) if ($don->statut == 1 && $resteapayer > 0)
{ {
print "<a class=\"tabAction\" href=\"paiement.php?facid=$facid&action=create\">".$langs->trans("DoPayment")."</a>"; print "<a class=\"butAction\" href=\"paiement.php?facid=$facid&action=create\">".$langs->trans("DoPayment")."</a>";
} }
if ($don->statut == 1 && abs($resteapayer) == 0 && $don->paye == 0) if ($don->statut == 1 && abs($resteapayer) == 0 && $don->paye == 0)
{ {
print "<a class=\"tabAction\" href=\"fiche.php?rowid=$don->id&action=set_payed\">".$langs->trans("ClassifyPayed")."</a>"; print "<a class=\"butAction\" href=\"fiche.php?rowid=$don->id&action=set_payed\">".$langs->trans("ClassifyPayed")."</a>";
} }
if ($don->statut == 2 || $don->statut == 3) if ($don->statut == 2 || $don->statut == 3)
{ {
print "<a class=\"tabAction\" href=\"formulaire/".DONS_FORM."?rowid=$don->id\">".$langs->trans("Form")."</a>"; print "<a class=\"butAction\" href=\"formulaire/".DONS_FORM."?rowid=$don->id\">".$langs->trans("Form")."</a>";
} }
if ($don->statut == 0) if ($don->statut == 0)
{ {
print "<a class=\"tabAction\" href=\"fiche.php?rowid=$don->id&action=delete\">".$langs->trans("Delete")."</a>"; print "<a class=\"butActionDelete\" href=\"fiche.php?rowid=$don->id&action=delete\">".$langs->trans("Delete")."</a>";
} }
print "</div><br>"; print "</div><br>";

11
htdocs/compta/dons/index.php
View File

@ -59,8 +59,13 @@ if ($result)
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print_titre($langs->trans("DonationsArea")); print_fiche_titre($langs->trans("DonationsArea"));
print '<br>';
print '<table width="100%" class="notopnoleftnoright">';
print '<tr><td class="notopnoleft">';
print '<table class="noborder" width="50%">'; print '<table class="noborder" width="50%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -94,6 +99,8 @@ print '</tr>';
print "</table>"; print "</table>";
print '</td></tr></table>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');

20
htdocs/compta/dons/liste.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
@ -21,7 +21,7 @@
* *
*/ */
/*! /**
\file htdocs/compta/dons/liste.php \file htdocs/compta/dons/liste.php
\ingroup don \ingroup don
\brief Page de liste des dons \brief Page de liste des dons
@ -61,7 +61,7 @@ $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $of
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $i = 0;
if ($statut >= 0) if ($statut >= 0)
@ -75,6 +75,7 @@ if ($result)
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"liste.php","d.rowid","&page=$page&statut=$statut","","",$sortfield);
print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut","","",$sortfield); print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut","","",$sortfield);
print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut","","",$sortfield); print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut","","",$sortfield);
print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut","","",$sortfield); print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut","","",$sortfield);
@ -90,13 +91,14 @@ if ($result)
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->prenom)."</a></td>\n"; print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".$objp->rowid."</a></td>\n";
print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->nom)."</a></td>\n"; print "<td>".stripslashes($objp->prenom)."</td>\n";
print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->societe)."</a></td>\n"; print "<td>".stripslashes($objp->nom)."</td>\n";
print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".strftime("%d %B %Y",$objp->datedon)."</a></td>\n"; print "<td>".stripslashes($objp->societe)."</td>\n";
print "<td>".dolibarr_print_date($objp->datedon).'</td>';
if ($conf->projet->enabled) { if ($conf->projet->enabled) {
print "<td>$objp->projet</td>\n"; print "<td>$objp->projet</td>\n";
} }
@ -115,5 +117,5 @@ else
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

1
htdocs/compta/dons/pre.inc.php
View File

@ -32,6 +32,7 @@ require("../../main.inc.php");
require("../../projetdon.class.php"); require("../../projetdon.class.php");
$langs->load("donations"); $langs->load("donations");
$langs->load("propal");
$libelle[0] = $langs->trans("PromisesNotValid"); $libelle[0] = $langs->trans("PromisesNotValid");
$libelle[1] = $langs->trans("PromisesValid"); $libelle[1] = $langs->trans("PromisesValid");