diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 8df97d1031f..6f1a40b2fb0 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -1283,7 +1283,7 @@ if ($object->id > 0) { if ($object->client != 0 && $object->client != 2) { - if (!empty($orders2invoice) && $orders2invoice > 0) print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + if (!empty($orders2invoice) && $orders2invoice > 0) print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; } else print '
'.$langs->trans("AddBill").'
'; } diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index f78d6ce2e84..f2f806cc7af 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -164,7 +164,7 @@ if ($resql) $result = ''; $link = $linkend = ''; - $link = ''; + $link = ''; $linkend = ''; $name = $obj->name; $result .= ($link.img_object($langs->trans("ShowCompany").': '.$name, 'company').$linkend); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 1acd515a49a..82fde75966b 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -624,6 +624,16 @@ if ($resql) $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); + if (GETPOST('autoselectall', 'int')) { + $selectedfields .= ''; + } + print '
'; print ''."\n"; @@ -1092,7 +1102,7 @@ if ($resql) { if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) { - print ' '; + print ' '; print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').''; } } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e00d544ed22..7bf559240d9 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -647,7 +647,7 @@ class Form $disabled = 0; $ret = '
'; - $ret .= ''; // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks. $parameters = array(); @@ -7552,8 +7552,8 @@ class Form global $conf, $langs; $out = ''; - $id = uniqid(); - if (!empty($conf->use_javascript_ajax)) $out .= '
'; + + if (!empty($conf->use_javascript_ajax)) $out .= '
'; $out .= ''; + $(".' . $cssclass.'").change(function() { + $(this).closest("tr").toggleClass("highlight", this.checked); + }); + }); + '; return $out; }