From 872c99afe951b1ed23611681c0f68e73625dc5b3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 12 Apr 2016 11:35:39 +0200
Subject: [PATCH] FIX Hook resprint be printed
---
htdocs/core/tpl/objectline_create.tpl.php | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 31ad9716155..71d34ac4cd4 100644
--- 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;
}
@@ -193,11 +193,17 @@ else {
{
$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;
+ }
}
@@ -476,7 +482,7 @@ jQuery(document).ready(function() {
$("#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();
@@ -582,7 +588,7 @@ jQuery(document).ready(function() {
<?php } ?>
/* 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();
--
GitLab