diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 01b3928a96b05..28cd6ec397a8e 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -41,19 +41,23 @@ /* * Turnover */ + print_titre($langs->trans('SalesTurnover')); print ''; -print ''; +print ''; print ''; $now=dol_now(); -$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; -$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 .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")"; -$sql .= " GROUP BY mois ORDER BY 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.= " 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('".$db->idate($now)."')"; +$sql.= " GROUP BY month"; +$sql.= " ORDER BY month"; +//print $sql;exit; $result=$dbosc->query($sql); if ($result) @@ -116,7 +120,7 @@ { $obj = $dbosc->fetch_object($resql); - print ""; + print ""; $i++; } print "
'.$langs->trans("Description").'
'.$langs->trans("Month").''.$langs->trans("Total").'
$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method
".$obj->orders_id."".$obj->customers_name."".price($obj->value)."".$obj->payment_method."

"; @@ -235,6 +239,7 @@ } print ''; -$dbosc->close(); llxFooter(); + +$dbosc->close();