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

This commit is contained in:
Laurent Destailleur 2020-10-03 14:53:22 +02:00
commit f764b36a64

View File

@ -309,7 +309,7 @@ if (!empty($extrafields))
<?php <?php
if (! empty($usemargins) && $user->rights->margins->creer) if (! empty($usemargins) && $user->rights->margins->creer)
{ {
?> ?>
/* Some js test when we click on button "Add" */ /* Some js test when we click on button "Add" */
jQuery(document).ready(function() { jQuery(document).ready(function() {
<?php <?php
@ -373,7 +373,7 @@ if (! empty($usemargins) && $user->rights->margins->creer)
return true; return true;
} }
<?php <?php
} }
?> ?>