add hook to uniformize printFieldListFrom hook
This commit is contained in:
parent
b4895c4dd2
commit
1dffc1c0fa
@ -553,6 +553,12 @@ if ($search_user > 0) {
|
|||||||
$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
|
$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add table from hooks
|
||||||
|
$parameters = array();
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
|
||||||
|
$sql .= $hookmanager->resPrint;
|
||||||
|
|
||||||
$sql .= ' WHERE p.fk_soc = s.rowid';
|
$sql .= ' WHERE p.fk_soc = s.rowid';
|
||||||
$sql .= ' AND p.entity IN ('.getEntity('propal').')';
|
$sql .= ' AND p.entity IN ('.getEntity('propal').')';
|
||||||
if (!$user->rights->societe->client->voir && !$socid) { //restriction
|
if (!$user->rights->societe->client->voir && !$socid) { //restriction
|
||||||
|
|||||||
@ -470,6 +470,12 @@ if ($search_user > 0) {
|
|||||||
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
|
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add table from hooks
|
||||||
|
$parameters = array();
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
|
||||||
|
$sql .= $hookmanager->resPrint;
|
||||||
|
|
||||||
$sql .= ' WHERE c.fk_soc = s.rowid';
|
$sql .= ' WHERE c.fk_soc = s.rowid';
|
||||||
$sql .= ' AND c.entity IN ('.getEntity('commande').')';
|
$sql .= ' AND c.entity IN ('.getEntity('commande').')';
|
||||||
if ($search_product_category > 0) {
|
if ($search_product_category > 0) {
|
||||||
|
|||||||
@ -280,6 +280,12 @@ if ($search_user > 0) {
|
|||||||
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
|
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add table from hooks
|
||||||
|
$parameters = array();
|
||||||
|
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
|
||||||
|
$sql .= $hookmanager->resPrint;
|
||||||
|
|
||||||
$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
|
$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
|
||||||
if ($search_product_category > 0) {
|
if ($search_product_category > 0) {
|
||||||
$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
|
$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user