diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 07df2a91872..37ec3c4e503 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -333,7 +333,7 @@ if ($result) if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print ''; // Current account print ''; - print ''; + print ''; $listofvals=array('withoutvalidaccount'=>$langs->trans("WithoutValidAccount"), 'withvalidaccount'=>$langs->trans("WithValidAccount")); print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1); print ''; @@ -481,6 +481,14 @@ if ($result) }); init_savebutton(); + + jQuery("#search_current_account").keyup(function() { + if (jQuery("#search_current_account").val() != \'\') + { + console.log("We set a value of account to search "+jQuery("#search_current_account").val()+", so we disable the other search criteria on account"); + jQuery("#search_current_account_valid").val(-1); + } + }); }); '; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 1e8fbcbfdee..1235fe301cf 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -204,7 +204,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print ''; + print '
'; // Ligne info remises tiers diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f1c67429d95..0937981164b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -8027,7 +8027,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st } if ($displayMode === 2) { - $return = $htmlImg .' '. $htmlLabel; + $return = $htmlImg .' '. $htmlLabelShort; } elseif ($displayMode === 3) { $return = $htmlImg;