lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17049 from FHenry/13_fix_receptionfourn

Browse Source 
fix : test on reception must be done on lineToTest if checked
This commit is contained in:
Laurent Destailleur 2021-03-31 13:41:19 +02:00 committed by GitHub
commit 2bc6bde8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/reception/card.php
View File

@ -237,8 +237,6 @@ if (empty($reshook))
$objectsrc = new $classname($db); $objectsrc = new $classname($db);
$objectsrc->fetch($object->origin_id); $objectsrc->fetch($object->origin_id);
$object->socid = $objectsrc->socid; $object->socid = $objectsrc->socid;
$object->ref_supplier = GETPOST('ref_supplier', 'alpha'); $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
$object->model_pdf = GETPOST('model'); $object->model_pdf = GETPOST('model');
@ -280,10 +278,8 @@ if (empty($reshook))
$stockLocation = "ent1".$i."_0"; $stockLocation = "ent1".$i."_0";
$qty = "qtyl".$i; $qty = "qtyl".$i;
//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
//reception line for product with no batch management and no multiple stock location
//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
//reception line for product with no batch management and no multiple stock location
if (GETPOST($qty, 'int') > 0) if (GETPOST($qty, 'int') > 0)
$totalqty += GETPOST($qty, 'int'); $totalqty += GETPOST($qty, 'int');
@ -318,9 +314,15 @@ if (empty($reshook))
$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int'); $entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
if (!empty($lineToTest)) {
$fk_product = $lineToTest->fk_product;
} else {
$fk_product = $linesrc->fk_product;
}
if ($entrepot_id < 0) if ($entrepot_id < 0)
$entrepot_id = ''; $entrepot_id = '';
if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) if (!($fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES))
$entrepot_id = 0; $entrepot_id = 0;
$eatby = GETPOST($eatby, 'alpha'); $eatby = GETPOST($eatby, 'alpha');
$sellby = GETPOST($sellby, 'alpha'); $sellby = GETPOST($sellby, 'alpha');