diff --git a/htdocs/compta/bank/budget.php3 b/htdocs/compta/bank/budget.php3 index 1a5f861f8f2..bc71d7bda0a 100644 --- a/htdocs/compta/bank/budget.php3 +++ b/htdocs/compta/bank/budget.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ * * 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 @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("./pre.inc.php3"); @@ -38,12 +38,13 @@ $db = new Db(); * */ -if ($bid == 0) { +if ($bid == 0) +{ /* * Liste */ - print "Budgets"; - + print_titre("Budgets"); + print ""; print ""; echo ''; @@ -54,45 +55,55 @@ if ($bid == 0) { $sql .= " WHERE d.rowid=l.lineid AND c.rowid = l.fk_categ GROUP BY c.label, c.rowid ORDER BY c.label"; $result = $db->query($sql); - if ($result) { - $num = $db->num_rows(); - $i = 0; $total = 0; - - $var=True; - while ($i < $num) { - $objp = $db->fetch_object( $i); - $var=!$var; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - $i++; - $total = $total + abs($objp->somme); + if ($result) + { + $num = $db->num_rows(); + $i = 0; $total = 0; + + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object( $i); + $var=!$var; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + $i++; + $total = $total + abs($objp->somme); + } + $db->free(); + + print ''; + print ''; + print "\n"; + } + else + { + print $db->error(); } - $db->free(); - print ""; - print "\n"; - } else { - print $db->error(); - } print "
DescriptionNbTotalMoyenne
rowid\">$objp->label$objp->nombre".price(abs($objp->somme))."".francs(abs($objp->somme))." FF".price(abs($objp->somme / $objp->nombre))."
rowid\">$objp->label$objp->nombre".price(abs($objp->somme))."".francs(abs($objp->somme))." FF".price(abs($objp->somme / $objp->nombre))."
Total'.price($total).' 
soit en francs".francs($total)."
Total".price($total)."
soit en francs".francs($total)."
"; -} else { +} +else +{ /* * Vue */ $sql = "SELECT label FROM llx_bank_categ WHERE rowid=$bid"; - if ( $db->query($sql) ) { - if ( $db->num_rows() ) { - $budget_name = $db->result(0,0); + if ( $db->query($sql) ) + { + if ( $db->num_rows() ) + { + $budget_name = $db->result(0,0); + } + $db->free(); } - $db->free(); - } - - print "Budget : $budget_name"; + + print_titre("Budget : $budget_name"); print ""; print ""; @@ -104,33 +115,37 @@ if ($bid == 0) { $sql .= " WHERE d.rowid=l.lineid AND l.fk_categ=$bid ORDER by d.dateo DESC"; $result = $db->query($sql); - if ($result) { - $num = $db->num_rows(); - $i = 0; $total = 0; - - $var=True; - while ($i < $num) { - $objp = $db->fetch_object( $i); - $var=!$var; - print ""; - print "\n"; - - print ""; - print ""; - print ""; - - print ""; - $i++; - $total = $total + $objp->amount; + if ($result) + { + $num = $db->num_rows(); + $i = 0; $total = 0; + + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object( $i); + $var=!$var; + print ""; + print "\n"; + + print ""; + print ""; + print ""; + + print ""; + $i++; + $total = $total + $objp->amount; + } + $db->free(); + print ""; + print "\n"; } - $db->free(); - print ""; - print "\n"; - } else { - print $db->error(); + else + { + print $db->error(); } print "
".strftime("%d %B %Y",$objp->do)."rowid\">$objp->label".price(abs($objp->amount))."".francs(abs($objp->amount))."
".strftime("%d %B %Y",$objp->do)."rowid\">$objp->label".price(abs($objp->amount))."".francs(abs($objp->amount))."
Total".price(abs($total))."euros
soit".francs(abs($total))."francs
Total".price(abs($total))."euros
soit".francs(abs($total))."francs
"; - + } diff --git a/htdocs/compta/bank/config.php3 b/htdocs/compta/bank/config.php3 index b2867539d84..32a3c1b1244 100644 --- a/htdocs/compta/bank/config.php3 +++ b/htdocs/compta/bank/config.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ * * 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 @@ -18,6 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ */ require("./pre.inc.php3"); @@ -26,18 +25,15 @@ require("./bank.lib.php3"); llxHeader(); $db = new Db(); -if ($action == 'add') { +if ($action == 'add') +{ $author = $GLOBALS["REMOTE_USER"]; - + $sql = "INSERT INTO llx_bank_account (label, number, bank) VALUES ('$label','$number','$bank')"; $result = $db->query($sql); } -if ($action == 'del') { - bank_delete_line($db, $rowid); -} - -print "Configuration"; +print_titre("Configuration"); print ""; print ""; diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index 61fc2aec811..740df09be20 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -19,7 +19,6 @@ * $Source$ * */ - require ($GLOBALS["DOCUMENT_ROOT"]."/conf/conf.class.php3"); require ($GLOBALS["DOCUMENT_ROOT"]."/lib/mysql.lib.php3"); require ($GLOBALS["DOCUMENT_ROOT"]."/lib/functions.inc.php3"); @@ -29,6 +28,7 @@ require ($GLOBALS["DOCUMENT_ROOT"]."/menu.class.php3"); require ($GLOBALS["DOCUMENT_ROOT"]."/societe.class.php3"); require ($GLOBALS["DOCUMENT_ROOT"]."/rtplang.class.php"); + $conf = new Conf(); $db = new Db(); diff --git a/htdocs/public/dons/code_valid.php b/htdocs/public/dons/code_valid.php index 1cf009f6136..d6b6e1b62e9 100644 --- a/htdocs/public/dons/code_valid.php +++ b/htdocs/public/dons/code_valid.php @@ -21,10 +21,13 @@ */ print ''; +print ''; print ''; +print ''; print ''; print ''; print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php index b81569e03e5..3d907d96d4c 100644 --- a/htdocs/public/dons/donateurs_code.php +++ b/htdocs/public/dons/donateurs_code.php @@ -24,7 +24,7 @@ $conf = new Conf(); $db = new Db(); -$sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.amount, d.public"; +$sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.amount, d.public, d.societe"; $sql .= " FROM llx_don as d"; $sql .= " WHERE d.fk_don_projet = 1 AND d.fk_statut = 3 ORDER BY d.datedon DESC"; @@ -37,7 +37,7 @@ if ( $db->query( $sql) ) print "
"; print ''; - print ""; + print ""; print ""; print ""; print "\n"; @@ -53,7 +53,7 @@ if ( $db->query( $sql) ) print ""; if ($objp->public) { - print "\n"; + print "\n"; } else { diff --git a/htdocs/public/dons/merci.xhtml b/htdocs/public/dons/merci.xhtml index 75482ae52cb..03f291e0589 100644 --- a/htdocs/public/dons/merci.xhtml +++ b/htdocs/public/dons/merci.xhtml @@ -14,17 +14,35 @@

- Merci pour votre soutient + Merci pour votre soutien.

- - + +
NomNom / SociétéDateMontant
".stripslashes($objp->nom)."".stripslashes($objp->nom)." ".stripslashes($objp->societe)."
+ + + + + + + + + + + + + + + +
+ diff --git a/htdocs/public/dons/valid.xhtml b/htdocs/public/dons/valid.xhtml index 8620df33747..724f7cd7652 100644 --- a/htdocs/public/dons/valid.xhtml +++ b/htdocs/public/dons/valid.xhtml @@ -31,16 +31,28 @@ + + + + + + + + @@ -55,6 +67,12 @@ print stripslashes($don->ville); + + + + - + - +