diff options
author | ivan <ivan> | 2008-03-14 07:49:13 +0000 |
---|---|---|
committer | ivan <ivan> | 2008-03-14 07:49:13 +0000 |
commit | 9d55204f876f52e314076f5fa9d1ae15a1639dae (patch) | |
tree | 6178fd93814c080679e26f4cbc66d1387f880f60 /httemplate/graph | |
parent | 65bfed89f6eff03f32ba6199e3a2e2debcd1a009 (diff) |
add net credits to sales/credits/receipts report
Diffstat (limited to 'httemplate/graph')
-rw-r--r-- | httemplate/graph/money_time.cgi | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi index c30ff207a..b996380b6 100644 --- a/httemplate/graph/money_time.cgi +++ b/httemplate/graph/money_time.cgi @@ -25,25 +25,27 @@ if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { my $agentname = $agent ? $agent->agent.' ' : ''; -my @items = qw( invoiced netsales credits payments receipts ); +my @items = qw( invoiced netsales credits netcredits payments receipts ); if ( $cgi->param('12mo') == 1 ) { @items = map $_.'_12mo', @items; } my %label = ( - 'invoiced' => 'Gross Sales', - 'netsales' => 'Net Sales', - 'credits' => 'Credits', - 'payments' => 'Gross Receipts', - 'receipts' => 'Net Receipts', + 'invoiced' => 'Gross Sales', + 'netsales' => 'Net Sales', + 'credits' => 'Gross Credits', + 'netcredits' => 'Net Credits', + 'payments' => 'Gross Receipts', + 'receipts' => 'Net Receipts', ); my %graph_suffix = ( - 'invoiced' => ' (invoiced)', - 'netsales' => ' (invoiced - applied credits)', - 'credits' => '', - 'payments' => ' (payments)', - 'receipts' => '/Cashflow (payments - refunds)', + 'invoiced' => ' (invoiced)', + 'netsales' => ' (invoiced - applied credits)', + 'credits' => ' (credited)', + 'netcredits' => ' (applied credits)', + 'payments' => ' (payments)', + 'receipts' => '/Cashflow (payments - refunds)', ); my %graph_label = map { $_ => $label{$_}.$graph_suffix{$_} } keys %label; @@ -54,20 +56,22 @@ $graph_label{$_.'_12mo'} = $graph_label{$_}. " (previous 12 months)" foreach keys %graph_label; my %color = ( - 'invoiced' => '9999ff', #light blue - 'netsales' => '0000cc', #blue - 'credits' => 'cc0000', #red - 'payments' => '99cc99', #light green - 'receipts' => '00cc00', #green + 'invoiced' => '9999ff', #light blue + 'netsales' => '0000cc', #blue + 'credits' => 'ff9999', #light red + 'netcredits' => 'cc0000', #red + 'payments' => '99cc99', #light green + 'receipts' => '00cc00', #green ); $color{$_.'_12mo'} = $color{$_} foreach keys %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;", + '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;", + 'netcredits' => "${p}search/cust_credit_bill.html?agentnum=$agentnum;", + 'payments' => "${p}search/cust_pay.cgi?magic=_date;agentnum=$agentnum;", ); # XXX link 12mo? |