From 1f0da1194bbab7435b25938b6ce9be600029de0f Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 2 Jan 2017 11:08:40 +0100
Subject: [PATCH] [bug] fix VAT amount in invoice config

---
 CHANGELOG.md                                       | 1 +
 app/assets/templates/admin/invoices/index.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7279958..71a0a2d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## next release
 - Mask new notifications alerts when more than 3
 - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list)
+- Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted
 
 ## v2.4.8 2016 December 15
 
diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb
index c4e47ff7d..a421d2286 100644
--- a/app/assets/templates/admin/invoices/index.html.erb
+++ b/app/assets/templates/admin/invoices/index.html.erb
@@ -157,11 +157,11 @@
 
               <tr class="invoice-vat invoice-editable vat-line italic" ng-click="openEditVAT()" ng-show="invoice.VAT.active">
                   <td>{{ 'including_VAT' | translate }} {{invoice.VAT.rate}} %</td>
-                  <td>{{30/(invoice.VAT.rate/100+1) | currency}}</td>
+                  <td>{{30-(30/(invoice.VAT.rate/100+1)) | currency}}</td>
               </tr>
               <tr class="invoice-ht vat-line italic" ng-show="invoice.VAT.active">
                   <td translate>{{ 'including_total_excluding_taxes' }}</td>
-                  <td>{{30-(30/(invoice.VAT.rate/100+1)) | currency}}</td>
+                  <td>{{30/(invoice.VAT.rate/100+1) | currency}}</td>
               </tr>
               <tr class="invoice-payed vat-line bold" ng-show="invoice.VAT.active">
                   <td translate>{{ 'including_amount_payed_on_ordering' }}</td>