X-Git-Url: https://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=blobdiff_plain;ds=sidebyside;f=include%2Fclass.compta_stats.php;h=b6f7c18d63804fad45a2b824d5094db65ff1b88a;hb=f7ee0ae730f47bfef173c394fa4db71a22dece61;hp=335fbe0f4d50765ee46b922a7e952eee3b0775f8;hpb=1ab3343a95ed3ef4958d91dfbf49372dce8a092e;p=garradin.git
diff --git a/include/class.compta_stats.php b/include/class.compta_stats.php
index 335fbe0..b6f7c18 100644
--- a/include/class.compta_stats.php
+++ b/include/class.compta_stats.php
@@ -28,6 +28,7 @@ class Compta_Stats
{
return $this->getStats('SELECT strftime(\'%Y%m\', date) AS date,
SUM(montant) FROM compta_journal
+ LEFT JOIN compta_flux ON compta_journal.id = compta_flux.id_journal
WHERE id_categorie IN (SELECT id FROM compta_categories WHERE type = '.$type.')
AND id_exercice = (SELECT id FROM compta_exercices WHERE cloture = 0)
GROUP BY strftime(\'%Y-%m\', date) ORDER BY date;');
@@ -43,7 +44,7 @@ class Compta_Stats
return $this->_parType(Compta_Categories::DEPENSES);
}
- public function soldeCompte($compte, $augmente = 'debit', $diminue = 'credit')
+ public function soldeCompte($compte)
{
$db = DB::getInstance();
@@ -58,16 +59,13 @@ class Compta_Stats
$stats = $this->getStats('SELECT strftime(\'%Y%m\', date) AS date,
(COALESCE((SELECT SUM(montant) FROM compta_journal
- WHERE compte_'.$augmente.' '.$compte.' AND id_exercice = cj.id_exercice
- AND date >= strftime(\'%Y-%m-01\', cj.date)
- AND date <= strftime(\'%Y-%m-31\', cj.date)), 0)
- - COALESCE((SELECT SUM(montant) FROM compta_journal
- WHERE compte_'.$diminue.' '.$compte.' AND id_exercice = cj.id_exercice
+ LEFT JOIN compta_flux ON compta_journal.id = compta_flux.id_journal
+ WHERE compte '.$compte.' AND id_exercice = cj.id_exercice
AND date >= strftime(\'%Y-%m-01\', cj.date)
AND date <= strftime(\'%Y-%m-31\', cj.date)), 0)
) AS solde
FROM compta_journal AS cj
- WHERE (compte_debit '.$compte.' OR compte_credit '.$compte.')
+ WHERE (compte '.$compte.')
AND id_exercice = (SELECT id FROM compta_exercices WHERE cloture = 0)
GROUP BY strftime(\'%Y-%m\', date) ORDER BY date;');
@@ -119,4 +117,4 @@ class Compta_Stats
}
}
-?>
\ No newline at end of file
+?>