From 1f8e84ae7baed672430fd6ba261f7e58e0424a99 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 30 Nov 2007 21:07:37 +0000 Subject: [PATCH] add net vs gross amounts to invoice report; make the "net sales" links on sales/credit/receipts report & graph clickable --- FS/FS/cust_bill.pm | 67 +++++++++++++++---------- httemplate/graph/money_time.cgi | 1 + httemplate/search/cust_bill.html | 102 +++++++++++++++++++-------------------- 3 files changed, 92 insertions(+), 78 deletions(-) diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 9ad9ffcbb..af95d35a0 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -2672,8 +2672,6 @@ sub _items_payments { =back - - =head1 SUBROUTINES =over 4 @@ -2722,7 +2720,6 @@ sub process_re_X { sub re_X { my($method, $job, %param ) = @_; -# [ 'begin', 'end', 'agentnum', 'open', 'days', 'newest_percust' ], if ( $DEBUG ) { warn "re_X $method for job $job with param:\n". join( '', map { " $_ => ". $param{$_}. "\n" } keys %param ); @@ -2750,15 +2747,12 @@ sub re_X { push @where, "cust_main.agentnum = $1"; } - my $owed = - "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay - WHERE cust_bill_pay.invnum = cust_bill.invnum ) - - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill - WHERE cust_credit_bill.invnum = cust_bill.invnum )"; - - push @where, "0 != $owed" + push @where, '0 != '. FS::cust_bill->owed_sql if $param{'open'}; + push @where, '0 != '. FS::cust_bill->net_sql + if $param{'net'}; + push @where, "cust_bill._date < ". (time-86400*$param{'days'}) if $param{'days'}; @@ -2821,35 +2815,56 @@ sub re_X { =item owed_sql -Returns an SQL fragment to retreived the amount owed. +Returns an SQL fragment to retreive the amount owed (charged minus credited and paid). =cut sub owed_sql { + my $class = shift; + 'charged - '. $class->paid_sql. ' - '. $class->credited_sql; +} + +=item net_sql + +Returns an SQL fragment to retreive the net amount (charged minus credited). + +=cut + +sub net_sql { + my $class = shift; + 'charged - '. $class->credited_sql; +} + +=item paid_sql + +Returns an SQL fragment to retreive the amount paid against this invoice. + +=cut + +sub paid_sql { #my $class = shift; + "( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay + WHERE cust_bill.invnum = cust_bill_pay.invnum )"; +} + +=item credited_sql - "charged - - COALESCE( - ( SELECT SUM(amount) FROM cust_bill_pay - WHERE cust_bill.invnum = cust_bill_pay.invnum ) - ,0 - ) - - COALESCE( - ( SELECT SUM(amount) FROM cust_credit_bill - WHERE cust_bill.invnum = cust_credit_bill.invnum ) - ,0 - ) - "; +Returns an SQL fragment to retreive the amount credited against this invoice. +=cut + +sub credited_sql { + #my $class = shift; + "( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill + WHERE cust_bill.invnum = cust_credit_bill.invnum )"; } +=back + =head1 BUGS The delete method. -print_text formatting (and some logic :/) is in source, but needs to be -slurped in from a file. Also number of lines ($=). - =head1 SEE ALSO L, L, L, L, diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi index 41b82fa84..c30ff207a 100644 --- a/httemplate/graph/money_time.cgi +++ b/httemplate/graph/money_time.cgi @@ -65,6 +65,7 @@ $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;", ); diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html index e3ea8de27..9589efd02 100755 --- a/httemplate/search/cust_bill.html +++ b/httemplate/search/cust_bill.html @@ -9,13 +9,15 @@ 'redirect' => $link, 'header' => [ 'Invoice #', 'Balance', - 'Amount', + 'Net Amount', + 'Gross Amount', 'Date', FS::UI::Web::cust_header(), ], 'fields' => [ 'invnum', sub { sprintf($money_char.'%.2f', shift->get('owed') ) }, + sub { sprintf($money_char.'%.2f', shift->get('net') ) }, sub { sprintf($money_char.'%.2f', shift->charged ) }, sub { time2str('%b %d %Y', shift->_date ) }, \&FS::UI::Web::cust_fields, @@ -26,6 +28,7 @@ $link, $link, $link, + $link, ( map { $_ ne 'Cust. Status' ? $clink : '' } FS::UI::Web::cust_header() ), @@ -35,6 +38,7 @@ '', '', '', + '', FS::UI::Web::cust_colors(), ], 'style' => [ @@ -42,6 +46,7 @@ '', '', '', + '', FS::UI::Web::cust_styles(), ], @@ -60,12 +65,10 @@ my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql; my( $count_query, $sql_query ); my $count_addl = ''; #my $distinct = ''; -my($begin, $end) = ( '', '' ); -my $agentnum = ''; -my($open, $days) = ( '', '' ); -my($invnum_min, $invnum_max) = ( '', '' ); -my $newest_percust = ''; +my %search; + if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { + $count_query = "SELECT COUNT(*) FROM cust_bill $join_cust_main". " WHERE invnum = $2 AND $agentnums_sql"; #agent virtualization @@ -76,12 +79,8 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { #'select' => '*', 'extra_sql' => " AND $agentnums_sql", #agent virtualization }; + } else { -#if ( $cgi->param('begin') || $cgi->param('end') -# || $cgi->param('beginning') || $cgi->param('ending') -# || $cgi->keywords -# ) -#{ #some false laziness w/cust_bill::re_X my @where; @@ -89,60 +88,60 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { if ( $cgi->param('beginning') && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) { - $begin = str2time($1); - push @where, "cust_bill._date >= $begin"; + $search{'begin'} = str2time($1); + push @where, 'cust_bill._date >= '. $search{'begin'}; } if ( $cgi->param('ending') && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) { - $end = str2time($1) + 86399; - push @where, "cust_bill._date < $end"; + $search{'end'} = str2time($1) + 86399; + push @where, 'cust_bill._date < '. $search{'end'}; } if ( $cgi->param('begin') =~ /^(\d+)$/ ) { - $begin = $1; - push @where, "cust_bill._date >= $begin"; + $search{'begin'} = $1; + push @where, 'cust_bill._date >= '. $search{'begin'}; } if ( $cgi->param('end') =~ /^(\d+)$/ ) { - $end = $1; - push @where, "cust_bill._date < $end"; + $search{'end'} = $1; + push @where, 'cust_bill._date < '. $search{'end'}; } if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) { - $invnum_min = $1; - push @where, "cust_bill.invnum >= $1"; + $search{'invnum_min'} = $1; + push @where, 'cust_bill.invnum >= '. $search{'invnum_min'}; } if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) { - $invnum_max = $1; - push @where, "cust_bill.invnum <= $1"; + $search{'invnum_max'} = $1; + push @where, 'cust_bill.invnum <= '. $search{'invnum_max'}; } if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { - $agentnum = $1; - push @where, "cust_main.agentnum = $agentnum"; + $search{'agentnum'} = $1; + push @where, 'cust_main.agentnum = '. $search{'agentnum'}; } - my $owed = - "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay - WHERE cust_bill_pay.invnum = cust_bill.invnum ) - - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill - WHERE cust_credit_bill.invnum = cust_bill.invnum )"; - if ( $cgi->param('open') ) { - push @where, "0 != $owed"; - $open = 1; + push @where, '0 != '. FS::cust_bill->owed_sql; + $search{'open'} = 1; + } + + if ( $cgi->param('net') ) { + push @where, '0 != '. FS::cust_bill->net_sql; + $search{'net'} = 1; } my($query) = $cgi->keywords; if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) { - ($open, $days, my $field) = ($1, $2, $3); + ($search{'open'}, $search{'days'}, my $field) = ($1, $2, $3); $field = "_date" if $field eq 'date'; $orderby = "ORDER BY cust_bill.$field"; - push @where, "0 != $owed" if $open; - push @where, "cust_bill._date < ". (time-86400*$days) if $days; + push @where, '0 != '. FS::cust_bill->owed_sql if $search{'open'}; + push @where, "cust_bill._date < ". (time-86400*$search{'days'}) + if $search{'days'}; } if ( $cgi->param('newest_percust') ) { - $newest_percust = 1; + $search{'newest_percust'} = 1; #$distinct = 'DISTINCT ON ( cust_bill.custnum )'; #$orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC'; @@ -173,9 +172,16 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : ''; unless ( $count_query ) { - $count_query = "SELECT COUNT(*), sum(charged), sum($owed)"; - $count_addl = [ '$%.2f total invoiced', - '$%.2f total outstanding balance', + $count_query = 'SELECT COUNT(*), '. join(', ', + map "SUM($_)", + ( 'charged', + FS::cust_bill->net_sql, + FS::cust_bill->owed_sql, + ) + ); + $count_addl = [ '$%.2f invoiced (gross)', + '$%.2f invoiced (net)', + '$%.2f outstanding balance', ]; } $count_query .= " FROM cust_bill $join_cust_main $extra_sql"; @@ -190,7 +196,8 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { #( map "cust_main.$_", qw(custnum last first company) ), 'cust_main.custnum as cust_main_custnum', FS::UI::Web::cust_sql_fields(), - "$owed as owed", + FS::cust_bill->owed_sql. ' AS owed', + FS::cust_bill->net_sql. ' AS net', ), 'extra_sql' => "$extra_sql $orderby" }; @@ -212,22 +219,13 @@ my $html_init = join("\n", map { ( my $action = $_ ) =~ s/_$//; include('/elements/progress-init.html', $_.'form', - [ 'begin', 'end', 'agentnum', 'open', 'days', - 'invnum_min', 'invnum_max', 'newest_percust', - ], + [ keys %search ], "../misc/${_}invoices.cgi", { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but... $_, #key ), qq!
!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, - qq!!, + ( map qq!!, keys %search ), qq!
! } qw( print_ email_ fax_ ) ). -- 2.11.0