فهرست منبع

MMIProduct : Add option to use new cost price when cloning propal

Mathieu Moulin 2 سال پیش
والد
کامیت
0364f55ecf
2فایلهای تغییر یافته به همراه8 افزوده شده و 2 حذف شده
  1. 7 1
      htdocs/comm/propal/class/propal.class.php
  2. 1 1
      htdocs/custom/mmiproduct

+ 7 - 1
htdocs/comm/propal/class/propal.class.php

@@ -1404,6 +1404,9 @@ class Propal extends CommonObject
 							$pu_ht = $prod->price;
 							$tva_tx = get_default_tva($mysoc, $objsoc, $prod->id);
 							$remise_percent = $objsoc->remise_percent;
+							// Added by MMI
+							if (!empty($conf->global->MMI_PROPAL_CLONE_USE_NEW_COST_PRICE))
+								$pa_ht = $prod->cost_price;
 
 							if (!empty($conf->global->PRODUIT_MULTIPRICES) && $objsoc->price_level > 0) {
 								$pu_ht = $prod->multiprices[$objsoc->price_level];
@@ -1427,7 +1430,10 @@ class Propal extends CommonObject
 									}
 								}
 							}
-
+							
+							// Added by MMI
+							if (!empty($pa_ht))
+								$line->pa_ht = $pa_ht;
 							$line->subprice = $pu_ht;
 							$line->tva_tx = $tva_tx;
 							$line->remise_percent = $remise_percent;

+ 1 - 1
htdocs/custom/mmiproduct

@@ -1 +1 @@
-Subproject commit e8e9efbeb02aae1da5ab73a903bad3c31a67f6d8
+Subproject commit 3e968cd329cc9f392927b252631dc68e2426b928