Merge branch 'dev_new_add_desc_when_select_product' of github.com:FHenry/dolibarr into dev_new_add_desc_when_select_product

This commit is contained in:
Florian HENRY 2020-10-26 16:40:42 +01:00
commit 3295c4b68f

View File

@ -695,7 +695,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
'json'
);
}
<?php
<?php
}
if (!empty($usemargins) && $user->rights->margins->creer)
@ -835,7 +835,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
jQuery("#remise_percent").val(pbqpercent);
}
}
<?php
<?php
}
?>
//Deal with supplier