diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index b8f71055b3b..74f07a35818 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -887,7 +887,7 @@ if ($rowid) if ($conf->banque->enabled && $conf->societe->enabled && $conf->facture->enabled) { print 'fk_soc) || empty($bankviainvoice)) print ' disabled="true"'; + if (empty($adh->fk_soc) || empty($bankviainvoice)) print ' disabled="disabled"'; print '> '.$langs->trans("MoreActionBankViaInvoice"); if ($adh->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else @@ -902,7 +902,7 @@ if ($rowid) if ($conf->societe->enabled && $conf->facture->enabled) { print 'fk_soc) || empty($bankviainvoice)) print ' disabled="true"'; + if (empty($adh->fk_soc) || empty($bankviainvoice)) print ' disabled="disabled"'; print '> '.$langs->trans("MoreActionInvoiceOnly"); if ($adh->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index ad2479cbb8e..2f00edaac72 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -259,7 +259,7 @@ if ($id > 0 || ! empty($ref)) $formcompany->selectTypeContact($propal, '', 'type','external'); print ''; print ''; print ''; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 6e14b575201..f77d771e3f6 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -251,7 +251,7 @@ if ($id > 0 || ! empty($ref)) $formcompany->selectTypeContact($commande, '', 'type','external'); print ''; print ''; print ''; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index f23ecf0ec2e..623c5389e12 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -444,7 +444,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - print 'rappro?' disabled="true"':'').' value="'; + print 'rappro?' disabled="disabled"':'').' value="'; if (preg_match('/^\((.*)\)$/i',$objp->label,$reg)) { // Label generique car entre parentheses. On l'affiche en le traduisant @@ -478,7 +478,7 @@ if ($result) if ($user->rights->banque->modifier) { print ''; - print 'rappro?' disabled="true"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie); + print 'rappro?' disabled="disabled"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie); print ''; } else @@ -510,12 +510,12 @@ if ($result) print ''; if ($objp->rappro) { - print $langs->trans("AccountStatement").' rappro?' disabled="true"':'').'>'; + print $langs->trans("AccountStatement").' rappro?' disabled="disabled"':'').'>'; print ''; } else { - print $langs->trans("AccountStatement").' rappro?' disabled="true"':'').'>'; + print $langs->trans("AccountStatement").' rappro?' disabled="disabled"':'').'>'; } print ''; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a3fd3eddec4..283460b2666 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1606,12 +1606,12 @@ if ($action == 'create') // Replacement print ''; print ''; print ''; $text=$langs->trans("InvoiceReplacementAsk").' '; $text.=''; print ''; $text=$langs->transnoentities("InvoiceAvoirAsk").' '; // $text.=''; $text.=''; print ''; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 1b63fb03928..3edec51a5f9 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -377,7 +377,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; if ($action == 'add_paiement') { - print ''; + print ''; print ''; } else @@ -521,7 +521,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } else { - print ''; + print ''; print ''; } print ""; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 0fcb7329765..c095cfca195 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -245,7 +245,7 @@ if ($id > 0) $formcompany->selectTypeContact($contrat, '', 'type','external'); print ''; print ''; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5a709158e83..3d6749c6c53 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -640,7 +640,7 @@ class Form if ($maxvalue && $obj->amount_ttc > $maxvalue) { $qualifiedlines--; - $disabled=' disabled="true"'; + $disabled=' disabled="disabled"'; } print ''; @@ -713,7 +713,7 @@ class Form if ($selected && $selected == $obj->rowid) { print ''."\n"; $userstatic=new User($this->db); @@ -844,13 +844,13 @@ class Form if ((is_object($selected) && $selected->id == $obj->rowid) || (! is_object($selected) && $selected == $obj->rowid)) { $out.= '