|
@@ -532,6 +532,13 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
|
|
|
if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
|
|
|
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
|
|
|
}
|
|
|
+
|
|
|
+// Added by MMI Mathieu Moulin iProspective
|
|
|
+// Add fields from hooks
|
|
|
+$parameters = array();
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldListJoinSoc', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+$sql .= $hookmanager->resPrint;
|
|
|
+
|
|
|
$sql .= ', '.MAIN_DB_PREFIX.'propal as p';
|
|
|
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
|
|
@@ -545,6 +552,14 @@ if ($search_product_category > 0) {
|
|
|
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
|
|
|
+
|
|
|
+// Added by MMI Mathieu Moulin iProspective
|
|
|
+// Add fields from hooks
|
|
|
+$parameters = array();
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldListJoinPropal', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+$sql .= $hookmanager->resPrint;
|
|
|
+//echo ($sql); die();
|
|
|
+
|
|
|
// We'll need this table joined to the select in order to filter by sale
|
|
|
if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
|
|
|
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
|