From ad045b55c04a7ea8d17e2f182bc721dc51ccf93a Mon Sep 17 00:00:00 2001 From: rMalie Date: Fri, 23 Mar 2012 09:31:04 +0000 Subject: [PATCH] // Fix multi shop share order in order invoices --- classes/order/OrderInvoice.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index 3dffa2cf7..e44da8513 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -367,7 +367,7 @@ class OrderInvoiceCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) WHERE DATE_ADD(oi.date_add, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' AND oi.date_add >= \''.pSQL($date_from).'\' - '.Shop::addSqlRestriction().' + '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' ORDER BY oi.date_add ASC '); @@ -393,7 +393,7 @@ class OrderInvoiceCore extends ObjectModel ORDER BY date_add DESC, id_order_history DESC LIMIT 1 ) - '.Shop::addSqlRestriction(false, 'o').' + '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' ORDER BY oi.`date_add` ASC '); @@ -415,7 +415,7 @@ class OrderInvoiceCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) WHERE DATE_ADD(oi.delivery_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' AND oi.date_add >= \''.pSQL($date_from).'\' - '.Shop::addSqlRestriction().' + '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').' ORDER BY oi.delivery_date ASC ');