Merge branch 'ticket-14485-phileaMultiSingle' into develop

This commit is contained in:
Marion Muszynski 2017-11-30 12:03:35 +01:00
commit b7aafef91c

View File

@ -734,7 +734,7 @@ class AdminPhileaMagistor extends AdminTab {
$submit_link = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?$upload_link:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=0';
$submit_link_single = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?null:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=1';
$submit_link_mult = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?null:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=2';
$submit_link_multi = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?null:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=2';
$art_reports = Db::getInstance()->executeS('
SELECT `report_data`, `report_date`, `id_sale`