Merge branch 'dev'

backend/views/document/download.php

@@ -104,9 +104,9 @@ $displayPrices = Yii::$app->controller->getClass() != 'DeliveryNote' || (Yii::$a
                                 <?php endforeach; ?>
                         <?php endif; ?>
                                 <?php if($displayPrices): ?>
-                                        <?php if(GlobalParam::getCurrentProducer()->taxRate->value != 0): ?>
+                                        <?php $typeAmount = $document->isInvoicePrice() ? Order::INVOICE_AMOUNT_TOTAL : Order::AMOUNT_TOTAL ; ?>
 
-                                            <?php $typeAmount = $document->isInvoicePrice() ? Order::INVOICE_AMOUNT_TOTAL : Order::AMOUNT_TOTAL ; ?>
+                                        <?php if(GlobalParam::getCurrentProducer()->taxRate->value != 0): ?>
 
                                         <tr>
                                                 <td class="align-right" colspan="5"><strong>Total HT</strong></td>