diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 41b2e647109..1b148ba0da1 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -41,7 +41,7 @@ if ($bid == 0) */ print_titre("Budgets"); - print ""; + print '
'; print ""; echo ''; print "\n"; @@ -99,7 +99,7 @@ else print_titre("Budget : $budget_name"); - print "
DescriptionNbTotalMoyenne
"; + print '
'; print ""; echo ''; print "\n"; @@ -129,7 +129,7 @@ else $total = $total + $objp->amount; } $db->free(); - print ""; + print ""; } else { @@ -139,10 +139,6 @@ else } -print 'Editer'; - - - $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 5adee148314..69937aa0a28 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -26,10 +26,18 @@ llxHeader(); if ($action == 'class') { - $author = $GLOBALS["REMOTE_USER"]; + $sql = "DELETE FROM llx_bank_class WHERE lineid = $rowid AND fk_categ = $cat1"; + $db->query($sql); $sql = "INSERT INTO llx_bank_class (lineid, fk_categ) VALUES ($rowid, $cat1)"; - $result = $db->query($sql); + if ($db->query($sql)) + { + + } + else + { + print $db->error(); + } } if ($action == 'update') @@ -79,14 +87,12 @@ if ($result) while ($i < $num) { $obj = $db->fetch_object($i); - $options .= "\n"; $i++; + $options .= "\n"; + $i++; } $db->free(); } -$acct=new Account($db,$account); -$acct->fetch($account); - print_titre("Edition de la ligne"); print '
DateDescriptionMontant 
Total".price(abs($total))."euros
Total".price(abs($total))."".MAIN_MONNAIE."
'; print ""; @@ -98,7 +104,7 @@ print ""; print "\n"; -$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.author, b.num_chq, b.fk_type"; +$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.author, b.num_chq, b.fk_type, fk_account"; $sql .= " FROM llx_bank as b WHERE rowid=$rowid"; $sql .= " ORDER BY dateo ASC"; $result = $db->query($sql); @@ -109,15 +115,17 @@ if ($result) $i = 0; $total = 0; while ($i < $num) { - $objp = $db->fetch_object( $i); + $objp = $db->fetch_object($i); $total = $total + $objp->amount; + $acct=new Account($db,$objp->fk_account); + $acct->fetch($objp->fk_account); + $account = $acct->id; + $var=!$var; print ""; - print ""; + print ""; print ""; - print "rowid\">"; - print "\n"; print ""; @@ -139,11 +147,11 @@ if ($result) print $objp->num_chq; print ""; - print ""; + print ''; print ""; print ""; @@ -205,7 +213,7 @@ print "

Class print '

Auteur
".strftime("%d %b %Y",$objp->do)."$objp->label
 "; + print "
Catégorie"; print " "; - print "
'; print ""; -print ""; +print ''; print "\n"; $sql = "SELECT c.label, c.rowid";
DescriptionDescription