diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 134ce525316..d840c89a753 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -21,16 +21,19 @@ * */ -/*! \file htdocs/compta/dons/fiche.php +/*! \file htdocs/compta/dons/fiche.php \ingroup don \brief Page de fiche de don \version $Revision$ */ -require("./pre.inc.php"); -require("../../don.class.php"); -require("../../paiement.class.php"); +require_once("./pre.inc.php"); +require_once("../../don.class.php"); +require_once("../../paiement.class.php"); +require_once("../../html.form.class.php"); +$langs->load("donations"); +$langs->load("bills"); $mesg=""; @@ -158,53 +161,53 @@ llxHeader(); if ($_GET["action"] == 'create') { - print_titre("Saisir un don"); + print_titre($langs->trans("AddDonation")); print '
'; print ''; print ''; - print "".'".''; print '"; - print "\n"; - print "\n"; - - print "\n"; + } - print ''; - print ''; - - print "
"; + print "\n"; $langs->load("companies"); @@ -237,7 +240,13 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') $don->id = $_GET["rowid"]; $don->fetch($_GET["rowid"]); - print_titre("Traitement du don"); + $h=0; + $head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"]; + $head[$h][1] = $langs->trans("Donation"); + $hselected=$h; + $h++; + + dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]); print ''; print '
Date du don'; + print "
'.$langs->trans("Date").''; print_date_select(); print ''.$langs->trans("Comments").' :
'; print "
Mode de paiement\n"; + print "
".$langs->trans("PaymentMode")."\n"; $paiement = new Paiement($db); - $paiement->select("modepaiement","crédit"); + $paiement->select("modepaiement","CRDT"); print "
".$langs->trans("Project")."
"; - print "
Don public
".$langs->trans("Project")."
"; + print "
".$langs->trans("PublicDonation").""; + $html=new Form($db); + $html->selectyesno("public",1,1); print "
'; @@ -245,7 +254,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print ''; print ''; - print "".'".''; @@ -272,11 +281,11 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print "
"; print "\n"; - print "\n"; + print ""; + print "\n"; $langs->load("companies"); print "".''; @@ -289,16 +298,17 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print "".''; print "".''; - print "\n"; print "".''; print "
Date du don'; + print "
'.$langs->trans("Date").''; print_date_select($don->date); print '
Don public
"; - print "
".$langs->trans("PublicDonation").""; + $html=new Form($db); + $html->selectyesno("public",1,1); + print "
'.$langs->trans("Company").'
'.$langs->trans("EMail").'
'.$langs->trans("Amount").' euros
Mode de paiement\n"; + print "
".$langs->trans("PaymentMode")."\n"; $paiement = new Paiement($db); - $paiement->select("modepaiement","crédit"); + $paiement->select("modepaiement","CRDT"); print "
\n"; - print "
\n"; + print "
\n"; + print "\n"; } @@ -315,20 +325,30 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $don->id = $_GET["rowid"]; $don->fetch($_GET["rowid"]); - print_titre("Traitement du don"); + + $h=0; + $head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"]; + $head[$h][1] = $langs->trans("Donation"); + $hselected=$h; + $h++; + + dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]); + print "
"; print ''; - print ""; print ''; - print "".''; - - print "".''; + } + + print "\n"; @@ -344,20 +364,22 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print "".''; if ($don->statut == 1) { - print "\n"; } else { - print "\n"; } print "
Date du don"; + print "
".$langs->trans("Date").""; print strftime("%d %B %Y",$don->date); print "'.$langs->trans("Comments").' :
'; print nl2br($don->commentaire).'
Projet'.$don->projet.'
Don public"; + if ($conf->project->enabled) { + print "
'.$langs->trans("Project").''.$don->projet.'
".$langs->trans("PublicDonation").""; print $yn[$don->public]; print "
'.$langs->trans("Amount").''.price($don->amount).' euros
Mode de paiement"; + print "
".$langs->trans("PaymentMode").""; $paiement = new Paiement($db); - $paiement->select("modepaiement","crédit", $don->modepaiementid); + $paiement->select("modepaiement","CRDT", $don->modepaiementid); print "
Mode de paiement"; + print "
".$langs->trans("PaymentMode").""; print $don->modepaiement; print "
\n"; - print "
\n"; + print "
\n"; + + print ""; /* @@ -368,34 +390,31 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print ''.$langs->trans('Edit').''; - if ($don->statut == 1 && $resteapayer > 0) - { - print "Emettre un paiement"; - } - if ($don->statut == 0) { - print "id&action=valid_promesse\">Valider la promesse"; - } - - if ($don->statut == 3) - { - print "id\">Formulaire"; + print "id&action=valid_promesse\">".$langs->trans("Valid").""; } - if ($don->statut == 1 && abs($resteapayer == 0) && $don->paye == 0) + // \todo Gérer action émettre paiement + if ($don->statut == 1 && $resteapayer > 0) { - print "id&action=set_payed\">Classé payé"; + print "".$langs->trans("DoPayment").""; + } + + if ($don->statut == 1 && abs($resteapayer) == 0 && $don->paye == 0) + { + print "id&action=set_payed\">".$langs->trans("ClassifyPayed").""; + } + + if ($don->statut == 2 || $don->statut == 3) + { + print "id\">".$langs->trans("Form").""; } if ($don->statut == 0) { print "id&action=delete\">".$langs->trans("Delete").""; } - if ($don->statut == 2) - { - print "id&action=set_encaisse\">Encaisser"; - } print "
"; diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index fe2c9e6081d..8667bcb88ab 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -21,7 +21,7 @@ * */ -/*! \file htdocs/compta/dons/index.php +/*! \file htdocs/compta/dons/index.php \ingroup don \brief Page accueil espace don \version $Revision$ @@ -29,10 +29,11 @@ require("./pre.inc.php"); +$langs->load("donations"); llxHeader(); -$sql = "SELECT sum(d.amount) as somme , d.fk_statut FROM ".MAIN_DB_PREFIX."don as d GROUP BY d.fk_statut"; +$sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut FROM ".MAIN_DB_PREFIX."don as d GROUP BY d.fk_statut order by d.fk_statut"; $result = $db->query($sql); @@ -45,31 +46,43 @@ if ($result) $objp = $db->fetch_object($result); $somme[$objp->fk_statut] = $objp->somme; + $nb[$objp->fk_statut] = $objp->nb; $i++; } $db->free(); +} else { + dolibarr_print_error($db); } -print_titre("Dons"); +print_titre($langs->trans("Donations")); -print ''; +print '
'; print ''; -print ""; -print ""; +print ''; +print ''; +print ''; print "\n"; $var=True; -for ($i = 0 ; $i < 4 ; $i++) +for ($i = 0 ; $i < 3 ; $i++) { $var=!$var; print ""; print ''; + print ''; print ''; + $totalnb += $nb[$i]; $total += $somme[$i]; print ""; } -print "".''; + +$var=!$var; +print ""; +print ''; +print ''; +print ''; +print ''; print "
 Somme'.$langs->trans("Status").''.$langs->trans("Number").''.$langs->trans("Amount").'
'.$libelle[$i].''.$nb[$i].''.price($somme[$i]).'
'.$langs->trans("Total").''.price($total).'
'.$langs->trans("Total").''.$totalnb.''.price($total).'
"; diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index fa147678f5e..101b47be2d4 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -30,12 +30,13 @@ require("./pre.inc.php"); +$langs->load("donations"); llxHeader(); $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; -$statut=$_GET["statut"]; +$statut=isset($_GET["statut"])?$_GET["statut"]:"-1"; $page=$_GET["page"]; if ($sortorder == "") { $sortorder="DESC"; } @@ -51,9 +52,9 @@ $pagenext = $page + 1; $sql = "SELECT d.rowid, ".$db->pdate("d.datedon")." as datedon, d.prenom, d.nom, d.societe, d.amount, p.libelle as projet"; $sql .= " FROM ".MAIN_DB_PREFIX."don as d left join ".MAIN_DB_PREFIX."don_projet as p"; $sql .= " ON p.rowid = d.fk_don_projet WHERE 1 = 1"; -if (isset($_GET["statut"])) +if ($statut >= 0) { - $sql .= " AND d.fk_statut = ".$_GET["statut"]; + $sql .= " AND d.fk_statut = ".$statut; } $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset); @@ -63,23 +64,25 @@ if ($result) $num = $db->num_rows(); $i = 0; - if (strlen($statut)) + if ($statut >= 0) { print_barre_liste($libelle[$statut], $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); } else { - print_barre_liste("Dons", $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); + print_barre_liste($langs->trans("Donation"), $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); } print ""; print ''; - print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut"); - print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut"); - print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut"); - print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut"); - print_liste_field_titre($langs->trans("Project"),"liste.php","","&page=$page&statut=$statut"); - print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"'); + 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); + print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut","","",$sortfield); + if ($conf->projet->enabled) { + print_liste_field_titre($langs->trans("Project"),"liste.php","projet","&page=$page&statut=$statut","","",$sortfield); + } + print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield); print ''; print "\n"; @@ -93,7 +96,9 @@ if ($result) print "\n"; print "\n"; print "\n"; - print "\n"; + if ($conf->projet->enabled) { + print "\n"; + } print ''; print ""; diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index cbdec4335f4..45c1aaa0037 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -21,7 +21,7 @@ * */ -/*! \file htdocs/compta/dons/pre.inc.php +/*! \file htdocs/compta/dons/pre.inc.php \ingroup don \brief Fichier gestionnaire du menu de gauche de l'espace dons \version $Revision$ @@ -30,29 +30,29 @@ require("../../main.inc.php"); require("../../projetdon.class.php"); -$libelle[0] = "Promesses non validées"; -$libelle[1] = "Promesses validées"; -$libelle[2] = "Dons payés"; -$libelle[3] = "Dons encaissés"; +$langs->load("donations"); + +$libelle[0] = $langs->trans("PromisesNotValid"); +$libelle[1] = $langs->trans("PromisesValid"); +$libelle[2] = $langs->trans("DonationsPayed"); +$libelle[3] = $langs->trans("DonationsReceived"); function llxHeader($head = "") { global $user, $conf, $langs; - /* - * - * - */ + $langs->load("donations"); + top_menu($head); $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/compta/dons/","Dons"); - $menu->add_submenu("fiche.php?action=create","Saisir un don"); - $menu->add_submenu("liste.php",$langs->trans("List")); - $menu->add_submenu("stats.php",$langs->trans("Statistics")); + $menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations")); + $menu->add_submenu(DOL_URL_ROOT."/compta/dons/fiche.php?action=create",$langs->trans("AddDonation")); + $menu->add_submenu(DOL_URL_ROOT."/compta/dons/liste.php",$langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/compta/dons/stats.php",$langs->trans("Statistics")); - $menu->add(DOL_URL_ROOT."/compta/bank/index.php","Banque"); + $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("Bank")); left_menu($menu->liste); diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 6dec0181cf5..431c9bf32c7 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -30,6 +30,8 @@ require("./pre.inc.php"); +$langs->load("donations"); + llxHeader(); @@ -56,7 +58,7 @@ if ($result) print '
 
rowid\">".stripslashes($objp->nom)."rowid\">".stripslashes($objp->societe)."rowid\">".strftime("%d %B %Y",$objp->datedon)."$objp->projet$objp->projet'.price($objp->amount).' 
'; print ""; - print ''; + print ''; print "".''; print "".''; print ""; @@ -65,7 +67,7 @@ if ($result) } else { - pdolibarr_print_error($db); + dolibarr_print_error($db); }
Nombre de dons'.$num.'
'.$langs->trans("DonationsNumber").''.$num.'
'.$langs->trans("Total").''.price($total).'
'.$langs->trans("Average").''.price($total / ($num?$num:1)).'