Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Dolibarr · Apr 2, 2019 · cb1489e · cb1489e
2 parents f7f20df + 5dfc1c0
commit cb1489e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
@@ -96,6 +96,9 @@ function marges_prepare_head()
 		$head[$h][2] = 'checkMargins';
 	}
 
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins','remove');
+	complete_head_from_modules($conf,$langs,null,$head,$h,'margins');
+
 	return $head;
 }