lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Corrections sur les rapports rsultats

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-16 00:45:40 +00:00
parent 321f2d1266
commit 122a9532ea
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/compta/resultat/index.php
View File

@ -157,7 +157,7 @@ else {
*/ */
if ($modecompta == 'CREANCES-DETTES') { if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount_ht, sum(s.amount) as amount_ttc, date_format(s.date_ech,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=0"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=0";
if ($year) { if ($year) {
@ -166,7 +166,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql .= " GROUP BY c.libelle"; $sql .= " GROUP BY c.libelle";
} }
else { else {
$sql = "SELECT c.libelle as nom, sum(p.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(p.amount) as amount_ht, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p";
$sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=0"; $sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=0";
if ($year) { if ($year) {
@ -183,8 +183,8 @@ if ($result) {
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$decaiss[$row->dm] += $row->amount_ht; $decaiss[$obj->dm] += $obj->amount_ht;
$decaiss_ttc[$row->dm] += $row->amount_ttc; $decaiss_ttc[$obj->dm] += $obj->amount_ttc;
$i++; $i++;
} }
@ -199,7 +199,7 @@ if ($result) {
*/ */
if ($modecompta == 'CREANCES-DETTES') { if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT c.libelle as nom, sum(s.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(s.amount) as amount_ht, sum(s.amount) as amount_ttc, date_format(s.date_ech,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s";
$sql .= " WHERE s.fk_type = c.id AND c.deductible=1"; $sql .= " WHERE s.fk_type = c.id AND c.deductible=1";
if ($year) { if ($year) {
@ -208,7 +208,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$sql .= " GROUP BY c.libelle DESC"; $sql .= " GROUP BY c.libelle DESC";
} }
else { else {
$sql = "SELECT c.libelle as nom, sum(p.amount) as amount"; $sql = "SELECT c.libelle as nom, sum(p.amount) as amount_ht, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p"; $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."chargesociales as s, ".MAIN_DB_PREFIX."paiementcharge as p";
$sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=1"; $sql .= " WHERE p.fk_charge = s.rowid AND s.fk_type = c.id AND c.deductible=1";
if ($year) { if ($year) {
@ -225,8 +225,8 @@ if ($result) {
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$decaiss[$row->dm] += $row->amount_ht; $decaiss[$obj->dm] += $obj->amount_ht;
$decaiss_ttc[$row->dm] += $row->amount_ttc; $decaiss_ttc[$obj->dm] += $obj->amount_ttc;
$i++; $i++;
} }