|
@@ -102,6 +102,7 @@ if ($user->socid) {
|
|
|
}
|
|
|
$result = restrictedArea($user, 'produit|service', 0, 'product&product');
|
|
|
|
|
|
+$object = new Product($db);
|
|
|
|
|
|
/*
|
|
|
* Actions
|
|
@@ -141,7 +142,7 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
|
|
|
}
|
|
|
// Add fields from hooks
|
|
|
$parameters = array();
|
|
|
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
$sql .= $hookmanager->resPrint;
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
|
|
|
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
|
|
@@ -200,13 +201,13 @@ if ($fourn_id > 0) {
|
|
|
}
|
|
|
// Add where from hooks
|
|
|
$parameters = array();
|
|
|
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
$sql .= $hookmanager->resPrint;
|
|
|
$sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
|
|
|
$sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
|
|
|
// Add fields from hooks
|
|
|
$parameters = array();
|
|
|
-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
$sql .= $hookmanager->resPrint;
|
|
|
$sql_having = '';
|
|
|
if ($toolowstock) {
|
|
@@ -500,7 +501,7 @@ if ($resql) {
|
|
|
print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
|
|
|
// Fields from hook
|
|
|
$parameters = array('obj'=>$objp);
|
|
|
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
print '<td></td>';
|
|
|
print "</tr>\n";
|