Merge branch 'ticket-12801-CarrierCleaning' into develop

This commit is contained in:
Marion Muszynski 2017-04-19 12:37:00 +02:00
commit fa68124dab

View File

@ -616,7 +616,7 @@ class AdminPrivateSalesSales extends AdminTab {
SELECT IFNULL(p.`id_sale`, NULL) FROM `'._DB_PREFIX_.'privatesale_carrier` p WHERE c.`id_carrier` = p.`id_carrier` AND p.`id_sale` = '.$this->cursale->id.'
) AS `id_sale`': '').'
FROM `'._DB_PREFIX_.'carrier` c
WHERE c.`deleted` != 1
WHERE c.`deleted` != 1 AND c.active =1
');
$carriers_default = Configuration::get('ANT_CARRIERS_SOCOL').','.Configuration::get('ANT_CARRIERS_MR');