X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2Feft_canada.pm;h=3995ac3d223619424b07c07b9ae9a99b980f28ba;hb=bb7e827141c9ed68f30765c9ca2ddcd1d760ad2d;hp=fd3c52a25d7c44adefcab8b6ead608e1b8540488;hpb=4b65bb78779b336aab60c9cb112b1efc1e653917;p=freeside.git

diff --git a/FS/FS/pay_batch/eft_canada.pm b/FS/FS/pay_batch/eft_canada.pm
index fd3c52a25..3995ac3d2 100644
--- a/FS/FS/pay_batch/eft_canada.pm
+++ b/FS/FS/pay_batch/eft_canada.pm
@@ -21,29 +21,36 @@ my $req_date; # requested process date, in %D format
 #ref http://gocanada.about.com/od/canadatravelplanner/a/canada_holidays.htm
 my %holiday_yearly = (
    1 => { map {$_=>1}  1 }, #new year's
+   7 => { map {$_=>1}  1 }, #canada day
   11 => { map {$_=>1} 11 }, #remembrance day
   12 => { map {$_=>1} 25 }, #christmas
   12 => { map {$_=>1} 26 }, #boxing day
 );
 my %holiday = (
-  2015 => {  2 => { map {$_=>1} 16 }, #family day
-             4 => { map {$_=>1}  3 }, #good friday
-             4 => { map {$_=>1}  6 }, #easter monday
-             5 => { map {$_=>1} 18 }, #victoria day
-             7 => { map {$_=>1}  1 }, #canada day
-             8 => { map {$_=>1}  3 }, #First Monday of August Civic Holiday
-             9 => { map {$_=>1}  7 }, #labour day
-            10 => { map {$_=>1} 12 }, #thanksgiving
-          },
   2016 => {  2 => { map {$_=>1} 15 }, #family day
              3 => { map {$_=>1} 25 }, #good friday
              3 => { map {$_=>1} 28 }, #easter monday
              5 => { map {$_=>1} 23 }, #victoria day
-             7 => { map {$_=>1}  1 }, #canada day
              8 => { map {$_=>1}  1 }, #First Monday of August Civic Holiday
              9 => { map {$_=>1}  5 }, #labour day
             10 => { map {$_=>1} 10 }, #thanksgiving
           },
+  2017 => {  2 => { map {$_=>1} 20 }, #family day
+             4 => { map {$_=>1} 14 }, #good friday
+             4 => { map {$_=>1} 17 }, #easter monday
+             5 => { map {$_=>1} 22 }, #victoria day
+             8 => { map {$_=>1}  7 }, #First Monday of August Civic Holiday
+             9 => { map {$_=>1}  4 }, #labour day
+            10 => { map {$_=>1}  9 }, #thanksgiving
+          },
+  2018 => {  2 => { map {$_=>1} 19 }, #family day
+             3 => { map {$_=>1} 30 }, #good friday
+             4 => { map {$_=>1}  2 }, #easter monday
+             5 => { map {$_=>1} 21 }, #victoria day
+             8 => { map {$_=>1}  6 }, #First Monday of August Civic Holiday
+             9 => { map {$_=>1}  3 }, #labour day
+            10 => { map {$_=>1}  8 }, #thanksgiving
+          },
 );
 
 sub is_holiday {