From 569d3f6a45710cdd2da70a22212551efc216d780 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Aug 2005 20:28:11 +0000 Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20gestion=20des=20dons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/dons/fiche.php | 320 +++++++++++++++------------------ htdocs/compta/dons/index.php | 11 +- htdocs/compta/dons/liste.php | 20 ++- htdocs/compta/dons/pre.inc.php | 1 + 4 files changed, 169 insertions(+), 183 deletions(-) diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 20359a36d35..abc917d765d 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * 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 @@ -21,7 +21,8 @@ * */ -/*! \file htdocs/compta/dons/fiche.php +/** + \file htdocs/compta/dons/fiche.php \ingroup don \brief Page de fiche de don \version $Revision$ @@ -37,113 +38,113 @@ $langs->load("bills"); $mesg=""; -if ($_POST["action"] == 'update') +if ($_POST["action"] == 'update') { - + if ($_POST["amount"] > 0) { - $don = new Don($db); - $don->id = $_POST["rowid"]; - $don->fetch($_POST["rowid"]); + $don = new Don($db); + $don->id = $_POST["rowid"]; + $don->fetch($_POST["rowid"]); - $don->prenom = $_POST["prenom"]; - $don->nom = $_POST["nom"]; - $don->societe = $_POST["societe"]; - $don->adresse = $_POST["adresse"]; - $don->amount = $_POST["amount"]; - $don->cp = $_POST["cp"]; - $don->ville = $_POST["ville"]; - $don->email = $_POST["email"]; - $don->date = mktime(12, 0 , 0, $remonth, $reday, $reyear); - $don->note = $_POST["note"]; - $don->pays = $_POST["pays"]; - $don->public = $_POST["public"]; - $don->projetid = $_POST["projetid"]; - $don->commentaire = $_POST["comment"]; - $don->modepaiementid = $_POST["modepaiement"]; - - if ($don->update($user->id) ) - { - Header("Location: index.php"); - } + $don->prenom = $_POST["prenom"]; + $don->nom = $_POST["nom"]; + $don->societe = $_POST["societe"]; + $don->adresse = $_POST["adresse"]; + $don->amount = $_POST["amount"]; + $don->cp = $_POST["cp"]; + $don->ville = $_POST["ville"]; + $don->email = $_POST["email"]; + $don->date = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $don->note = $_POST["note"]; + $don->pays = $_POST["pays"]; + $don->public = $_POST["public"]; + $don->projetid = $_POST["projetid"]; + $don->commentaire = $_POST["comment"]; + $don->modepaiementid = $_POST["modepaiement"]; + + if ($don->update($user) > 0) + { + Header("Location: fiche.php?rowid=".$don->id); + } } - else + else { - $mesg="Montant non défini"; + $mesg="Montant non défini"; } } -if ($_POST["action"] == 'add') +if ($_POST["action"] == 'add') { - + if ($_POST["amount"] > 0) { - $don = new Don($db); - - $don->prenom = $_POST["prenom"]; - $don->nom = $_POST["nom"]; - $don->societe = $_POST["societe"]; - $don->adresse = $_POST["adresse"]; - $don->amount = $_POST["amount"]; - $don->cp = $_POST["cp"]; - $don->ville = $_POST["ville"]; - $don->email = $_POST["email"]; - $don->date = mktime(12, 0 , 0, $remonth, $reday, $reyear); - $don->note = $_POST["note"]; - $don->pays = $_POST["pays"]; - $don->public = $_POST["public"]; - $don->projetid = $_POST["projetid"]; - $don->commentaire = $_POST["comment"]; - $don->modepaiementid = $_POST["modepaiement"]; - - if ($don->create($user->id) ) - { - Header("Location: index.php"); - } + $don = new Don($db); + + $don->prenom = $_POST["prenom"]; + $don->nom = $_POST["nom"]; + $don->societe = $_POST["societe"]; + $don->adresse = $_POST["adresse"]; + $don->amount = $_POST["amount"]; + $don->cp = $_POST["cp"]; + $don->ville = $_POST["ville"]; + $don->email = $_POST["email"]; + $don->date = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $don->note = $_POST["note"]; + $don->pays = $_POST["pays"]; + $don->public = $_POST["public"]; + $don->projetid = $_POST["projetid"]; + $don->commentaire = $_POST["comment"]; + $don->modepaiementid = $_POST["modepaiement"]; + + if ($don->create($user) > 0) + { + Header("Location: index.php"); + } } - else + else { - $mesg="Montant non défini"; - $_GET["action"] = "create"; + $mesg="Montant non défini"; + $_GET["action"] = "create"; } } if ($_GET["action"] == 'delete') { - $don = new Don($db); - $don->delete($_GET["rowid"]); - Header("Location: liste.php"); + $don = new Don($db); + $don->delete($_GET["rowid"]); + Header("Location: liste.php"); } if ($_POST["action"] == 'commentaire') { - $don = new Don($db); - $don->set_commentaire($_POST["rowid"],$_POST["commentaire"]); - $_GET["rowid"] = $_POST["rowid"]; + $don = new Don($db); + $don->set_commentaire($_POST["rowid"],$_POST["commentaire"]); + $_GET["rowid"] = $_POST["rowid"]; } if ($_GET["action"] == 'valid_promesse') { - $don = new Don($db); - if ($don->valid_promesse($_GET["rowid"], $user->id)) + $don = new Don($db); + if ($don->valid_promesse($_GET["rowid"], $user->id)) { - Header("Location: liste.php"); + Header("Location: liste.php"); } } if ($_GET["action"] == 'set_payed') { - $don = new Don($db); - if ($don->set_paye($_GET["rowid"], $modepaiement)) + $don = new Don($db); + if ($don->set_paye($_GET["rowid"], $modepaiement)) { - Header("Location: liste.php"); + Header("Location: liste.php"); } } if ($_GET["action"] == 'set_encaisse') { - $don = new Don($db); - if ($don->set_encaisse($_GET["rowid"])) + $don = new Don($db); + if ($don->set_encaisse($_GET["rowid"])) { - Header("Location: liste.php"); + Header("Location: liste.php"); } } @@ -169,13 +170,13 @@ if ($_GET["action"] == 'create') { print ''; - print "".''.$langs->trans("Date").''; + print ''.$langs->trans("Date").''; $html->select_date(); print ''; print ''.$langs->trans("Comments").' :
'; print ""; - print "".$langs->trans("PaymentMode")."\n"; + print "".$langs->trans("PaymentMode")."\n"; $paiement = new Paiement($db); @@ -183,45 +184,30 @@ if ($_GET["action"] == 'create') { print "\n"; - if ($conf->projet->enabled) { + if ($conf->projet->enabled) + { // Si module projet actif - print "".$langs->trans("Project")."
"; + print "".$langs->trans("Project").""; + $html->select_projects('','','',"projetid"); print "\n"; } - print "".$langs->trans("PublicDonation").""; + print "".$langs->trans("PublicDonation").""; $html=new Form($db); $html->selectyesno("public",1,1); print "\n"; $langs->load("companies"); - print "".''.$langs->trans("Company").''; - print "".''.$langs->trans("Firstname").''; - print "".''.$langs->trans("Lastname").''; - print "".''.$langs->trans("Address").''; + print "".''.$langs->trans("Company").''; + print "".''.$langs->trans("Firstname").''; + print "".''.$langs->trans("Lastname").''; + print "".''.$langs->trans("Address").''; print ''; - print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '; - print "".''.$langs->trans("Country").''; - print "".''.$langs->trans("EMail").''; - print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).''; - print "".''; + print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '; + print "".''.$langs->trans("Country").''; + print "".''.$langs->trans("EMail").''; + print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).''; + print "".''; print "\n"; print "\n"; @@ -255,59 +241,62 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print ''; print ''; - print "".''.$langs->trans("Date").''; + print "".''.$langs->trans("Date").''; $html->select_date($don->date); print ''; print ''.$langs->trans("Comments").' :
'; print ""; - print "".$langs->trans("Project")."
"; - print "\n"; - - print "".$langs->trans("PublicDonation").""; + if ($conf->projet->enabled) + { + print "".$langs->trans("Project")."
"; + print "\n"; + } + + print "".$langs->trans("PublicDonation").""; $html=new Form($db); $html->selectyesno("public",1,1); print ""; print "\n"; $langs->load("companies"); - print "".''.$langs->trans("Company").''; - print "".''.$langs->trans("Firstname").''; - print "".''.$langs->trans("Lastname").''; - print "".''.$langs->trans("Address").''; + print "".''.$langs->trans("Company").''; + print "".''.$langs->trans("Firstname").''; + print "".''.$langs->trans("Lastname").''; + print "".''.$langs->trans("Address").''; print ''; - print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '; - print "".''.$langs->trans("Country").''; - print "".''.$langs->trans("EMail").''; - print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).''; + print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").' '; + print "".''.$langs->trans("Country").''; + print "".''.$langs->trans("EMail").''; + print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).''; - print "".$langs->trans("PaymentMode")."\n"; + print "".$langs->trans("PaymentMode")."\n"; $paiement = new Paiement($db); $paiement->select("modepaiement","CRDT"); print "\n"; - print "".''; + print "".''; print "\n"; - print "
\n"; + print "\n"; print "\n"; } @@ -338,83 +327,70 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print "
"; print ''; - print ""; print ''; - if ($conf->project->enabled) { - print "".''; + if ($conf->projet->enabled) { + print "".''; } - print "\n"; - - print "".''; - print "".''; - print "".''; - print "".''; - print "".''; - print "".''; - print "".''; - print "".''; - if ($don->statut == 1) - { - print "\n"; - } - else - { - print "\n"; - } + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "\n"; print "
".$langs->trans("Date").""; - print strftime("%d %B %Y",$don->date); + print "
".$langs->trans("Date").""; + print dolibarr_print_date($don->date,"%d %B %Y"); print "'.$langs->trans("Comments").' :
'; print nl2br($don->commentaire).'
'.$langs->trans("Project").''.$don->projet.'
'.$langs->trans("Project").''.$don->projet.'
".$langs->trans("PublicDonation").""; - + print "
".$langs->trans("PublicDonation").""; print $yn[$don->public]; print "
'.$langs->trans("Company").''.$don->societe.'
'.$langs->trans("Firstname").''.$don->prenom.'
'.$langs->trans("Lastname").''.$don->nom.'
'.$langs->trans("Address").''.nl2br($don->adresse).'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$don->cp.' '.$don->ville.'
'.$langs->trans("Country").''.$don->pays.'
'.$langs->trans("EMail").''.$don->email.'
'.$langs->trans("Amount").''.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'
".$langs->trans("PaymentMode").""; - $paiement = new Paiement($db); - $paiement->select("modepaiement","CRDT", $don->modepaiementid); - print "
".$langs->trans("PaymentMode").""; - print $don->modepaiement; - print "
'.$langs->trans("Company").''.$don->societe.'
'.$langs->trans("Firstname").''.$don->prenom.'
'.$langs->trans("Lastname").''.$don->nom.'
'.$langs->trans("Address").''.nl2br($don->adresse).'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$don->cp.' '.$don->ville.'
'.$langs->trans("Country").''.$don->pays.'
'.$langs->trans("EMail").''.$don->email.'
'.$langs->trans("Amount").''.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'
".$langs->trans("PaymentMode").""; + print $don->modepaiement; + print "
\n"; - print "

\n"; + print "\n"; print ""; - /* + /** * Barre d'actions - * */ print '
'; - print ''.$langs->trans('Edit').''; + print ''.$langs->trans('Edit').''; if ($don->statut == 0) { - print "id&action=valid_promesse\">".$langs->trans("Valid").""; + print ''.$langs->trans("Valid").''; } // \todo Gérer action émettre paiement if ($don->statut == 1 && $resteapayer > 0) { - print "".$langs->trans("DoPayment").""; + print "".$langs->trans("DoPayment").""; } if ($don->statut == 1 && abs($resteapayer) == 0 && $don->paye == 0) { - print "id&action=set_payed\">".$langs->trans("ClassifyPayed").""; + print "id&action=set_payed\">".$langs->trans("ClassifyPayed").""; } if ($don->statut == 2 || $don->statut == 3) { - print "id\">".$langs->trans("Form").""; + print "id\">".$langs->trans("Form").""; } if ($don->statut == 0) { - print "id&action=delete\">".$langs->trans("Delete").""; + print "id&action=delete\">".$langs->trans("Delete").""; } print "

"; diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index a5d43325a15..4658568d991 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -59,8 +59,13 @@ if ($result) dolibarr_print_error($db); } -print_titre($langs->trans("DonationsArea")); -print '
'; +print_fiche_titre($langs->trans("DonationsArea")); + + +print ''; + +print '
'; + print ''; print ''; @@ -94,6 +99,8 @@ print ''; print "
"; +print '
'; + $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 0ee559b8626..d77363f0102 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * 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 @@ -21,7 +21,7 @@ * */ -/*! +/** \file htdocs/compta/dons/liste.php \ingroup don \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); if ($result) { - $num = $db->num_rows(); + $num = $db->num_rows($result); $i = 0; if ($statut >= 0) @@ -75,6 +75,7 @@ if ($result) print ""; print ''; + 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("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); @@ -90,13 +91,14 @@ if ($result) $var=True; while ($i < $num) { - $objp = $db->fetch_object(); + $objp = $db->fetch_object($result); $var=!$var; print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "'; if ($conf->projet->enabled) { print "\n"; } @@ -115,5 +117,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 806658dc834..4ca0ffe1405 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -32,6 +32,7 @@ require("../../main.inc.php"); require("../../projetdon.class.php"); $langs->load("donations"); +$langs->load("propal"); $libelle[0] = $langs->trans("PromisesNotValid"); $libelle[1] = $langs->trans("PromisesValid");
rowid\">".stripslashes($objp->prenom)."rowid\">".stripslashes($objp->nom)."rowid\">".stripslashes($objp->societe)."rowid\">".strftime("%d %B %Y",$objp->datedon)."rowid\">".$objp->rowid."".stripslashes($objp->prenom)."".stripslashes($objp->nom)."".stripslashes($objp->societe)."".dolibarr_print_date($objp->datedon).'$objp->projet