From 6b8213b175f80b3f40fc11fb60462e513dcdd9fa Mon Sep 17 00:00:00 2001 From: lainwir3d Date: Fri, 8 Apr 2022 16:09:37 +0400 Subject: [PATCH] Supplier order dispatch : retrieve line price from order when deleting dispatch line. This will allows custom cost price to be reverted back in triggers and such later. --- htdocs/fourn/commande/dispatch.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index bb56e5d4555..5e6e4d08f1b 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -406,12 +406,24 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoreceive $qty = $supplierorderdispatch->qty; $entrepot = $supplierorderdispatch->fk_entrepot; $product = $supplierorderdispatch->fk_product; - $price = price2num(GETPOST('price', 'alpha'), 'MU'); $comment = $supplierorderdispatch->comment; $eatby = $supplierorderdispatch->eatby; $sellby = $supplierorderdispatch->sellby; $batch = $supplierorderdispatch->batch; + if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) { + $price = price2num(GETPOST('price', 'alpha'), 'MU'); + }else{ + $cfl = new CommandeFournisseurLigne($db); + $ret = $cfl->fetch($supplierorderdispatch->fk_commandefourndet); + if($ret > 0){ + $price = $cfl->subprice; + $price = price2num($price * (1 - ($cfl->remise_percent / 100.0)), 'MU'); + }else{ + $price = "0"; + } + } + $result = $supplierorderdispatch->delete($user); } if ($result < 0) {