diff --git a/htdocs/compta/bank/account.php3 b/htdocs/compta/bank/account.php3 index 00bf060b7c1..fc3ffe61b2e 100644 --- a/htdocs/compta/bank/account.php3 +++ b/htdocs/compta/bank/account.php3 @@ -83,7 +83,7 @@ if ($account) { print ""; print ""; print ""; - print ""; + print ""; print ""; print ""; print ""; @@ -125,7 +125,7 @@ if ($account) { * 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 = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type"; $sql .= " FROM llx_bank as b "; if ($account) { $sql .= " WHERE fk_account=$account"; } if ($vue) { if ($vue == 'credit') { @@ -160,21 +160,25 @@ if ($account) { if ($objp->do > $time && !$sep) { $sep = 1 ; print ""; - print "\n"; - print ""; + print ""; + print ""; + print ''; + print ''; print ''; + print ''; print ""; print ""; print ""; print ""; - print ""; + print ""; print ''; } print ""; print "\n"; + print "\n"; if ($objp->num_chq) { print ""; diff --git a/htdocs/compta/bank/ligne.php3 b/htdocs/compta/bank/ligne.php3 index 0761166257e..2761b743bbb 100644 --- a/htdocs/compta/bank/ligne.php3 +++ b/htdocs/compta/bank/ligne.php3 @@ -1,8 +1,25 @@ + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * 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"); llxHeader(); @@ -25,6 +42,13 @@ if ($action == 'update') { $result = $db->query($sql); } +if ($action == 'type') { + $author = $GLOBALS["REMOTE_USER"]; + $sql = "update llx_bank set fk_type='$value' where rowid = $rowid;"; + $result = $db->query($sql); +} + + $sql = "SELECT rowid, label FROM llx_bank_categ;"; $result = $db->query($sql); if ($result) { @@ -50,7 +74,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"; +$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 .= " FROM llx_bank as b WHERE rowid=$rowid"; $sql .= " ORDER BY dateo ASC"; $result = $db->query($sql); @@ -69,7 +93,7 @@ if ($result) { print "rowid\">"; print "\n"; - print ""; + print ""; if ($objp->amount < 0) { print "\n"; } else { @@ -81,6 +105,11 @@ if ($result) { print ""; + print ""; + print ""; print ""; + + + print "rowid\">"; + print ''; + + print ""; + print ""; + + print ""; + + $i++; } $db->free(); diff --git a/htdocs/compta/bank/releve.php3 b/htdocs/compta/bank/releve.php3 index 776b6320137..af6899ba139 100644 --- a/htdocs/compta/bank/releve.php3 +++ b/htdocs/compta/bank/releve.php3 @@ -1,5 +1,6 @@ +/******************************************************************************** + * Copyright (C) 2001-2002 Rodolphe Quiedeville * * 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 @@ -15,13 +16,12 @@ * 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$ * - * $num + *******************************************************************************/ + +/* $num * $rel * $ve */ @@ -101,7 +101,7 @@ if (! $num) { print ""; print "
DateDescriptionDateDescriptionDebitCreditSolde
Total :".price($total - $objp->amount)."".francs($total - $objp->amount)."
".price($total - $objp->amount)."'.francs($total - $objp->amount).'
'; print 'CHQ -"; print "
Format : YYYYMMDD - 200108260000.00
Format : YYYYMMDD - 200108260000.00
".strftime("%d %b %y",$objp->do)."".$objp->fk_type."CHQ $objp->num_chq - $objp->labelAuteur
".strftime("%d %b %Y",$objp->do)."$objp->num_chq $objp->label$objp->label".price($objp->amount * -1)." 
 "; + print $objp->fk_type .' - '; + print $objp->num_chq; + print "
 "; print "
 "; + print '
"; print ""; - print ""; + print ""; print ""; print ""; print ""; @@ -116,7 +116,7 @@ if (! $num) { } - $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq"; + $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type"; $sql .= " FROM llx_bank as b WHERE num_releve=$num AND fk_account = $account"; $sql .= " ORDER BY dateo ASC"; $result = $db->query($sql); @@ -124,8 +124,8 @@ if (! $num) { $var=True; $numrows = $db->num_rows(); $i = 0; - print ""; - print "\n"; + print ""; + print "\n"; while ($i < $numrows) { $objp = $db->fetch_object( $i); $total = $total + $objp->amount; @@ -134,6 +134,7 @@ if (! $num) { print ""; print "\n"; + print ''; print "
DateDescriptionDateDescriptionDebitCreditSolde
vue etendueTotal :".price($total)."".francs($total)."
vue etendueTotal :".price($total)."".francs($total)."
".strftime("%d %b %Y",$objp->do)."'.$objp->fk_type.'$objp->num_chq $objp->label"; if ($ve) {