diff --git a/htdocs/compta/bank/account.php3 b/htdocs/compta/bank/account.php3 index f28ad153adf..265b81f0af4 100644 --- a/htdocs/compta/bank/account.php3 +++ b/htdocs/compta/bank/account.php3 @@ -82,8 +82,8 @@ if ($account) { print ""; print ""; print ""; - print ""; - print ""; + print ""; + print ""; print ""; print ""; print "\n"; diff --git a/htdocs/compta/bank/index.php3 b/htdocs/compta/bank/index.php3 index 52932208f83..41193533bda 100644 --- a/htdocs/compta/bank/index.php3 +++ b/htdocs/compta/bank/index.php3 @@ -31,213 +31,46 @@ require("./bank.lib.php3"); llxHeader(); $db = new Db(); -if ($action == 'add') { - $author = $GLOBALS["REMOTE_USER"]; - if ($credit > 0) { - $amount = $credit ; - } else { - $amount = - $debit ; - } +print_titre ("Comptes bancaires"); - if ($num_chq) { - $sql = "INSERT INTO llx_bank (datec, dateo, label, amount, author, num_chq,fk_account)"; - $sql .= " VALUES (now(), $dateo, '$label', $amount,'$author',$num_chq,$account)"; - } else { - $sql = "INSERT INTO llx_bank (datec, dateo, label, amount, author,fk_account)"; - $sql .= " VALUES (now(), $dateo, '$label', $amount,'$author',$account)"; - } - - $result = $db->query($sql); - if ($result) { - $rowid = $db->last_insert_id(); - if ($cat1) { - $sql = "INSERT INTO llx_bank_class (lineid, fk_categ) VALUES ($rowid, $cat1)"; - $result = $db->query($sql); - } - } else { - print $db->error(); - print "

$sql"; - } - -} -if ($action == 'del') { - bank_delete_line($db, $rowid); -} - -if ($vline) { - $viewline = $vline; -} else { - $viewline = 20; -} - -print "Bank - Reload -"; -print "Voir tout"; - -print "
"; -print ""; print "

DateDescriptionDebitCreditDebitCreditSoldeFrancs
"; print ""; -print ""; -print ""; -print ""; -print ""; -print ""; +print ""; +print ""; print "\n"; -$sql = "SELECT count(*) FROM llx_bank"; -if ($account) { $sql .= " WHERE fk_account=$account"; } -if ( $db->query($sql) ) { - $nbline = $db->result (0, 0); - $db->free(); - - if ($nbline > $viewline ) { - $limit = $nbline - $viewline ; - } else { - $limit = $viewline; - } -} - -$sql = "SELECT rowid, label FROM llx_bank_categ;"; -$result = $db->query($sql); -if ($result) { - $var=True; - $num = $db->num_rows(); - $i = 0; - $options = ""; - while ($i < $num) { - $obj = $db->fetch_object($i); - $options .= "\n"; $i++; - } - $db->free(); -} - - -if ($viewall) { $nbline=0; } - -/* Another solution - * create temporary table solde type=heap select amount from llx_bank limit 100 ; - * select sum(amount) from solde ; - */ - -$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq"; -$sql .= " FROM llx_bank as b "; if ($account) { $sql .= " WHERE fk_account=$account"; } -if ($vue) { - if ($vue == 'credit') { - $sql .= " AND b.amount >= 0 "; - } else { - $sql .= " AND b.amount < 0 "; - } -} -$sql .= " ORDER BY b.dateo ASC"; +$sql = "SELECT rowid, label,number,bank FROM llx_bank_account"; $result = $db->query($sql); if ($result) { $var=True; $num = $db->num_rows(); $i = 0; $total = 0; - + $sep = 0; - + while ($i < $num) { $objp = $db->fetch_object( $i); - $total = $total + $objp->amount; - $time = time(); - if ($i > ($nbline - $viewline)) { - - if (!$psol) { - print "\n"; - $psol = 1; - - } else { - $var=!$var; - - if ($objp->do > $time && !$sep) { - $sep = 1 ; - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - - } - - print ""; - print "\n"; - - if ($objp->num_chq) { - print ""; - } else { - print ""; - } - - if ($objp->amount < 0) { - print "\n"; - } else { - print "\n"; - } - - if ($total > 0) { - print "\n"; - } else { - print "\n"; - } - - if ($objp->rappro) { - print ""; - } else { - print ""; - } - - print "\n"; - - print ""; - - } - } - + + + print ""; + + $i++; } $db->free(); } -if ($sep) { - print ""; - print "\n"; -} else { - print ""; - print "\n"; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; +$acc = new Account($db); - print ""; +print "
DateDescriptionDebitCreditSoldeFrancsLabelBanqueNuméro
 ".price($total)."".francs($total)."
Total :".price($total - $objp->amount)."".francs($total - $objp->amount)."
CHQ -"; - print ""; - print "
Format : YYYYMMDD - 200108260000.00
".strftime("%d %b %y",$objp->do)."CHQ $objp->num_chq - $objp->label$objp->label".price($objp->amount * -1)."  ".price($objp->amount)."".price($total)."".price($total)."num_releve\">$objp->num_releverowid&account=$account\">[Del]".francs($objp->amount)."
"; + print ''.$objp->label.''; + print "$objp->bank$objp->number
Total :".price($total)."".francs($total)."
Total :".price($total)."".francs($total)."
CHQ -"; - print ""; - print "
Format : YYYYMMDD - 200108260000.00
"; -} - -print ""; - -print "Edit Categories"; -print " Budgets"; - $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/compta/bank/pre.inc.php3 b/htdocs/compta/bank/pre.inc.php3 index 6bf9fa2f662..ff65dbb1edb 100644 --- a/htdocs/compta/bank/pre.inc.php3 +++ b/htdocs/compta/bank/pre.inc.php3 @@ -23,7 +23,7 @@ require("../../main.inc.php3"); require("./account.class.php3"); function llxHeader($head = "") { - global $user, $conf; + global $user, $conf, $account; /* * @@ -45,7 +45,7 @@ function llxHeader($head = "") { while ($i < $num) { $objp = $db->fetch_object($i); - $menu->add_submenu("index.php3?account=" . $objp->rowid, $objp->label); + $menu->add_submenu("account.php3?account=" . $objp->rowid, $objp->label); $i++; } @@ -54,7 +54,7 @@ function llxHeader($head = "") { $menu->add("index.php3","Bank"); - $menu->add_submenu("rappro.php3","Rappro"); + $menu->add_submenu("rappro.php3?account=$account","Rappro"); $menu->add_submenu("budget.php3","Budgets"); $menu->add_submenu("bilan.php3","Bilan"); $menu->add_submenu("virement.php3","Virement"); diff --git a/htdocs/compta/bank/rappro.php3 b/htdocs/compta/bank/rappro.php3 index f70051c529c..4b20e9452b1 100644 --- a/htdocs/compta/bank/rappro.php3 +++ b/htdocs/compta/bank/rappro.php3 @@ -79,7 +79,7 @@ if ($result) { $var=!$var; print ""; - print "
"; + print ''; print ""; print "rowid\">";