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

bugfix

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-06-29 09:27:45 +00:00
parent 63eda7e7f1
commit 7774c3ac59
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/compta/stats/comp.php
View File

@ -221,7 +221,8 @@ function pt ($db, $sql, $year) {
} }
} }
function ppt ($db, $year, $socidp) { function ppt ($db, $year, $socidp)
{
global $bc; global $bc;
print "<table width=\"100%\">"; print "<table width=\"100%\">";
@ -234,11 +235,12 @@ function ppt ($db, $year, $socidp) {
print "<tr><td valign=\"top\" width=\"30%\">"; print "<tr><td valign=\"top\" width=\"30%\">";
$sql = "SELECT sum(f.price - f.remise) as sum, round(date_format(f.datep,'%m')) as dm"; $sql = "SELECT sum(f.price - f.remise) as sum, round(date_format(f.datep,'%m')) as dm";
$sql .= " FROM llx_propal as f WHERE fk_statut in (1,2) AND date_format(f.datep,'%Y') = $year "; $sql .= " FROM llx_propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep,'%Y') = $year ";
if ($socidp) { if ($socidp)
$sql .= " AND f.fk_soc = $socidp"; {
} $sql .= " AND f.fk_soc = $socidp";
}
$sql .= " GROUP BY dm"; $sql .= " GROUP BY dm";
@ -248,10 +250,10 @@ function ppt ($db, $year, $socidp) {
$sql = "SELECT sum(f.amount) as sum, round(date_format(f.datef, '%m')) as dm"; $sql = "SELECT sum(f.amount) as sum, round(date_format(f.datef, '%m')) as dm";
$sql .= " FROM llx_facture as f WHERE f.paye = 1 AND date_format(f.datef,'%Y') = $year "; $sql .= " FROM llx_facture as f WHERE f.paye = 1 AND date_format(f.datef,'%Y') = $year ";
if ($socidp)
if ($socidp) { {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
$sql .= " GROUP BY dm"; $sql .= " GROUP BY dm";
$ca = pt($db, $sql, $year); $ca = pt($db, $sql, $year);
@ -265,16 +267,17 @@ function ppt ($db, $year, $socidp) {
print "</TR>\n"; print "</TR>\n";
$var = 1 ; $var = 1 ;
for ($b = 1 ; $b <= 12 ; $b++) { for ($b = 1 ; $b <= 12 ; $b++)
$var=!$var; {
$var=!$var;
$delta = $ca[$b] - $prev[$b]; $delta = $ca[$b] - $prev[$b];
$deltat = $deltat + $delta ; $deltat = $deltat + $delta ;
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<TD>".strftime("%B",mktime(12,0,0,$b, 1, $year))."</TD>\n"; print "<TD>".strftime("%B",mktime(12,0,0,$b, 1, $year))."</TD>\n";
print "<TD align=\"right\">".price($delta)."</TD>\n"; print "<TD align=\"right\">".price($delta)."</TD>\n";
print "</TR>\n"; print "</TR>\n";
} }
$ayear = $year - 1; $ayear = $year - 1;
$acat = get_ca($db, $ayear, $socidp) - get_ca_propal($db, $ayear, $socidp); $acat = get_ca($db, $ayear, $socidp) - get_ca_propal($db, $ayear, $socidp);

2
htdocs/compta/stats/lib.inc.php
View File

@ -23,7 +23,7 @@
function get_ca_propal ($db, $year, $socidp) function get_ca_propal ($db, $year, $socidp)
{ {
$sql = "SELECT sum(f.price - f.remise) as sum FROM llx_propal as f WHERE fk_statut in (1,2) AND date_format(f.datep, '%Y') = $year "; $sql = "SELECT sum(f.price - f.remise) as sum FROM llx_propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep, '%Y') = $year ";
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";