X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FReport%2FTable%2FMonthly.pm;h=d3ff5d1db249c0f5a116e13537dd97cf2f08a249;hb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;hp=9aebeee3de3e93f844943f30a8f632dffb2aca0e;hpb=654234a526b5447ec02970962cccb1cf879796c8;p=freeside.git

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 9aebeee3d..d3ff5d1db 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -1,13 +1,15 @@
 package FS::Report::Table::Monthly;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $expenses_kludge );
 use Time::Local;
 use FS::UID qw( dbh );
 use FS::Report::Table;
 
 @ISA = qw( FS::Report::Table );
 
+$expenses_kludge = 0;
+
 =head1 NAME
 
 FS::Report::Table::Monthly - Tables of report data, indexed monthly
@@ -16,7 +18,7 @@ FS::Report::Table::Monthly - Tables of report data, indexed monthly
 
   use FS::Report::Table::Monthly;
 
-  my $report = new FS::Report::Table (
+  my $report = new FS::Report::Table::Monthly (
     'items' => [ 'invoiced', 'netsales', 'credits', 'receipts', ],
     'start_month' => 4,
     'start_year'  => 2000,
@@ -51,8 +53,10 @@ sub data {
     push @{$data{label}}, "$smonth/$syear";
 
     my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{speriod}}, $speriod;
     if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
     my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{eperiod}}, $eperiod;
   
     foreach my $item ( @{$self->{'items'}} ) {
       push @{$data{$item}}, $self->$item($speriod, $eperiod);
@@ -83,7 +87,7 @@ sub netsales { #net sales
   );
 
   #horrible local kludge
-  my $expenses = $self->scalar_sql("
+  my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pkg.setup)
     FROM cust_bill_pkg, cust_bill, cust_pkg, part_pkg
     WHERE cust_bill.invnum = cust_bill_pkg.invnum
@@ -93,7 +97,7 @@ sub netsales { #net sales
     AND LOWER(part_pkg.pkg) LIKE 'expense _%'
   ");
 
-  $self->invoiced($speriod,$eperiod)-$credited-$expenses;
+  $self->invoiced($speriod,$eperiod) - $credited - $expenses;
 }
 
 #deferred revenue
@@ -101,19 +105,13 @@ sub netsales { #net sales
 sub receipts { #cashflow
   my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
 
-  #cashflow
-  my $paid = $self->scalar_sql("
-    SELECT SUM(paid) FROM cust_pay
-    WHERE ". $self->in_time_period($speriod, $eperiod)
-  );
-
   my $refunded = $self->scalar_sql("
     SELECT SUM(refund) FROM cust_refund
     WHERE ". $self->in_time_period($speriod, $eperiod)
   );
 
   #horrible local kludge that doesn't even really work right
-  my $expenses = $self->scalar_sql("
+  my $expenses = !$expenses_kludge ? 0 : $self->scalar_sql("
     SELECT SUM(cust_bill_pay.amount)
     FROM cust_bill_pay, cust_bill
     WHERE cust_bill_pay.invnum = cust_bill.invnum
@@ -127,7 +125,15 @@ sub receipts { #cashflow
   ");
   #    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
   
-  $paid-$refunded-$expenses;
+  $self->payments($speriod, $eperiod) - $refunded - $expenses;
+}
+
+sub payments {
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  $self->scalar_sql("
+    SELECT SUM(paid) FROM cust_pay
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
 }
 
 sub credits {