[freeside-commits]
freeside/httemplate/graph report_money_time.html, NONE,
1.1 money_time.cgi, 1.12, 1.13 money_time-graph.cgi, 1.8, 1.9
Ivan,,,
ivan at wavetail.420.am
Tue May 2 04:59:33 PDT 2006
Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail:/tmp/cvs-serv1082/httemplate/graph
Modified Files:
money_time.cgi money_time-graph.cgi
Added Files:
report_money_time.html
Log Message:
add a "pre-report" page to this report/graph as requested by lewis/wtxs, also add 12mo total option
Index: money_time.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- money_time.cgi 15 Apr 2006 13:32:27 -0000 1.12
+++ money_time.cgi 2 May 2006 11:59:31 -0000 1.13
@@ -1,16 +1,15 @@
-<!-- mason kludge -->
<%
-#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-my ($curmon,$curyear) = (localtime(time))[4,5];
+# #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+# my ($curmon,$curyear) = (localtime(time))[4,5];
#find first month
-my $syear = $cgi->param('syear') || 1899+$curyear;
-my $smonth = $cgi->param('smonth') || $curmon+1;
+my $syear = $cgi->param('syear'); # || 1899+$curyear;
+my $smonth = $cgi->param('smonth'); # || $curmon+1;
#find last month
-my $eyear = $cgi->param('eyear') || 1900+$curyear;
-my $emonth = $cgi->param('emonth') || $curmon+1;
+my $eyear = $cgi->param('eyear'); # || 1900+$curyear;
+my $emonth = $cgi->param('emonth'); # || $curmon+1;
#XXX or virtual
my( $agentnum, $agent ) = ('', '');
@@ -20,10 +19,8 @@
die "agentnum $agentnum not found!" unless $agent;
}
my $agentname = $agent ? $agent->agent.' ' : '';
-warn $agentname;
%>
-
<%= include('/elements/header.html',
$agentname. 'Sales, Credits and Receipts Summary'
)
@@ -36,6 +33,10 @@
<%
my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+ @items = map $_.'_12mo', @items;
+}
+
my %label = (
'invoiced' => 'Gross Sales',
'netsales' => 'Net Sales',
@@ -43,6 +44,9 @@
'payments' => 'Gross Receipts',
'receipts' => 'Net Receipts',
);
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+ foreach keys %label;
+
my %color = (
'invoiced' => '9999ff', #light blue
'netsales' => '0000cc', #blue
@@ -50,11 +54,15 @@
'payments' => '99cc99', #light green
'receipts' => '00cc00', #green
);
+$color{$_.'_12mo'} = $color{$_}
+ foreach keys %color;
+
my %link = (
'invoiced' => "${p}search/cust_bill.html?agentnum=$agentnum;",
'credits' => "${p}search/cust_credit.html?agentnum=$agentnum;",
'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;",
);
+# XXX link 12mo?
my $report = new FS::Report::Table::Monthly (
'items' => \@items,
@@ -102,43 +110,4 @@
<% } %>
</TABLE>
-<BR>
-<FORM METHOD="POST">
-<!--
-<INPUT TYPE="checkbox" NAME="ar">
- Accounts receivable (invoices - applied credits)<BR>
-<INPUT TYPE="checkbox" NAME="charged">
- Just Invoices<BR>
-<INPUT TYPE="checkbox" NAME="defer">
- Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
-<INPUT TYPE="checkbox" NAME="cash">
- Cashflow (payments - refunds)<BR>
-<BR>
--->
-From <SELECT NAME="smonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="syear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
- to <SELECT NAME="emonth">
-<% foreach my $mon ( 1..12 ) { %>
-<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
-<% } %>
-</SELECT>
-<SELECT NAME="eyear">
-<% foreach my $y ( 1999 .. 2010 ) { %>
-<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
-<% } %>
-</SELECT>
-
-for agent: <%= include('/elements/select-agent.html', $agentnum) %>
-
-<INPUT TYPE="submit" VALUE="Redisplay">
-</FORM>
-</BODY>
-</HTML>
+<%= include('/elements/footer.html') %>
--- NEW FILE: report_money_time.html ---
<%
#my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
my ($curmon,$curyear) = (localtime(time))[4,5];
#find first month
my $syear = 1899+$curyear;
my $smonth = $curmon+1;
#want 12 month by default, not 13
$smonth++;
if ( $smonth > 12 ) { $smonth-=12; $syear++ }
#find last month
my $eyear = 1900+$curyear;
my $emonth = $curmon+1;
my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
%>
<%= include('/elements/header.html', 'Sales, Credits and Receipts Summary' ) %>
<FORM ACTION="money_time.cgi" METHOD="GET">
<!--
<INPUT TYPE="checkbox" NAME="ar">
Accounts receivable (invoices - applied credits)<BR>
<INPUT TYPE="checkbox" NAME="charged">
Just Invoices<BR>
<INPUT TYPE="checkbox" NAME="defer">
Accounts receivable, with deferred revenue (invoices - applied credits, with charges for annual/semi-annual/quarterly/etc. services deferred over applicable time period) (there has got to be a shorter description for this)<BR>
<INPUT TYPE="checkbox" NAME="cash">
Cashflow (payments - refunds)<BR>
<BR>
-->
From: <SELECT NAME="smonth">
<% foreach my $mon ( 1..12 ) { %>
<OPTION VALUE="<%= $mon %>"<%= $mon == $smonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
<% } %>
</SELECT>
<SELECT NAME="syear">
<% foreach my $y ( 1999 .. 2010 ) { %>
<OPTION VALUE="<%= $y %>"<%= $y == $syear ? ' SELECTED' : '' %>><%= $y %>
<% } %>
</SELECT>
<BR>
To: <SELECT NAME="emonth">
<% foreach my $mon ( 1..12 ) { %>
<OPTION VALUE="<%= $mon %>"<%= $mon == $emonth ? ' SELECTED' : '' %>><%= $mon[$mon-1] %>
<% } %>
</SELECT>
<SELECT NAME="eyear">
<% foreach my $y ( 1999 .. 2010 ) { %>
<OPTION VALUE="<%= $y %>"<%= $y == $eyear ? ' SELECTED' : '' %>><%= $y %>
<% } %>
</SELECT>
<BR>
For agent: <%= include('/elements/select-agent.html' ) %>
<BR>
<INPUT TYPE="checkbox" NAME="12mo" VALUE="1"> Show 12 month totals instead of monthly values.
<BR>
<INPUT TYPE="submit" VALUE="Display">
</FORM>
<%= include('/elements/footer.html') %>
Index: money_time-graph.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/money_time-graph.cgi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- money_time-graph.cgi 3 Mar 2006 15:02:33 -0000 1.8
+++ money_time-graph.cgi 2 May 2006 11:59:31 -0000 1.9
@@ -22,6 +22,10 @@
#my %data;
my @items = qw( invoiced netsales credits payments receipts );
+if ( $cgi->param('12mo') == 1 ) {
+ @items = map $_.'_12mo', @items;
+}
+
my %label = (
'invoiced' => 'Gross Sales (invoiced)',
'netsales' => 'Net Sales (invoiced - applied credits)',
@@ -29,6 +33,9 @@
'payments' => 'Gross Receipts (payments)',
'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
);
+$label{$_.'_12mo'} = $label{$_}. " (previous 12 months)"
+ foreach keys %label;
+
my %color = (
'invoiced' => [ 153, 153, 255 ], #light blue
'netsales' => [ 0, 0, 204 ], #blue
@@ -36,6 +43,8 @@
'payments' => [ 153, 204, 153 ], #light green
'receipts' => [ 0, 204, 0 ], #green
);
+$color{$_.'_12mo'} = $color{$_}
+ foreach keys %color;
my $report = new FS::Report::Table::Monthly (
'items' => \@items,
More information about the freeside-commits
mailing list