diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index cc426e89f65..996151ae219 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -47,6 +47,12 @@ $donation_date=dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST[ if ($_POST["action"] == 'update') { + if (! empty($_POST['cancel'])) + { + Header("Location: fiche.php?rowid=".$_POST["rowid"]); + exit; + } + $error=0; if (! $_POST["amount"] > 0) @@ -94,6 +100,12 @@ if ($_POST["action"] == 'update') if ($_POST["action"] == 'add') { + if (! empty($_POST['cancel'])) + { + Header("Location: index.php"); + exit; + } + $error=0; if (! $_POST["amount"] > 0) @@ -273,8 +285,8 @@ if ($_GET["action"] == 'create') print "".''.$langs->trans("Country").''; print "".''.$langs->trans("EMail").''; print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).''; - print "".''; print "\n"; + print '
   
'; print "\n"; } @@ -292,11 +304,11 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') $h=0; $head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"]; - $head[$h][1] = $langs->trans("Donation"); + $head[$h][1] = $langs->trans("Card"); $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("Ref")); + dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); print '
'; print ''; @@ -353,9 +365,10 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print "".''.$langs->trans("Status").''.$don->getLibStatut(4).''; - print "".''; - print "\n"; + + print '
   
'; + print "
\n"; print "\n"; @@ -380,7 +393,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("Donation")); + dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); print "
"; print ''; diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 17b14581b99..92ec719be9e 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -18,11 +18,11 @@ */ /** - \file htdocs/compta/dons/liste.php - \ingroup don - \brief Page de liste des dons - \version $Id$ -*/ + \file htdocs/compta/dons/liste.php + \ingroup don + \brief Page de liste des dons + \version $Id$ + */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/don.class.php"); @@ -50,7 +50,7 @@ $pagenext = $page + 1; llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones'); -$donstatic=new Don($db); +$donationstatic=new Don($db); // Genere requete de liste des dons $sql = "SELECT d.rowid, ".$db->pdate("d.datedon")." as datedon, d.prenom, d.nom, d.societe,"; @@ -60,66 +60,69 @@ $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p $sql.= " ON p.rowid = d.fk_don_projet WHERE 1 = 1"; if ($statut >= 0) { - $sql .= " AND d.fk_statut = ".$statut; + $sql .= " AND d.fk_statut = ".$statut; } -$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset); +$sql.= $db->order($sortfield,$sortorder); +$sql.= $db->plimit($conf->liste_limit, $offset); $result = $db->query($sql); if ($result) { - $num = $db->num_rows($result); - $i = 0; + $num = $db->num_rows($result); + $i = 0; - if ($statut >= 0) - { - print_barre_liste($libelle[$statut], $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); - } - else - { - print_barre_liste($langs->trans("Donation"), $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); - } - print ""; + if ($statut >= 0) + { + print_barre_liste($libelle[$statut], $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); + } + else + { + print_barre_liste($langs->trans("Donation"), $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); + } + print "
"; - print ''; - print_liste_field_titre($langs->trans("Ref"),"liste.php","d.rowid","&page=$page&statut=$statut","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder); - if ($conf->projet->enabled) - { - $langs->load("projects"); - print_liste_field_titre($langs->trans("Project"),"liste.php","projet","&page=$page&statut=$statut","","",$sortfield,$sortorder); - } - print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); - print "\n"; + print ''; + print_liste_field_titre($langs->trans("Ref"),"liste.php","d.rowid","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder); + if ($conf->projet->enabled) + { + $langs->load("projects"); + print_liste_field_titre($langs->trans("Project"),"liste.php","projet","&page=$page&statut=$statut","","",$sortfield,$sortorder); + } + print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); + print "\n"; - $var=True; - while ($i < $num) - { - $objp = $db->fetch_object($result); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print ''; - if ($conf->projet->enabled) { - print "\n"; - } - print ''; - print ''; + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object($result); + $var=!$var; + print ""; + $donationstatic->id=$objp->rowid; + $donationstatic->ref=$objp->rowid; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print ''; + if ($conf->projet->enabled) { + print "\n"; + } + print ''; + print ''; - print ""; - $i++; - } - print "
rowid\">".$objp->rowid."".stripslashes($objp->prenom)."".stripslashes($objp->nom)."".stripslashes($objp->societe)."'.dol_print_date($objp->datedon).'$objp->projet'.price($objp->amount).''.$donstatic->LibStatut($objp->statut,5).'
".$donationstatic->getNomUrl(1)."".stripslashes($objp->prenom)."".stripslashes($objp->nom)."".stripslashes($objp->societe)."'.dol_print_date($objp->datedon).'$objp->projet'.price($objp->amount).''.$donationstatic->LibStatut($objp->statut,5).'
"; + print ""; + $i++; + } + print ""; } else { - dol_print_error($db); + dol_print_error($db); } diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index fdcfd7f696b..3dbe8a8c860 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -196,12 +196,13 @@ insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->propal->enabled', 'auguria', 'left', 1800__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/propal.php', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->commande->enabled', 'auguria', 'left', 1900__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/commande/liste.php?leftmenu=orders&status=3&afacturer=1', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled', 'auguria', 'left', 2000__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); -insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled', 'auguria', 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/fiche.php?action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); -insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled', 'auguria', 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/liste.php?action=create', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); -insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled', 'auguria', 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled && $leftmenu=="donations"', 'auguria', 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/fiche.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled && $leftmenu=="donations"', 'auguria', 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/liste.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->don->enabled && $leftmenu=="donations"', 'auguria', 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled', 'auguria', 'left', 2100__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/deplacement/index.php?leftmenu=tripsandexpenses', 'TripsAndExpenses', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5, __ENTITY__); -insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled', 'auguria', 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 0, 1, __ENTITY__); -insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled', 'auguria', 'left', 2102__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/index.php?leftmenu=tripsandexpenses', 'List', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled && $leftmenu=="tripsandexpenses"', 'auguria', 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/fiche.php?action=create&leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 0, 1, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled && $leftmenu=="tripsandexpenses"', 'auguria', 'left', 2102__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/index.php?leftmenu=tripsandexpenses', 'List', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__); +insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->deplacement->enabled && $leftmenu=="tripsandexpenses"', 'auguria', 'left', 2103__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses', 'Statistics', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->tax->enabled', 'auguria', 'left', 2200__+MAX_llx_menu__, 'accountancy', '', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuTaxAndDividends', 0, 'compta', '$user->rights->tax->charges->lire', '', 0, 6, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->tax->enabled', 'auguria', 'left', 2201__+MAX_llx_menu__, 'accountancy', '', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into `llx_menu` (`enabled`, `menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `usertype`, position, entity) values ('$conf->tax->enabled', 'auguria', 'left', 2202__+MAX_llx_menu__, 'accountancy', '', 2201__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);