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

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur 2021-02-03 17:12:44 +01:00
commit 92942870dc

View File

@ -3137,7 +3137,7 @@ class CommandeFournisseur extends CommonOrder
return $ret;
} else {
if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0) {
require_once DOL_DOCUMENT_ROOT.'/htdocs/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$date_liv = dol_now();
// Build array with quantity deliverd by product