Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-03-29 13:33:42 +01:00
parent f99631677c 2c20bc9412
commit fdfdece6a9
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/product/stock/card.php
View File

@@ -736,6 +736,12 @@ if ($action == 'create') {
if ($separatedPMP) {
$sql .= ", ".MAIN_DB_PREFIX."product_perentity as pa";
}
$parameters = array('context' => 'warehousecard');
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters); // Note that $action and $object may have been modified by hook
if ($reshook > 0) { //Note that $sql is replaced if reshook > 0
$sql = "";
}
$sql .= $hookmanager->resPrint;
$sql .= " WHERE ps.fk_product = p.rowid";
$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
@@ -744,6 +750,12 @@ if ($action == 'create') {
if ($separatedPMP) {
$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ".(int) $conf->entity;
}
$parameters = array('context' => 'warehousecard');
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
if ($reshook > 0) { //Note that $sql is replaced if reshook > 0
$sql = "";
}
$sql .= $hookmanager->resPrint;
$sql .= $db->order($sortfield, $sortorder);