[Administration] Documents : correctif prix unitaire invoice price

backend/views/document/_download_product_line.php

@@ -38,7 +38,7 @@ $unitModule = UnitModule::getInstance();
         <?php if($displayPrices): ?>
                 <td class="align-center column-unit-price">
                     <?php $displayPriceUnitReference = $producerModule->getSolver()->getConfig('option_document_display_price_unit_reference'); ?>
-                    <?php $priceUnitReference = $productOrderModule->getSolver()->getPriceUnitReference($productOrder); ?>
+                    <?php $priceUnitReference = $productOrderModule->getSolver()->getPriceUnitReference($productOrder, true); ?>
                     <?php $priceUnitReferenceString = Price::format($priceUnitReference, $documentPriceDecimals).' / kg' ?>
                     <?php if($productOrder->unit == 'piece'): ?>
                         <?= Price::format($price, $documentPriceDecimals) ?>

common/logic/Order/ProductOrder/Service/ProductOrderSolver.php

@@ -70,20 +70,35 @@ class ProductOrderSolver extends AbstractService implements SolverInterface
         return $productOrder->price;
     }
 
-    public function getPriceUnitReference(ProductOrder $productOrder): ?float
+    public function getPriceUnitReference(ProductOrder $productOrder, bool $isInvoicePrice = false): ?float
     {
+        $productOrderPrice = $productOrder->price;
+        if($isInvoicePrice) {
+            $productOrderPrice = $this->getInvoicePrice($productOrder);
+        }
+
         if($productOrder->unit == 'piece') {
             if($productOrder->product->weight) {
-                $price = (1000 * $productOrder->price) / $productOrder->product->weight;
+                $price = (1000 * $productOrderPrice) / $productOrder->product->weight;
             }
             else {
                 return null;
             }
         }
         else {
-            $price = $productOrder->price;
+            $price = $productOrderPrice;
         }
 
         return $price;
     }
+
+    public function getInvoicePrice(ProductOrder $productOrder)
+    {
+        if($productOrder->invoice_price) {
+            return $productOrder->invoice_price;
+        }
+        else {
+            return $productOrder->price;
+        }
+    }
 }