Browse Source

Merge branch 'mmiproductdluo-kit-show-lot-stock' into 16.0-mmi

Mathieu Moulin 1 year ago
parent
commit
fb6937f2db
2 changed files with 10 additions and 1 deletions
  1. 1 1
      htdocs/custom/mmiproductdluo
  2. 9 0
      htdocs/product/composition/card.php

+ 1 - 1
htdocs/custom/mmiproductdluo

@@ -1 +1 @@
-Subproject commit eaf9ff29c06bf1739b6b9037367b726d12f53333
+Subproject commit d511910f97cbd1a224df1101d6d1f2245fee6204

+ 9 - 0
htdocs/product/composition/card.php

@@ -371,6 +371,10 @@ if ($id > 0 || !empty($ref)) {
 		if (!empty($conf->stock->enabled)) {
 			print '<td class="right">'.$langs->trans('Stock').'</td>';
 		}
+		// Other fields
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 		// Qty in kit
 		print '<td class="center">'.$langs->trans('Qty').'</td>';
 		// Stoc inc/dev
@@ -447,6 +451,11 @@ if ($id > 0 || !empty($ref)) {
 						print '<td class="right">'.$value['stock'].'</td>'; // Real stock
 					}
 
+					// Other fields
+					$parameters = array('value'=>&$value, 'prods_arbo'=>$prods_arbo);
+					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+					print $hookmanager->resPrint;
+
 					// Qty + IncDec
 					if ($user->rights->produit->creer || $user->rights->service->creer) {
 						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" class="right" /></td>';