Rework some code
This commit is contained in:
parent
8be5cccb4e
commit
69eaf1e708
@ -783,9 +783,9 @@ class Mo extends CommonObject
|
|||||||
$codemovementCancel = $langs->trans("StockIncrease");
|
$codemovementCancel = $langs->trans("StockIncrease");
|
||||||
|
|
||||||
if (($qtytoprocess >= 0)) {
|
if (($qtytoprocess >= 0)) {
|
||||||
$idstockmove = $stockmove->reception($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', '', dol_now(), $movement->batch, $codemovementCancel);
|
$idstockmove = $stockmove->reception($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $movement->batch, dol_now(), 0, $codemovementCancel);
|
||||||
} else {
|
} else {
|
||||||
$idstockmove = $stockmove->livraison($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', '', $movement->batch, $codemovementCancel);
|
$idstockmove = $stockmove->livraison($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $movement->batch, 0, $codemovementCancel);
|
||||||
}
|
}
|
||||||
if ($idstockmove < 0) {
|
if ($idstockmove < 0) {
|
||||||
$this->error++;
|
$this->error++;
|
||||||
@ -801,16 +801,15 @@ class Mo extends CommonObject
|
|||||||
$lineDetails = $arrayoflines[$key];
|
$lineDetails = $arrayoflines[$key];
|
||||||
$productstatic->fetch($lineDetails['fk_product']);
|
$productstatic->fetch($lineDetails['fk_product']);
|
||||||
$qtytoprocess = $lineDetails['qty'];
|
$qtytoprocess = $lineDetails['qty'];
|
||||||
$id_product_batch = (! empty($lineDetails['batch']) ? $lineDetails['batch'] : 0);
|
|
||||||
|
|
||||||
// Reverse stock movement
|
// Reverse stock movement
|
||||||
$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
|
$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
|
||||||
$codemovementCancel = $langs->trans("StockIncrease");
|
$codemovementCancel = $langs->trans("StockIncrease");
|
||||||
|
|
||||||
if ($qtytoprocess >= 0) {
|
if ($qtytoprocess >= 0) {
|
||||||
$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', '', dol_now(), $id_product_batch, $codemovementCancel);
|
$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', $lineDetails['batch'], dol_now(), 0, $codemovementCancel);
|
||||||
} else {
|
} else {
|
||||||
$idstockmove = $stockmove->livraison($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', '', $id_product_batch, $codemovementCancel);
|
$idstockmove = $stockmove->livraison($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $lineDetails['batch'], 0, $codemovementCancel);
|
||||||
}
|
}
|
||||||
if ($idstockmove < 0) {
|
if ($idstockmove < 0) {
|
||||||
$this->error++;
|
$this->error++;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user