diff --git a/htdocs/compta/bank/account.class.php3 b/htdocs/compta/bank/account.class.php3 index 2f41086f5ac..dbb9bf5011b 100644 --- a/htdocs/compta/bank/account.class.php3 +++ b/htdocs/compta/bank/account.class.php3 @@ -25,6 +25,7 @@ class Account { var $bank; var $label; var $number; + var $courant; Function Account($DB, $rowid=0) { global $config; @@ -37,7 +38,7 @@ class Account { Function fetch($id) { $this->id = $id; - $sql = "SELECT rowid, label, bank, number FROM llx_bank_account"; + $sql = "SELECT rowid, label, bank, number, courant FROM llx_bank_account"; $sql .= " WHERE rowid = ".$id; $result = $this->db->query($sql); @@ -49,6 +50,7 @@ class Account { $this->bank = $obj->bank; $this->label = $obj->label; $this->number = $obj->number; + $this->courant = $obj->courant; } $this->db->free(); } diff --git a/htdocs/compta/bank/index.php3 b/htdocs/compta/bank/index.php3 index 218a5e71929..ea6e913007e 100644 --- a/htdocs/compta/bank/index.php3 +++ b/htdocs/compta/bank/index.php3 @@ -63,18 +63,18 @@ $total = 0; for ($i = 0 ; $i < sizeof($accounts) ; $i++) { $acc = new Account($db); $acc->fetch($accounts[$i]); - - $solde = $acc->solde(); + if ($acc->courant) { + $solde = $acc->solde(); - print ""; - print ''.$acc->label.''; - - print "$acc->bank$acc->number"; - - print ''.price($solde).' '; + print ""; + print ''.$acc->label.''; + + print "$acc->bank$acc->number"; + + print ''.price($solde).' '; - $total += $solde; - + $total += $solde; + } } print 'Total'.price($total).'euros HT'; @@ -106,6 +106,34 @@ print 'URSSAF'.price($chs_a_payer).'< print 'Total'.price($total).'euros HT'; +/* + * + * + * + */ + +print 'Comptes placements'; + +for ($i = 0 ; $i < sizeof($accounts) ; $i++) { + $acc = new Account($db); + $acc->fetch($accounts[$i]); + + if (!$acc->courant) { + + $solde = $acc->solde(); + + print ""; + print ''.$acc->label.''; + + print "$acc->bank$acc->number"; + + print ''.price($solde).' '; + + $total += $solde; + } +} + + print "";