Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -942,8 +942,8 @@ class DistributionController extends BackendController
                                                 foreach ($order->productOrder as $productOrder) {
                                                         $lines[] = [
                                                                 'name' => $productOrder->product->name,
-                                                                'price' => $productOrder->price * 100 * $productOrder->quantity,
-                                                                'tax' => 5.5,
+                                                                'price' => $productOrder->getPriceWithTax() * 100 * $productOrder->quantity,
+                                                                'tax' => $productOrder->taxRate->value * 100,
                                                                 'date' => $strDate,
                                                                 'quantity' => $productOrder->quantity
                                                         ];