lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23839 from marcusdeangabriel/SELECT_PRODUITS_LIST

Browse Source 
Add hooks to select_produits_list
This commit is contained in:
Laurent Destailleur 2023-03-31 20:18:32 +02:00 committed by GitHub
commit 386a91c666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/class/html.form.class.php
View File

@ -2614,7 +2614,15 @@ class Form
} }
$sql = "SELECT "; $sql = "SELECT ";
$sql .= $selectFields . $selectFieldsGrouped;
// Add select from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('selectProductsListSelect', $parameters); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
$sql .= $selectFields.$selectFieldsGrouped.$hookmanager->resPrint;
} else {
$sql .= $hookmanager->resPrint;
}
if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) { if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
//Product category //Product category
@ -2660,7 +2668,13 @@ class Form
$sql .= " DESC LIMIT 1) as price_by_qty"; $sql .= " DESC LIMIT 1) as price_by_qty";
$selectFields .= ", price_rowid, price_by_qty"; $selectFields .= ", price_rowid, price_by_qty";
} }
$sql .= " FROM ".$this->db->prefix()."product as p"; $sql .= " FROM ".$this->db->prefix()."product as p";
// Add from (left join) from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('selectProductsListFrom', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
if (count($warehouseStatusArray)) { if (count($warehouseStatusArray)) {
$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as ps on ps.fk_product = p.rowid"; $sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as ps on ps.fk_product = p.rowid";
$sql .= " LEFT JOIN " . $this->db->prefix() . "entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (" . getEntity('stock') . ")"; $sql .= " LEFT JOIN " . $this->db->prefix() . "entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (" . getEntity('stock') . ")";
@ -2932,6 +2946,7 @@ class Form
protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '', $novirtualstock = 0) protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '', $novirtualstock = 0)
{ {
global $langs, $conf, $user; global $langs, $conf, $user;
global $hookmanager;
$outkey = ''; $outkey = '';
$outval = ''; $outval = '';
@ -3217,6 +3232,14 @@ class Form
} }
} }
$parameters = array('objp'=>$objp);
$reshook = $hookmanager->executeHooks('constructProductListOption', $parameters); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
$opt .= $hookmanager->resPrint;
} else {
$opt = $hookmanager->resPrint;
}
$opt .= "</option>\n"; $opt .= "</option>\n";
$optJson = array( $optJson = array(
'key' => $outkey, 'key' => $outkey,