diff options
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/cust_credit.cgi | 5 | ||||
| -rw-r--r-- | httemplate/edit/elements/ApplicationCommon.html | 124 | ||||
| -rw-r--r-- | httemplate/edit/process/elements/ApplicationCommon.html | 12 | ||||
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 24 | ||||
| -rwxr-xr-x | httemplate/search/report_newtax.cgi | 24 | ||||
| -rwxr-xr-x | httemplate/search/report_tax.cgi | 50 | ||||
| -rw-r--r-- | httemplate/view/cust_main/payment_history/credit.html | 16 | ||||
| -rw-r--r-- | httemplate/view/cust_main/payment_history/payment.html | 16 |
8 files changed, 254 insertions, 17 deletions
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi index 5785a05c0..1caec3d40 100755 --- a/httemplate/edit/cust_credit.cgi +++ b/httemplate/edit/cust_credit.cgi @@ -40,6 +40,11 @@ Credit <TD><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD> </TR> + <TR> + <TD ALIGN="right">Tax</TD> + <TD><SELECT NAME="tax"><OPTION VALUE="included" SELECTED>is included<OPTION VALUE="calculate">is to be calculated</SELECT></TD> + </TR> + % if ( $conf->exists('pkg-balances') ) { <% include('/elements/tr-select-cust_pkg-balances.html', 'custnum' => $custnum, diff --git a/httemplate/edit/elements/ApplicationCommon.html b/httemplate/edit/elements/ApplicationCommon.html index a485d37de..b46a3c8fe 100644 --- a/httemplate/edit/elements/ApplicationCommon.html +++ b/httemplate/edit/elements/ApplicationCommon.html @@ -90,16 +90,71 @@ function changed(what) { if ( dst == <% $dst->$dst_pkey %> ) { what.form.amount.value = "<% min($dst->$dst_unapplied, $unapplied) %>"; +% if ($use_sub_dst_thing) { + what.form.display_amount.value = "<% min($dst->$dst_unapplied, $unapplied) %>"; + + var rownum=0 + var table = document.getElementById('ApplicationTable'); + while(table.rows[2]) { + table.deleteRow(2); + } +% my $app_class = "FS::$link_table"; +% my $temp_app = $app_class->new( +% { $src_pkey => $src_pkeyvalue, +% $dst_pkey => $dst->$dst_pkey, +% 'amount' => min($dst->$dst_unapplied, $unapplied), +% } +% ); +% my %apphash = (); +% my $listref_or_error = $temp_app->calculate_applications; +% %apphash = map { &{$key_generator}($_), $_ } @$listref_or_error +% if ref($listref_or_error); +% foreach my $cbp ( $dst->open_cust_bill_pkg ) { +% my $desc = $cbp->desc; +% my $total_owed = $cbp->owed_setup + $cbp->owed_recur; +% my $key = &{$key_generator}([ $cbp, 0, {} ]); +% my $amount = exists($apphash{ $key }) ? $apphash{ $key }->[1] : 0; +% unless ( $cbp->pkgnum ) { +% foreach my $taxX ( $cbp->cust_bill_pkg_tax_Xlocation ) { +% my $pkey = $taxX->primary_key; +% my $owed = $taxX->owed; +% my $key = &{$key_generator}([ $cbp, 0, { $pkey => $taxX->$pkey } ]); +% my $toapp = exists($apphash{ $key }) ? $apphash{ $key }->[1] : 0; + <% &{$row_generator}( $cbp, $taxX->desc, $owed, $toapp, $taxX->$pkey ) %> +% $total_owed -= $owed; +% $amount -= $toapp; +% } +% $desc .= ' (default)'; +% } +% if ( $total_owed > 0 ) { + <% &{$row_generator}($cbp, $desc, $total_owed, $amount, '') %> +% } +% } +% } } % } } + +function sub_changed(what) { + + var amount = 0; + var table = document.getElementById('ApplicationTable'); + var i = table.rows.length; + while(i-- > 2) { + var amount_input = table.rows[i].getElementsByTagName('input').item(0); + amount += parseFloat( amount_input.value ) || 0; + } + what.form.amount.value = parseFloat(amount).toFixed(2); + what.form.display_amount.value = parseFloat(amount).toFixed(2); + +} </SCRIPT> Apply to: -<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0> +<TABLE ID="ApplicationTable" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0> <TR> <TD ALIGN="right"><% $dst_thing %>: </TD> @@ -116,7 +171,10 @@ Apply to: <TR> <TD ALIGN="right">Amount: </TD> - <TD><% $money_char %><INPUT TYPE="text" NAME="amount" VALUE="<% $amount %>" SIZE=8 MAXLENGTH=8></TD> + <TD><% $money_char %><INPUT TYPE="text" NAME="<% $use_sub_dst_thing ? 'display_' : '' %>amount" VALUE="<% $amount %>" SIZE=8 MAXLENGTH=8 <% $use_sub_dst_thing ? 'DISABLED' : '' %> STYLE="text-align:right;"></TD> +% if ($use_sub_dst_thing) { + <INPUT TYPE="hidden" NAME="amount" VALUE="<% $amount %>" > +% } </TR> </TABLE> @@ -144,6 +202,13 @@ my $dst_table = $opt{'dst_table'}; my $dst_pkey = dbdef->table($dst_table)->primary_key; my $dst_unapplied = $dst_table eq 'cust_bill' ? 'owed' : 'unapplied'; +$opt{form_action} =~ /^process\/(.*)\./ or die "bad form action"; +my $link_table = $1; + +my $use_sub_dst_thing = 0; +$use_sub_dst_thing = 1 + if ( $dst_table eq 'cust_bill' && $conf->exists("${link_table}_pkg-manual") ); + my $to = $dst_table eq 'cust_refund' ? ' to Refund' : ''; my($src_pkeyvalue, $amount, $dst_pkeyvalue); @@ -174,4 +239,59 @@ my @dst = sort { $a->_date <=> $b->_date grep { $_->$dst_unapplied != 0 } qsearch($dst_table, { 'custnum' => $src->custnum } ); +my $row_generator = sub { + my ($cust_bill_pkg, $desc, $owed, $amount, $taxXnum) = @_; + my $id = $cust_bill_pkg->pkgnum || 'Tax'; + my $billpkgnum = $cust_bill_pkg->billpkgnum; + + $amount = sprintf("%.2f", $amount); + qq! + var tablebody = document.getElementsByTagName('tbody').item(0); + var row = table.insertRow(rownum+2); + var pkg_cell = document.createElement('TD'); + pkg_cell.style.textAlign = 'right'; + pkg_cell.innerHTML = "$id - $desc - $owed:"; + var amount_cell = document.createElement('TD'); + amount_cell.innerHTML = "$money_char"; + var amount_input = document.createElement('INPUT'); + amount_input.setAttribute('name', 'subamount'+rownum); + amount_input.setAttribute('id', 'subamount'+rownum); + amount_input.style.textAlign = 'right'; + amount_input.setAttribute('size', 8); + amount_input.setAttribute('maxlength', 8); + amount_input.setAttribute('rownum', rownum); + amount_input.setAttribute('value', "$amount"); + amount_input.setAttribute('onChange', "sub_changed(this);"); + amount_cell.appendChild(amount_input); + var subnum_input = document.createElement('INPUT'); + subnum_input.setAttribute('name', 'subnum'+rownum); + subnum_input.setAttribute('id', 'subnum'+rownum); + subnum_input.setAttribute('type', 'hidden'); + subnum_input.setAttribute('rownum', rownum); + subnum_input.setAttribute('value', "$billpkgnum"); + amount_cell.appendChild(subnum_input); + var taxnum_input = document.createElement('INPUT'); + taxnum_input.setAttribute('name', 'taxXlocationnum'+rownum); + taxnum_input.setAttribute('id', 'taxXlocationnum'+rownum); + taxnum_input.setAttribute('type', 'hidden'); + taxnum_input.setAttribute('rownum', rownum); + taxnum_input.setAttribute('value', "$taxXnum"); + amount_cell.appendChild(taxnum_input); + row.appendChild(pkg_cell); + row.appendChild(amount_cell); + rownum++; + !; +}; + +my $key_generator = sub { + my $listref = shift; + my ($cust_bill_pkg, $amount, $hashref) = @$listref; + my $setup_or_recur = $cust_bill_pkg->setup > 0 ? 'setup' : 'recur'; + my $taxlinenum = $hashref->{billpkgtaxlocationnum} || + $hashref->{billpkgtaxratelocationnum} || + ''; + + join(':', $cust_bill_pkg->billpkgnum, $setup_or_recur, $taxlinenum); +}; + </%init> diff --git a/httemplate/edit/process/elements/ApplicationCommon.html b/httemplate/edit/process/elements/ApplicationCommon.html index e0c5bd707..3cb7ae6bf 100644 --- a/httemplate/edit/process/elements/ApplicationCommon.html +++ b/httemplate/edit/process/elements/ApplicationCommon.html @@ -51,6 +51,14 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $src->custnum } ) my $custnum = $cust_main->custnum; +my @subnames = grep { /.+/ } map { /^subnum(\d+)$/ ? $1 : '' } $cgi->param; +my @subitems = map { [ $cgi->param("subnum$_"), $cgi->param("subamount$_"), $cgi->param("taxXlocationnum$_") ] } + @subnames; +{ local $^W = 0; @subitems = grep { $_->[1] + 0 } @subitems; } + +my %options = (); +$options{subitems} = \@subitems if scalar(@subitems); + my $new; # $new = new FS::cust_refund ( { # 'reason' => 'Refunding payment', #enter reason in UI @@ -72,6 +80,8 @@ my $new; #} -my $error = $new->insert( 'manual' => 1 ); + +$options{manual} = 1; +my $error = $new->insert( %options ); </%init> diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 52f59de1e..975a30713 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -404,8 +404,6 @@ if ( $cgi->param('pkg_tax') ) { } -my $where = ' WHERE '. join(' AND ', @where); - my $join_cust = ' JOIN cust_bill USING ( invnum ) LEFT JOIN cust_main USING ( custnum ) '; @@ -427,14 +425,28 @@ if ( $cgi->param('nottax') ) { $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum ) LEFT JOIN cust_location USING ( locationnum ) '; - #quelle kludge, false laziness w/report_tax.cgi - $where =~ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g; - } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) { + #quelle kludge, somewhat false laziness w/report_tax.cgi + s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where; + } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) || + $cgi->param('iscredit') eq 'rate') { $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ) '. ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) '; } + if ( $cgi->param('iscredit') ) { + $join_pkg .= ' JOIN cust_credit_bill_pkg USING ( billpkgnum'; + if ( $conf->exists('tax-pkg_address') ) { + $join_pkg .= ', billpkgtaxlocationnum )'; + push @where, "billpkgtaxratelocationnum IS NULL"; + } elsif ( $cgi->param('iscredit') eq 'rate' ) { + $join_pkg .= ', billpkgtaxratelocationnum )'; + } else { + $join_pkg .= ' )'; + push @where, "billpkgtaxratelocationnum IS NULL"; + } + } + } else { #die? @@ -445,6 +457,8 @@ if ( $cgi->param('nottax') ) { } +my $where = ' WHERE '. join(' AND ', @where); + if ($use_usage) { $count_query .= " FROM (SELECT cust_bill_pkg.setup, cust_bill_pkg.recur, diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi index 0fb548352..6a2cbb0d1 100755 --- a/httemplate/search/report_newtax.cgi +++ b/httemplate/search/report_newtax.cgi @@ -17,6 +17,9 @@ <TH CLASS="grid" BGCOLOR="#cccccc"></TH> <TH CLASS="grid" BGCOLOR="#cccccc"></TH> <TH CLASS="grid" BGCOLOR="#cccccc">Tax collected</TH> + <TH CLASS="grid" BGCOLOR="#cccccc"> </TH> + <TH CLASS="grid" BGCOLOR="#cccccc"></TH> + <TH CLASS="grid" BGCOLOR="#cccccc">Tax credited</TH> </TR> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; @@ -43,6 +46,12 @@ <A HREF="<% $baselink. $link %>;istax=1"><% $money_char %><% sprintf('%.2f', $tax->{'tax'} ) %></A> </TD> <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"></TD> + <% $tax->{base} ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %> + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="right"> + <A HREF="<% $baselink. $link %>;istax=1;iscredit=rate"><% $money_char %><% sprintf('%.2f', $tax->{'credit'} ) %></A> + </TD> + <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %> </TR> % } @@ -90,6 +99,7 @@ my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.count my $select = 'DISTINCT itemdesc,locationtaxid,tax_rate_location.state,tax_rate_location.county,tax_rate_location.city'; my $tax = 0; +my $credit = 0; my %taxes = (); my %basetaxes = (); foreach my $t (qsearch({ table => 'cust_bill_pkg', @@ -120,6 +130,18 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg', $tax += $x; $taxes{$label}->{'tax'} += $x; + my $creditfrom = " JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum) "; + my $creditwhere = "FROM cust_bill_pkg $addl_from $creditfrom $where ". + "AND payby != 'COMP' ". + "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam ); + + $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ". + " $creditwhere AND cust_bill_pkg.pkgnum = 0"; + + my $y = scalar_sql($t, [ map { $_, $_ } @params ], $sql ); + $credit += $y; + $taxes{$label}->{'credit'} += $y; + unless ( exists( $taxes{$baselabel} ) ) { $basetaxes{$baselabel}->{'label'} = $baselabel; @@ -129,6 +151,7 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg', } $basetaxes{$baselabel}->{'tax'} += $x; + $basetaxes{$baselabel}->{'credit'} += $y; } @@ -160,6 +183,7 @@ push @taxes, { 'label' => 'Total', 'url_param' => '', 'tax' => $tax, + 'credit' => $credit, 'base' => 1, }; diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index e89c66536..557c29cfa 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -22,6 +22,7 @@ <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax owed</TH> % unless ( $cgi->param('show_taxclasses') ) { <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax invoiced</TH> + <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax credited</TH> % } </TR> @@ -118,6 +119,10 @@ <A HREF="<% $baselink. $invlink %>;istax=1" ><% &$money_sprintf( $region->{'tax'} ) %></A> </TD> + <<%$tdh%> ALIGN="right"> + <A HREF="<% $baselink. $invlink %>;istax=1;iscredit=1" + ><% &$money_sprintf( $region->{'credit'} ) %></A> + </TD> % } </TR> @@ -132,6 +137,7 @@ <TR> <TH CLASS="grid" BGCOLOR="#cccccc"></TH> <TH CLASS="grid" BGCOLOR="#cccccc">Tax invoiced</TH> + <TH CLASS="grid" BGCOLOR="#cccccc">Tax credited</TH> </TR> % #some false laziness w/above @@ -463,9 +469,18 @@ if ( $conf->exists('tax-pkg_address') ) { $taxwhere =~ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g; } +my $creditfromwhere = $taxfromwhere. + " JOIN cust_credit_bill_pkg USING (billpkgnum"; +$creditfromwhere .= " ,billpkgtaxlocationnum" + if $conf->exists('tax-pkg_address'); +$creditfromwhere .= ")"; + $taxfromwhere .= " $taxwhere "; #AND payby != 'COMP' "; +$creditfromwhere .= " $taxwhere AND billpkgtaxratelocationnum IS NULL"; #AND payby != 'COMP' "; + my @taxparam = @base_param; + #should i be a cust_main_county method or something #need to pass in $taxfromwhere & @taxparam??? my $_taxamount_sub = sub { @@ -483,6 +498,21 @@ my $_taxamount_sub = sub { scalar_sql($r, \@taxparam, $sql ); }; +my $_creditamount_sub = sub { + my $r = shift; + + #match itemdesc if necessary! + my $named_tax = + $r->taxname + ? 'AND itemdesc = '. dbh->quote($r->taxname) + : "AND ( itemdesc IS NULL OR itemdesc = '' OR itemdesc = 'Tax' )"; + + my $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ". + " $creditfromwhere AND cust_bill_pkg.pkgnum = 0 $named_tax"; + + scalar_sql($r, \@taxparam, $sql ); +}; + #tax-report_groups filtering my($group_op, $group_value) = ( '', '' ); if ( $cgi->param('report_group') =~ /^(=|!=) (.*)$/ ) { @@ -503,6 +533,7 @@ my $group_test = sub { }; my $tot_tax = 0; +my $tot_credit = 0; #foreach my $label ( keys %regions ) { foreach my $r ( qsearch(\%qsearch) ) { @@ -521,6 +552,13 @@ foreach my $r ( qsearch(\%qsearch) ) { $regions{$label}->{'tax'} += $x; $tot_tax += $x unless $cgi->param('show_taxclasses'); + ## calculate credit for this region + + $x = &{$_creditamount_sub}($r); + + $regions{$label}->{'credit'} += $x; + $tot_credit += $x unless $cgi->param('show_taxclasses'); + } my %base_regions = (); @@ -541,6 +579,14 @@ if ( $cgi->param('show_taxclasses') ) { $base_regions{$base_label}->{'tax'} += $x; $tot_tax += $x; + + ## calculate credit for this region + + $x = &{$_creditamount_sub}($r); + + $base_regions{$base_label}->{'credit'} += $x; + $tot_credit += $x; + } } @@ -553,7 +599,7 @@ my @regions = keys %regions; #calculate totals my( $total, $tot_taxable, $tot_owed ) = ( 0, 0, 0 ); -my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0, 0 ); +my( $exempt_cust, $exempt_pkg, $exempt_monthly, $tot_credit ) = ( 0, 0, 0, 0 ); my %taxclasses = (); my %county = (); my %state = (); @@ -565,6 +611,7 @@ foreach (@regions) { $exempt_cust += $regions{$_}->{'exempt_cust'}; $exempt_pkg += $regions{$_}->{'exempt_pkg'}; $exempt_monthly += $regions{$_}->{'exempt_monthly'}; + $tot_credit += $regions{$_}->{'credit'}; $taxclasses{$regions{$_}->{'taxclass'}} = 1 if $regions{$_}->{'taxclass'}; $county{$regions{$_}->{'county'}} = 1; @@ -620,6 +667,7 @@ push @regions, { 'rate' => '', 'owed' => $tot_owed, 'tax' => $tot_tax, + 'credit' => $tot_credit, }; #-- diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html index 058c6f536..88bbe9bd9 100644 --- a/httemplate/view/cust_main/payment_history/credit.html +++ b/httemplate/view/cust_main/payment_history/credit.html @@ -4,6 +4,7 @@ by <% $cust_credit->otaker %><% "$reason$desc$apply$delete$unapply" %> my( $cust_credit, %opt ) = @_; +my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; my @cust_credit_bill = $cust_credit->cust_credit_bill; @@ -15,6 +16,13 @@ if ( $opt{'pkg-balances'} && $cust_credit->pkgnum ) { $desc .= ' for '. $cust_pkg->pkg_label_long; } +my %cust_credit_bill_width = ('width' => 392); +my %cust_credit_bill_height = (); +if ($conf->exists('cust_credit_bill_pkg-manual')) { + %cust_credit_bill_width = ('width' => 592); + %cust_credit_bill_height = ('height' => 436); +} + my( $pre, $post, $apply, $ext ) = ( '', '', '', '' ); if ( scalar(@cust_credit_bill) == 0 && scalar(@cust_credit_refund) == 0 ) { @@ -29,8 +37,8 @@ if ( scalar(@cust_credit_bill) == 0 'action' => "${p}edit/cust_credit_bill.cgi?". $cust_credit->crednum, 'actionlabel' => 'Apply credit', - 'width' => 392, - #default# 'height' => 336, + %cust_credit_bill_width, + %cust_credit_bill_height, ). ')'; } @@ -88,8 +96,8 @@ if ( scalar(@cust_credit_bill) == 0 'action' => "${p}edit/cust_credit_bill.cgi?". $cust_credit->crednum, 'actionlabel' => 'Apply credit', - 'width' => 392, - #default# 'height' => 336, + %cust_credit_bill_width, + %cust_credit_bill_height, ). ')'; } diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html index a4a349bb8..bcfa808db 100644 --- a/httemplate/view/cust_main/payment_history/payment.html +++ b/httemplate/view/cust_main/payment_history/payment.html @@ -4,6 +4,7 @@ my( $cust_pay, %opt ) = @_; +my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; my $payby = $cust_pay->payby; @@ -38,6 +39,13 @@ if ( $opt{'pkg-balances'} && $cust_pay->pkgnum ) { $desc .= ' for '. $cust_pkg->pkg_label_long; } +my %cust_bill_pay_width = ('width' => 392); +my %cust_bill_pay_height = (); +if ($conf->exists('cust_bill_pay_pkg-manual')) { + %cust_bill_pay_width = ('width' => 592); + %cust_bill_pay_height = ('height' => 436); +} + my( $pre, $post, $apply, $ext ) = ( '', '', '', '' ); if ( scalar(@cust_bill_pay) == 0 && scalar(@cust_pay_refund) == 0 ) { @@ -52,8 +60,8 @@ if ( scalar(@cust_bill_pay) == 0 'action' => "${p}edit/cust_bill_pay.cgi?". $cust_pay->paynum, 'actionlabel' => 'Apply payment', - 'width' => 392, - #default# 'height' => 336, + %cust_bill_pay_width, + %cust_bill_pay_height, ). ')'; } @@ -112,8 +120,8 @@ if ( scalar(@cust_bill_pay) == 0 'action' => "${p}edit/cust_bill_pay.cgi?". $cust_pay->paynum, 'actionlabel' => 'Apply payment', - 'width' => 392, - #default# 'height' => 336, + %cust_bill_pay_width, + %cust_bill_pay_height, ). ')'; } |