[Backend] Commandes : méthode de calcul du prix TTC

backend/views/distribution/index.php

@@ -360,7 +360,9 @@ $this->setPageTitle('Distributions') ;
                                         {{ order.pointSale.name }}
                                     </template>
                                 </td>
-                                <td class="column-amount">{{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}</td>
+                                <td class="column-amount">
+                                    {{ order.amount.replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,")+'&nbsp;€' }}
+                                </td>
                                 <td class="column-state-payment">
                                     <div class="input-group">
                                         <span class="label label-success input-group-addon" v-if="order.amount_paid == order.amount">payé</span>

common/models/Order.php

@@ -478,9 +478,9 @@ class Order extends ActiveRecordCommon
 
     public function getAmountWithTax($type = self::AMOUNT_TOTAL, $format = false)
     {
-        $amount = $this->amount_with_tax;
+        $amount = $this->amount + $this->getTotalVat($type);
         if ($type == self::INVOICE_AMOUNT_TOTAL && $this->invoice_amount) {
-            $amount = $this->invoice_amount_with_tax;
+            $amount = $this->invoice_amount + $this->getTotalVat($type);
         }
 
         return $this->_getAmountGeneric($type, $amount, $format);