Переглянути джерело

MMIFilters : Add printFieldListJoinSoc hook on order list to Fix Pro filters on orders

Mathieu Moulin 2 роки тому
батько
коміт
02495b77bc
2 змінених файлів з 8 додано та 1 видалено
  1. 7 0
      htdocs/commande/list.php
  2. 1 1
      htdocs/custom/mmifilters

+ 7 - 0
htdocs/commande/list.php

@@ -822,6 +822,13 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
+
+// Added by MMI Mathieu Moulin iProspective
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListJoinSoc', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";

+ 1 - 1
htdocs/custom/mmifilters

@@ -1 +1 @@
-Subproject commit 823d092a2708e44369c9806c1ee773c9db40f283
+Subproject commit d50080d75a10340939bc3e616d55661f48e632f4