Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/tpl/objectline_edit.tpl.php

@@ -309,21 +309,21 @@ if (!empty($extrafields))
 <?php
 if (! empty($usemargins) && $user->rights->margins->creer)
 {
-?>
+	?>
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 		<?php
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
-		$("input[name='np_marginRate']:first").blur(function(e) {
-			return checkFreeLine(e, "np_marginRate");
-		});
-		<?php
+			$("input[name='np_marginRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_marginRate");
+			});
+			<?php
 		}
 		if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
-		$("input[name='np_markRate']:first").blur(function(e) {
-			return checkFreeLine(e, "np_markRate");
-		});
-		<?php
+			$("input[name='np_markRate']:first").blur(function(e) {
+				return checkFreeLine(e, "np_markRate");
+			});
+			<?php
 		}
 		?>
 	});
@@ -373,7 +373,7 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 
 		return true;
 	}
-<?php
+	<?php
 }
 ?>