[freeside-commits] branch FREESIDE_3_BRANCH updated. 501fc8a7d7a77bb5dde26db85aeff99f7a5cf98c

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  501fc8a7d7a77bb5dde26db85aeff99f7a5cf98c (commit)
      from  585ff413bf77865903273e2839462ed7b97bf193 (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 501fc8a7d7a77bb5dde26db85aeff99f7a5cf98c
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Jul 31 18:21:14 2015 -0500

    RT#37465: RBC PAD error when calculating totals

diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm
index 47fc8d4..53f8108 100644
--- a/FS/FS/pay_batch/RBC.pm
+++ b/FS/FS/pay_batch/RBC.pm
@@ -90,7 +90,6 @@ $name = 'RBC';
       my( $hash, $total, $line ) = @_;
       return "Can't process Credit Detail Record, aborting import"
         if ($hash->{'recordtype'} eq '2');
-      $totaloffset = sprintf("%.2f", $totaloffset / 100 );
       $total += $totaloffset;
       $total = sprintf("%.2f", $total);
       # We assume here that this is an 'All Records' or 'Input Records' report.
@@ -109,10 +108,16 @@ $name = 'RBC';
       #we already declined it this run, no takebacks
       if ($declined->{$hash->{'paybatchnum'}}) {
         #file counts this as part of total, but we skip
-        $totaloffset += $hash->{'paid'}
+        $totaloffset += sprintf("%.2f", $hash->{'paid'} / 100 )
           if $hash->{'status'} eq ' '; #false laziness with 'approved' above
         return 1;
       }
+      #skipping W for now (maybe it should be declined?)
+      if ($hash->{'status'} eq 'W') {
+        #file counts this as part of total, but we skip
+        $totaloffset += sprintf("%.2f", $hash->{'paid'} / 100 );
+        return 1;
+      }
       return 
         ($hash->{'recordtype'} eq '3') || #Account Trailer Record, concludes returned items
         ($hash->{'subtype'} ne '0'); #error messages, etc, too late to apply to previous entry

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

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