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

This commit is contained in:
Laurent Destailleur 2025-12-18 16:29:31 +01:00
commit 810cb6774c
2 changed files with 5 additions and 1 deletions

View file

@ -994,6 +994,10 @@ class Documents extends DolibarrApi
$modulepart = 'mrp';
require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
$object = new Mo($this->db);
} elseif ($modulepart == 'stock') {
$modulepart = 'stock';
require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';
$object = new Entrepot($this->db);
} elseif ($modulepart == 'ecm') {
throw new RestException(500, 'Using a non empty "ref" is not compatible with using modulepart = '.$modulepart);
} else {

View file

@ -391,7 +391,7 @@ if (empty($reshook)) {
$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
$moline->role = 'produced';
$moline->fk_mrp_production = $line->id;
$moline->fk_stock_movement = $idstockmove;
$moline->fk_stock_movement = (($idstockmove == 0) ? null : $idstockmove);
$moline->fk_user_creat = $user->id;
$resultmoline = $moline->create($user);