Merge branch 'ticket-invoiceOrderBy' into develop

This commit is contained in:
Marion Muszynski 2016-07-11 16:15:28 +02:00
commit a7ce4edbb2

View File

@ -860,6 +860,7 @@ class Sale {
if(count($orders) > 0) {
$_orders = array();
$_nb_product = array();
foreach(Db::getInstance()->ExecuteS('
SELECT d.`id_order`, p.`id_product`, c.`id_sale`, GREATEST(d.`product_quantity` - d.`product_quantity_return`, 0) AS `product_quantity`
FROM `'._DB_PREFIX_.'privatesale_category` c