diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 159c03589b1..2b50008d58a 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -271,12 +271,12 @@ if ($action == 'edit')
                         {
                             jQuery(".drag").hide();
                             jQuery("#MAIN_MAIL_EMAIL_TLS").val(0);
-                            jQuery("#MAIN_MAIL_EMAIL_TLS").attr(\'disabled\', \'disabled\');
+                            jQuery("#MAIN_MAIL_EMAIL_TLS").prop("disabled", true);
                             ';
 		if ($linuxlike)
 		{
-			print '         jQuery("#MAIN_MAIL_SMTP_SERVER").attr(\'disabled\', \'disabled\');';
-			print '         jQuery("#MAIN_MAIL_SMTP_PORT").attr(\'disabled\', \'disabled\');';
+			print '         jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);';
+			print '         jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);';
 		}
 		print '
                         }
@@ -284,9 +284,9 @@ if ($action == 'edit')
                         {
                             jQuery(".drag").show();
                             jQuery("#MAIN_MAIL_EMAIL_TLS").val('.$conf->global->MAIN_MAIL_EMAIL_TLS.');
-                            jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr(\'disabled\');
-                            jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr(\'disabled\');
-                            jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr(\'disabled\');
+                            jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr("disabled");
                         }
                     }
                     initfields();
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 9ded9ae1f34..4ab41c7991e 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -255,12 +255,12 @@ if ($action == 'create')
     	{
     		if (jQuery("#topleft").val() == \'top\')
     		{
-	    		jQuery("#menuId").attr(\'disabled\',\'disabled\');
+				jQuery("#menuId").prop("disabled", true);
 	    		jQuery("#menuId").val(\'\');
 			}
     		else
     		{
-    			jQuery("#menuId").removeAttr(\'disabled\');
+				jQuery("#menuId").removeAttr("disabled");
     		}
     	}
     	init_topleft();
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 1a518b1859c..36d9117eefe 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -313,28 +313,28 @@ jQuery(document).ready(function() {
 	{
 		if (jQuery("#fillmanually:checked").val() == "fillmanually")
 		{
-			jQuery("#submitproduct").attr(\'disabled\',\'disabled\');
-			jQuery("#submitthirdparty").attr(\'disabled\',\'disabled\');
-			jQuery("#search_productid").attr(\'disabled\',\'disabled\');
-			jQuery("#socid").attr(\'disabled\',\'disabled\');
+			jQuery("#submitproduct").prop("disabled", true);
+			jQuery("#submitthirdparty").prop("disabled", true);
+			jQuery("#search_productid").prop("disabled", true);
+			jQuery("#socid").prop("disabled", true);
 			jQuery(".showforproductselector").hide();
 			jQuery(".showforthirdpartyselector").hide();
 		}
 		if (jQuery("#fillfromproduct:checked").val() == "fillfromproduct")
 		{
-			jQuery("#submitproduct").removeAttr(\'disabled\');
-			jQuery("#submitthirdparty").attr(\'disabled\',\'disabled\');
-			jQuery("#search_productid").removeAttr(\'disabled\');
-			jQuery("#socid").attr(\'disabled\',\'disabled\');
+			jQuery("#submitproduct").removeAttr("disabled");
+			jQuery("#submitthirdparty").prop("disabled", true);
+			jQuery("#search_productid").removeAttr("disabled");
+			jQuery("#socid").prop("disabled", true);
 			jQuery(".showforproductselector").show();
 			jQuery(".showforthirdpartyselector").hide();
 		}
 		if (jQuery("#fillfromthirdparty:checked").val() == "fillfromthirdparty")
 		{
-			jQuery("#submitproduct").attr(\'disabled\',\'disabled\');
-			jQuery("#submitthirdparty").removeAttr(\'disabled\');
-			jQuery("#search_productid").attr(\'disabled\',\'disabled\');
-			jQuery("#socid").removeAttr(\'disabled\');
+			jQuery("#submitproduct").prop("disabled", true);
+			jQuery("#submitthirdparty").removeAttr("disabled");
+			jQuery("#search_productid").prop("disabled", true);
+			jQuery("#socid").removeAttr("disabled");
 			jQuery(".showforproductselector").hide();
 			jQuery(".showforthirdpartyselector").show();
 		}
@@ -348,11 +348,11 @@ jQuery(document).ready(function() {
 	{
 		if (jQuery("#select_fk_barcode_type").val() > 0 && jQuery("#forbarcode").val())
 		{
-			jQuery("#submitformbarcodegen").removeAttr(\'disabled\');
+			jQuery("#submitformbarcodegen").removeAttr("disabled");
 		}
 		else
 		{
-			jQuery("#submitformbarcodegen").attr(\'disabled\',\'disabled\');
+			jQuery("#submitformbarcodegen").prop("disabled", true);
 		}
 	}
 	init_gendoc_button();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 7e842ae3678..07f154c8ef7 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -570,11 +570,11 @@ if ($action == 'create')
 	            			$(".fulldayendmin").removeAttr("disabled");
 	            			$("#p2").removeAttr("disabled");
 	            		} else {
-	            			$(".fulldaystarthour").attr("disabled","disabled").val("00");
-	            			$(".fulldaystartmin").attr("disabled","disabled").val("00");
-	            			$(".fulldayendhour").attr("disabled","disabled").val("23");
-	            			$(".fulldayendmin").attr("disabled","disabled").val("59");
-	            			$("#p2").removeAttr("disabled");
+							$(".fulldaystarthour").prop("disabled", true).val("00");
+							$(".fulldaystartmin").prop("disabled", true).val("00");
+							$(".fulldayendhour").prop("disabled", true).val("23");
+							$(".fulldayendmin").prop("disabled", true).val("59");
+							$("#p2").removeAttr("disabled");
 	            		}
 	            	}
                     setdatefields();
@@ -841,10 +841,10 @@ if ($id > 0)
 	            				$(".fulldayendhour").removeAttr("disabled");
 	            				$(".fulldayendmin").removeAttr("disabled");
 	            			} else {
-	            				$(".fulldaystarthour").attr("disabled","disabled").val("00");
-	            				$(".fulldaystartmin").attr("disabled","disabled").val("00");
-	            				$(".fulldayendhour").attr("disabled","disabled").val("23");
-	            				$(".fulldayendmin").attr("disabled","disabled").val("59");
+								$(".fulldaystarthour").prop("disabled", true).val("00");
+								$(".fulldaystartmin").prop("disabled", true).val("00");
+								$(".fulldayendhour").prop("disabled", true).val("23");
+								$(".fulldayendmin").prop("disabled", true).val("59");
 	            			}
 	            		}
 	            		setdatefields();
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index c656cb0432d..9322680a682 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -95,17 +95,17 @@ class FormActions
                     percentage.val(value);
 
                     if (defaultvalue == -1) {
-                        percentage.attr('disabled', 'disabled');
+						percentage.prop('disabled', true);
                         $('.hideifna').hide();
                     }
                     else if (defaultvalue == 0) {
 						percentage.val(0);
-                    	percentage.attr('disabled', 'disabled');
+						percentage.prop('disabled', true);
                         $('.hideifna').show();
                     }
                     else if (defaultvalue == 100) {
 						percentage.val(100);
-                        percentage.attr('disabled', 'disabled');
+						percentage.prop('disabled', true);
                         $('.hideifna').show();
                     }
                     else {
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8d6bc704e21..0b119ada66a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -132,7 +132,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     						// Disable an element
     						if (options.option_disabled) {
     							if (ui.item.disabled) {
-    								$("#" + options.option_disabled).attr("disabled", "disabled");
+									$("#" + options.option_disabled).prop("disabled", true);
     								if (options.error) {
     									$.jnotify(options.error, "error", true);		// Output with jnotify the error message
     								}
@@ -145,7 +145,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     						}
     						if (options.disabled) {
     							$.each(options.disabled, function(key, value) {
-    								$("#" + value).attr("disabled", "disabled");
+									$("#" + value).prop("disabled", true);
     							});
     						}
     						if (options.show) {
@@ -524,7 +524,7 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=a
                     // Disable another element
                     if (input.disabled && input.disabled.length > 0) {
                         $.each(input.disabled, function(key,value) {
-                            $("#" + value).attr("disabled", true);
+                            $("#" + value).prop("disabled", true);
                             if ($("#" + value).hasClass("butAction") == true) {
                                 $("#" + value).removeClass("butAction");
                                 $("#" + value).addClass("butActionRefused");
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 293a363edfd..44de526942f 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -42,27 +42,27 @@
 
     		if (GETPOST('type') == "separate")
     		{
-    			print "jQuery('#size, #unique, #required, #default_value').val('').attr('disabled','disabled');";
+				print "jQuery('#size, #unique, #required, #default_value').val('').prop('disabled', true);";
     			print 'jQuery("#value_choice").hide();';
     		}
     		?>
 
-    		if (type == 'date') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-    		else if (type == 'datetime') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+			if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
     		else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+			else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
     		else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-    		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-    		else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
-    		else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-    		else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-    		else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-    		else if (type == 'chkbxlst') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
-    		else if (type == 'separate') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  required.val('').attr('disabled','disabled'); default_value.val('').attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
-    		else size.val('').attr('disabled','disabled');
+			else if (type == 'boolean') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
+			else if (type == 'price') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
+			else if (type == 'select') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'link') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
+			else if (type == 'sellist') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'radio') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.prop('disabled', true);  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
+			else if (type == 'separate') { size.val('').prop('disabled', true); unique.prop('disabled', true);  required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
+			else size.val('').prop('disabled', true);
     	}
     	init_typeoffields('<?php echo GETPOST('type'); ?>');
     	jQuery("#type").change(function() {
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 91b861381ae..9c283b83867 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -25,15 +25,15 @@
     		var size = jQuery("#size");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		if (type == 'date') { size.attr('disabled','disabled'); }
-    		else if (type == 'datetime') { size.attr('disabled','disabled'); }
+			if (type == 'date') { size.prop('disabled', true); }
+			else if (type == 'datetime') { size.prop('disabled', true); }
     		else if (type == 'double') { size.removeAttr('disabled'); }
     		else if (type == 'int') { size.removeAttr('disabled'); }
-    		else if (type == 'text') { size.removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); }
+			else if (type == 'text') { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); }
     		else if (type == 'varchar') { size.removeAttr('disabled'); }
-    		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');}
-    		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');}
-    		else size.val('').attr('disabled','disabled');
+			else if (type == 'boolean') { size.val('').prop('disabled', true); unique.prop('disabled', true);}
+			else if (type == 'price') { size.val('').prop('disabled', true); unique.prop('disabled', true);}
+			else size.val('').prop('disabled', true);
     	}
     	init_typeoffields(jQuery("#type").val());
     });
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 7df38b46d61..48599d51323 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -496,7 +496,7 @@ jQuery(document).ready(function() {
 		else
 		{
 			jQuery(".hideroot").hide();
-			jQuery(".needroot").attr('disabled','disabled');
+			jQuery(".needroot").prop('disabled', true);
 		}
 	}
 
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 8f656045ee3..501272983cd 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -29,8 +29,8 @@ $langs->load("productbatch");
 		jQuery(document).ready(function() {
 			function init_price()
 			{
-				if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr(\'disabled\');
-				else jQuery("#unitprice").attr(\'disabled\',\'disabled\');
+				if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
+				else jQuery("#unitprice").prop("disabled", true);
 			}
 			init_price();
 			jQuery("#mouvement").change(function() {
@@ -116,4 +116,4 @@ $langs->load("productbatch");
 		print '</form>';
 
 ?>
-<!-- END PHP STOCKCORRECTION.TPL.PHP -->
\ No newline at end of file
+<!-- END PHP STOCKCORRECTION.TPL.PHP -->
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 77352b630f1..8211adbb4bc 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -821,22 +821,22 @@ if (($action == 'create') || ($action == 'adduserldap'))
 								$("select[name=admin]").change(function() {
 									 if ( $(this).val() == 0 ) {
 									 	$("input[name=superadmin]")
-									 		.attr("disabled", true)
+											.prop("disabled", true)
 											.prop("checked", false);
 									 	$("select[name=entity]")
-											.attr("disabled", false);
+											.prop("disabled", false);
 									 } else {
 									 	$("input[name=superadmin]")
-									 		.attr("disabled", false);
+											.prop("disabled", false);
 									 }
 								});
 								$("input[name=superadmin]").change(function() {
 									if ( $(this).prop("checked", true) ) {
 										$("select[name=entity]")
-											.attr("disabled", true);
+											.prop("disabled", true);
 									} else {
 										$("select[name=entity]")
-											.attr("disabled", false);
+											.prop("disabled", false);
 									}
 								});
 							});
@@ -1822,32 +1822,32 @@ else
 										var admin = $("select[name=admin]").val();
 										if (admin == 0) {
 											$("input[name=superadmin]")
-													.attr("disabled", true)
+													.prop("disabled", true)
 													.prop("checked", false);
 										}
 										if ($("input[name=superadmin]").prop("checked", true)) {
 											$("select[name=entity]")
-													.attr("disabled", true);
+													.prop("disabled", true);
 										}
 										$("select[name=admin]").change(function() {
 											 if ( $(this).val() == 0 ) {
 											 	$("input[name=superadmin]")
-											 		.attr("disabled", true)
+													.prop("disabled", true)
 													.prop("checked", false);
 											 	$("select[name=entity]")
-													.attr("disabled", false);
+													.prop("disabled", false);
 											 } else {
 											 	$("input[name=superadmin]")
-											 		.attr("disabled", false);
+													.prop("disabled", false);
 											 }
 										});
 										$("input[name=superadmin]").change(function() {
 											if ( $(this).prop("checked", true)) {
 												$("select[name=entity]")
-													.attr("disabled", true);
+													.prop("disabled", true);
 											} else {
 												$("select[name=entity]")
-													.attr("disabled", false);
+													.prop("disabled", false);
 											}
 										});
 									});