projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make new gross sales calculation optional, #25943
[freeside.git]
/
httemplate
/
search
/
cust_bill.html
diff --git
a/httemplate/search/cust_bill.html
b/httemplate/search/cust_bill.html
index
6626736
..
017e829
100755
(executable)
--- a/
httemplate/search/cust_bill.html
+++ b/
httemplate/search/cust_bill.html
@@
-8,7
+8,7
@@
'count_addl' => $count_addl,
'redirect' => $link,
'header' => [ emt('Invoice #'),
'count_addl' => $count_addl,
'redirect' => $link,
'header' => [ emt('Invoice #'),
- emt('Gross Amount'),
+ emt(
$invoiced ? 'Charged' :
'Gross Amount'),
emt('Discount'),
emt('Credits'),
emt('Net Amount'),
emt('Discount'),
emt('Credits'),
emt('Net Amount'),
@@
-18,7
+18,7
@@
],
'fields' => [
'display_invnum',
],
'fields' => [
'display_invnum',
- 'gross',
+
$invoiced ? 'charged' :
'gross',
'discounted',
'credited',
'net',
'discounted',
'credited',
'net',
@@
-28,7
+28,7
@@
],
'sort_fields' => [
'COALESCE( agent_invid, invnum )',
],
'sort_fields' => [
'COALESCE( agent_invid, invnum )',
- 'gross',
+
$invoiced ? 'charged' :
'gross',
'discounted',
'credited',
'net',
'discounted',
'credited',
'net',
@@
-87,6
+87,9
@@
my( $count_query, $sql_query );
my $count_addl = '';
my %search = ();
my $count_addl = '';
my %search = ();
+# show invoiced amount (charged) instead of gross sales
+my $invoiced = $cgi->param('invoiced') ? 1 : 0;
+
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
my $join_cust_main = FS::UI::Web::join_cust_main('cust_bill');
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
my $join_cust_main = FS::UI::Web::join_cust_main('cust_bill');
@@
-132,7
+135,7
@@
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
#scalars
for (qw( agentnum custnum cust_status refnum invnum_min invnum_max
#scalars
for (qw( agentnum custnum cust_status refnum invnum_min invnum_max
- open net newest_percust
+ open net newest_percust
invoiced
))
{
))
{