lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juanjo Menent 2016-04-15 13:49:59 +02:00
commit bff1ec2d80
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -32,7 +32,7 @@
$usemargins=0; $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; $usemargins=1;
} }
@ -196,11 +196,17 @@ else {
{ {
$parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int')); $parameters=array('fk_parent_line'=>GETPOST('fk_parent_line','int'));
$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action); $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
if (!empty($hookmanager->resPrint)) {
print $hookmanager->resPrint;
}
} }
if (is_object($hookmanager) && ! empty($senderissupplier)) if (is_object($hookmanager) && ! empty($senderissupplier))
{ {
$parameters=array('htmlname'=>'addproduct'); $parameters=array('htmlname'=>'addproduct');
$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action); $reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
if (!empty($hookmanager->resPrint)) {
print $hookmanager->resPrint;
}
} }
@ -500,7 +506,7 @@ jQuery(document).ready(function() {
$("#select_type").change(function() $("#select_type").change(function()
{ {
setforfree(); 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 */ /* focus work on a standard textarea but not if field was replaced with CKEDITOR */
jQuery('#dp_desc').focus(); jQuery('#dp_desc').focus();
@ -639,7 +645,7 @@ jQuery(document).ready(function() {
?> ?>
/* To set focus */ /* 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 */ /* focus work on a standard textarea but not if field was replaced with CKEDITOR */
jQuery('#dp_desc').focus(); jQuery('#dp_desc').focus();