Merge remote-tracking branch 'upstream/3.9' into develop

Dolibarr · Apr 15, 2016 · bff1ec2 · bff1ec2
2 parents e1d35c2 + 8751f6c
commit bff1ec2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
@@ -32,7 +32,7 @@
 
 
 $usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) 
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande')))
 {
     $usemargins=1;
 }
@@ -196,11 +196,17 @@
 	{
         $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
 		$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+		if (!empty($hookmanager->resPrint)) {
+			print $hookmanager->resPrint;
+		}
 	}
 	if (is_object($hookmanager) && ! empty($senderissupplier))
 	{
 		$parameters=array('htmlname'=>'addproduct');
 		$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
+		if (!empty($hookmanager->resPrint)) {
+			print $hookmanager->resPrint;
+		}
 	}
 
 
@@ -500,7 +506,7 @@ function checkFreeLine(e, npRate)
 	$("#select_type").change(function()
 	{
 		setforfree();
-		if (jQuery('#select_type').val() >= 0) 
+		if (jQuery('#select_type').val() >= 0)
 		{
 			/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
 			jQuery('#dp_desc').focus();
@@ -639,7 +645,7 @@ function checkFreeLine(e, npRate)
         ?>
 
   		/* To set focus */
-  		if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0) 
+  		if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0)
   	  	{
 			/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
 			jQuery('#dp_desc').focus();