[freeside-commits] branch master updated. fff049dbe17c71d13d18c9edf714b3ca0d60c67b

[Ivan]

The branch, master has been updated
       via  fff049dbe17c71d13d18c9edf714b3ca0d60c67b (commit)
      from  0b2e7bf798685d0d6eb2f7a950783207d686d744 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fff049dbe17c71d13d18c9edf714b3ca0d60c67b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Sep 15 17:05:25 2016 -0700

    2018 holidays, RT#18117

diff --git a/FS/FS/pay_batch/eft_canada.pm b/FS/FS/pay_batch/eft_canada.pm
index 78f1e96..3995ac3 100644
--- a/FS/FS/pay_batch/eft_canada.pm
+++ b/FS/FS/pay_batch/eft_canada.pm
@@ -21,6 +21,7 @@ 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
@@ -30,7 +31,6 @@ my %holiday = (
              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
@@ -39,11 +39,18 @@ my %holiday = (
              4 => { map {$_=>1} 14 }, #good friday
              4 => { map {$_=>1} 17 }, #easter monday
              5 => { map {$_=>1} 22 }, #victoria day
-             7 => { map {$_=>1}  1 }, #canada 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 {

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/pay_batch/eft_canada.pm |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)