add net vs gross amounts to invoice report; make the "net sales" links on sales/credi...

[freeside.git] / httemplate / graph / money_time.cgi

diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index f085c22..c30ff20 100644 (file)
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -1,12 +1,19 @@
-<%
-
-#find first month
-my $syear = $cgi->param('start_year'); # || 1899+$curyear;
-my $smonth = $cgi->param('start_month'); # || $curmon+1;
+<% include('elements/monthly.html',
+                'title'        => $agentname.
+                                  'Sales, Credits and Receipts Summary',
+                'items'        => \@items,
+                'labels'       => \%label,
+                'graph_labels' => \%graph_label,
+                'colors'       => \%color,
+                'links'        => \%link,
+                'agentnum'     => $agentnum,
+                'nototal'      => scalar($cgi->param('12mo')),
+             )
+%>
+<%init>
 
-#find last month
-my $eyear = $cgi->param('end_year'); # || 1900+$curyear;
-my $emonth = $cgi->param('end_month'); # || $curmon+1;
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
 #XXX or virtual
 my( $agentnum, $agent ) = ('', '');
@@ -15,6 +22,7 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
   $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
   die "agentnum $agentnum not found!" unless $agent;
 }
+
 my $agentname = $agent ? $agent->agent.' ' : '';
 
 my @items = qw( invoiced netsales credits payments receipts );
@@ -57,24 +65,10 @@ $color{$_.'_12mo'} = $color{$_}
 
 my %link = (
   'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
+  'netsales' => "${p}search/cust_bill.html?agentnum=$agentnum;net=1;",
   'credits'  => "${p}search/cust_credit.html?agentnum=$agentnum;",
   'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
 );
 # XXX link 12mo?
 
-%><%= include('elements/monthly.html',
-                'title'        => $agentname.
-                                  'Sales, Credits and Receipts Summary',
-                'items'        => \@items,
-                'labels'       => \%label,
-                'graph_labels' => \%graph_label,
-                'colors'       => \%color,
-                'links'        => \%link,
-                'start_month'  => $smonth,
-                'start_year'   => $syear,
-                'end_month'    => $emonth,
-                'end_year'     => $eyear,
-                'agentnum'     => $agentnum,
-                'nototal'      => scalar($cgi->param('12mo')),
-             )
-%>
+</%init>