瀏覽代碼

MMIProduct : Stock at date : Limit to products with real stock history

Mathieu Moulin 1 年之前
父節點
當前提交
acb19a2621
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      htdocs/custom/mmiproduct
  2. 4 4
      htdocs/product/stock/stockatdate.php

+ 1 - 1
htdocs/custom/mmiproduct

@@ -1 +1 @@
-Subproject commit ad8011efdaae3431a4a006242e0c3ca885cc8d7d
+Subproject commit 08ecc6bc844d5e04a83ac06474624efc20cbcaa7

+ 4 - 4
htdocs/product/stock/stockatdate.php

@@ -274,6 +274,10 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($fk_warehouse > 0) {
 	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
@@ -281,10 +285,6 @@ if ($fk_warehouse > 0) {
 	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 }
-// Add where from hooks
-$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
 
 if ($sortfield == 'stock_reel' && $fk_warehouse <= 0) {
 	$sortfield = 'stock';