瀏覽代碼

Merge pull request #23818 from altairis-benjamin/discountOnBom

FIX discount wasn't taken into account when adding a line in BOM
Laurent Destailleur 2 年之前
父節點
當前提交
6cb6098d3c
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      htdocs/bom/class/bom.class.php

+ 6 - 3
htdocs/bom/class/bom.class.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2019  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2019	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2023	Benjamin Falière	<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1058,8 +1059,10 @@ class BOM extends CommonObject
 						return -1;
 					}
 					$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
-					if (empty($line->unit_cost)) {
-						if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0) {
+					if ((empty($line->unit_cost)) && ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0)) {
+						if ($productFournisseur->fourn_remise_percent != "0") {
+							$line->unit_cost = $productFournisseur->fourn_unitprice_with_discount;
+						} else {
 							$line->unit_cost = $productFournisseur->fourn_unitprice;
 						}
 					}