paperless_to_xero 1.2.1 → 1.2.2

data/lib/paperless_to_xero/converter.rb

@@ -7,6 +7,7 @@ module PaperlessToXero
   class Converter
     VAT_RATE_CHANGE_2008_12_01 = Date.parse('2008-12-01')
     VAT_RATE_CHANGE_2010_01_01 = Date.parse('2010-01-01')
+    VAT_RATE_CHANGE_2011_01_04 = Date.parse('2011-01-04')
     attr_reader :input_path, :output_path
     
     def initialize(input_path, output_path)
@@ -145,9 +146,15 @@ module PaperlessToXero
       when nil
         'No VAT'
       else
-        return 'VAT - 15%' if date >= VAT_RATE_CHANGE_2008_12_01 && date < VAT_RATE_CHANGE_2010_01_01
-        'VAT - 17.5%'
+        base_uk_vat_rate_on_date(date)
       end
     end
+    
+    def base_uk_vat_rate_on_date(date)
+      return 'VAT - 15%' if date >= VAT_RATE_CHANGE_2008_12_01 && date < VAT_RATE_CHANGE_2010_01_01
+      return 'VAT - 17.5%' if date >= VAT_RATE_CHANGE_2010_01_01 && date < VAT_RATE_CHANGE_2011_01_04
+      return 'VAT - 20%' if date >= VAT_RATE_CHANGE_2011_01_04
+      'VAT - 17.5%'
+    end
   end
 end

data/lib/paperless_to_xero/invoice_item.rb

@@ -19,6 +19,7 @@ module PaperlessToXero
           '15% (EU VAT ID)' => 1.15.to_d,
           '15% (VAT on expenses)' => 1.15.to_d,
           '17.5% (VAT on expenses)' => 1.175.to_d,
+          '20% (VAT on expenses)' => 1.2.to_d,
           'Zero Rated Expenses' => 0,
           '15% (Luxembourg, VAT on expenses)' => 1.15.to_d
         }
@@ -78,6 +79,8 @@ module PaperlessToXero
         '15% (EU VAT ID)'
       when 'VAT - 15%'
         '15% (VAT on expenses)'
+      when 'VAT - 20%'
+        '20% (VAT on expenses)'
       when 'VAT - 17.5%'
         '17.5% (VAT on expenses)'
       when 'VAT - 0%'

data/lib/paperless_to_xero/version.rb

@@ -5,8 +5,8 @@ module PaperlessToXero
   
   module Version
     MAJOR = 1
-    MINOR = 1
-    POINT = 1
+    MINOR = 2
+    POINT = 2
     FULL = [PaperlessToXero::Version::MAJOR, PaperlessToXero::Version::MINOR, PaperlessToXero::Version::POINT].join('.')
   end
 end

data/spec/fixtures/single-vat-2011-01-03.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+03/01/2011,"Apple Store, Regent Street","£","117.50","17.50","429 - General Expenses","Debit Card",,"Phone case","2011-01-03-05",

data/spec/fixtures/single-vat-2011-01-04.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+04/01/2011,"Apple Store, Regent Street","£","120","20","429 - General Expenses","Debit Card",,"Phone case","2011-01-04-05",

data/spec/paperless_to_xero/converter_spec.rb

@@ -242,6 +242,40 @@ describe PaperlessToXero::Converter do
             ]
           )
         end
+        
+        it "correctly handles the last day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2011-01-03'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2011-01-03'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2011-01-03-05', :inc_vat_total => '117.50', :vat_total => '17.50', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '17.5% (VAT on expenses)',
+               :vat_inclusive_amount => '117.50', :vat_exclusive_amount => '100.00', :vat_amount => '17.50'}
+            ]
+          )
+        end
+      end
+      
+      describe "2011-01-04's move to 20% VAT" do
+        it "correctly handles the first day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2011-01-04'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2011-01-04'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2011-01-04-05', :inc_vat_total => '120.00', :vat_total => '20.00', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '20% (VAT on expenses)',
+               :vat_inclusive_amount => '120.00', :vat_exclusive_amount => '100.00', :vat_amount => '20.00'}
+            ]
+          )
+        end
       end
     end
     

data/spec/paperless_to_xero/invoice_item_spec.rb

@@ -144,7 +144,8 @@ describe PaperlessToXero::InvoiceItem do
          'VAT - Luxembourg'       => '15% (Luxembourg, VAT on expenses)',
          'VAT - EU'               => '15% (EU VAT ID)',
          'VAT - EU - EU372000063' => '15% (EU VAT ID)',
-         'VAT - 17.5%'              => '17.5% (VAT on expenses)',
+         'VAT - 20%'              => '20% (VAT on expenses)',
+         'VAT - 17.5%'            => '17.5% (VAT on expenses)',
          'VAT - 15%'              => '15% (VAT on expenses)',
          'VAT - 0%'               => 'Zero Rated Expenses',
          'VAT'                    => '15% (VAT on expenses)',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperless_to_xero
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Matt Patterson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +00:00
+date: 2011-02-28 00:00:00 +00:00
 default_executable: paperless_to_xero
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,8 @@ files:
 - spec/fixtures/single-vat-2009-12-31.csv
 - spec/fixtures/single-vat-2009.csv
 - spec/fixtures/single-vat-2010-01-01.csv
+- spec/fixtures/single-vat-2011-01-03.csv
+- spec/fixtures/single-vat-2011-01-04.csv
 - spec/fixtures/single-vat-pre-2008-12.csv
 - spec/fixtures/single-zero_rated.csv
 has_rdoc: true
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: paperless_to_xero
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Convert Paperless CSV exports to Xero invoice import CSV
@@ -159,5 +161,7 @@ test_files:
 - spec/fixtures/single-vat-2009-12-31.csv
 - spec/fixtures/single-vat-2009.csv
 - spec/fixtures/single-vat-2010-01-01.csv
+- spec/fixtures/single-vat-2011-01-03.csv
+- spec/fixtures/single-vat-2011-01-04.csv
 - spec/fixtures/single-vat-pre-2008-12.csv
 - spec/fixtures/single-zero_rated.csv