freeside/FS/FS/Report/Table Monthly.pm,1.2,1.3

[ivan]

Update of /home/cvs/cvsroot/freeside/FS/FS/Report/Table
In directory pouncequick:/tmp/cvs-serv28951/FS/FS/Report/Table

Modified Files:
	Monthly.pm 
Log Message:
credit report, add some links to sales/credits/receipts summary, move payment search to template

Index: Monthly.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Report/Table/Monthly.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Monthly.pm	12 Mar 2004 08:56:50 -0000	1.2
+++ Monthly.pm	23 Apr 2004 12:19:40 -0000	1.3
@@ -18,7 +18,7 @@
 
   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,
@@ -53,8 +53,10 @@
     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);
@@ -95,7 +97,7 @@
     AND LOWER(part_pkg.pkg) LIKE 'expense _%'
   ");
 
-  $self->invoiced($speriod,$eperiod)-$credited-$expenses;
+  $self->invoiced($speriod,$eperiod) - $credited - $expenses;
 }
 
 #deferred revenue
@@ -103,12 +105,6 @@
 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)
@@ -129,7 +125,15 @@
   ");
   #    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 {