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

Fix: pb with pgsql

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-21 23:51:13 +02:00
parent 0327738aa9
commit 76f72d5bcc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/boutique/index.php
View File

@ -41,19 +41,23 @@ print '<tr><td valign="top" width="40%" class="notopnoleft">';
/* /*
* Turnover * Turnover
*/ */
print_titre($langs->trans('SalesTurnover')); print_titre($langs->trans('SalesTurnover'));
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">'; print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>'; print '<tr class="liste_titre"><td>'.$langs->trans("Month").'</td>';
print '<td align="right">'.$langs->trans("Total").'</td></tr>'; print '<td align="right">'.$langs->trans("Total").'</td></tr>';
$now=dol_now(); $now=dol_now();
$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; $sql = "SELECT SUM(t.value) as value, MONTH(o.date_purchased) as month";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; $sql.= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")"; //$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")";
$sql .= " GROUP BY mois ORDER BY mois"; $sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR('".$db->idate($now)."')";
$sql.= " GROUP BY month";
$sql.= " ORDER BY month";
//print $sql;exit;
$result=$dbosc->query($sql); $result=$dbosc->query($sql);
if ($result) if ($result)
@ -116,7 +120,7 @@ if ($resql)
{ {
$obj = $dbosc->fetch_object($resql); $obj = $dbosc->fetch_object($resql);
print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>"; print "<tr><td>".$obj->orders_id."</td><td>".$obj->customers_name."</td><td>".price($obj->value)."</td><td>".$obj->payment_method."</td></tr>";
$i++; $i++;
} }
print "</table><br>"; print "</table><br>";
@ -235,6 +239,7 @@ else
} }
print '</tr></table>'; print '</tr></table>';
$dbosc->close();
llxFooter(); llxFooter();
$dbosc->close();