From 537b0d47ead67a996dd5198c0c8b1be51c2fea41 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@mozcode.nl>
Date: Fri, 28 Sep 2012 11:58:38 +0200
Subject: [PATCH] Modify Invoice#total_amount to take different VAT rates into
 account

---
 stoptime.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/stoptime.rb b/stoptime.rb
index 628857a..55193af 100644
--- a/stoptime.rb
+++ b/stoptime.rb
@@ -393,12 +393,16 @@ module StopTime::Models
 
     # Returns the total amount (including VAT).
     def total_amount
-      subtotal = summary.inject(0.0) { |tot, (task, summ)| tot + summ[2] }
+      subtotal, vattotal = summary.inject([0.0, 0.0]) do |tot, (task, summ)|
+        tot[0] += summ[2]
+        tot[1] += summ[3]
+        tot
+      end
+
       if company_info.vatno.blank?
         subtotal
       else
-        config = Config.instance
-        subtotal * (1 + config["vat_rate"]/100.0)
+        subtotal + vattotal
       end
     end
   end