|
|
@@ -656,8 +656,11 @@ class BBus extends DolibarrApi
|
|
|
}
|
|
|
dol_include_once('/eventwizard/class/eventdetails.class.php');
|
|
|
$sqlBasicService = "SELECT pe.basic_service FROM llx_product as p
|
|
|
- INNER JOIN llx_product_extrafields as pe ON pe.fk_object = p.rowid
|
|
|
- GROUP BY pe.basic_service";
|
|
|
+ INNER JOIN llx_product_extrafields as pe ON pe.fk_object = p.rowid";
|
|
|
+ if(!$conf->global->CROSSSHOPPING_ENABLED){
|
|
|
+ $sqlBasicService .= " LEFT JOIN llx_bbus_basicservices as bs ON bs.basic_service_id::TEXT = pe.basic_service WHERE bs.server_host = 'excelia'";
|
|
|
+ }
|
|
|
+ $sqlBasicService .= " GROUP BY pe.basic_service";
|
|
|
$resultBasicServices = $db->query($sqlBasicService);
|
|
|
if ($db->num_rows($resultBasicServices) > 0) {
|
|
|
while ($row = $db->fetch_object($resultBasicServices)) {
|
