VAT on invoice and checkout

-- HikaShop version -- : 2.3.2
-- Joomla version -- : 3.3.3

Hi,
I am in Germany and there are quite some rules apllied which are not in the rest of the world.
So,
I got this order on invoice:

and I got this order on checkout:




And on checkout I will need the followin order:
Zwischensumme (Sum) -> is incl VAT from products
Versand inkl MWST (shipping incl VAT) -> is shipping incl VAT
enthaltene MWST (VAT INCLUDED SUM ABOVE) -> which means NOW it is only showing the VAT from products sum, but I need it from Products and shipping, so the complete VAT from the products AND the shipping)
SUM TOTAL (Zwischensumme plus Shipping - > all incl VAT)

and the same also on invoice:
Zwischensumme (Sum) -> is incl VAT from products
Versand inkl MWST (shipping incl VAT) -> is shipping incl VAT
enthaltene MWST (VAT INCLUDED SUM ABOVE) -> which means NOW it is only showing the VAT from products sum, but I need it from Products and shipping, so the complete VAT from the products AND the shipping)
SUM TOTAL (Zwischensumme plus Shipping - > all incl VAT)

right now on invoice there is a bit different ordering, it is currently that Versand comes after enthaltene MWST (Sum VAT, Shipping, SUM TOTAL),
but I want it correct to be as in ccheckout also, ( Sum, Shipping, VAT, SUM TOTAL)

With correct calculation function, which means that the included vat must also consider the vat from shipping (which right now is not the case hen calculated.

So: Conclusion: Right now "enthaltene MWST" (vat included) only calculates the VAT from product sum, but I need it to caluclate also the VAT from shipping additionally.
And I want to reorder, so that included vat comees after all posts but before TOTAL SUM of course...

Cheers.
And thanks for any input.

Andre

Hi Nicolas,
indeed that was already 90% of the solution..
I only had to go to invoice.php also, because I needed the same order on the invoice also.
There I took the shipping php variable and positioned it above the "included VAT" stuff and so it was also in order for the books.

Great of help!
Thanks.
Andre