diff options
| author | ivan <ivan> | 2008-06-01 20:16:03 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-06-01 20:16:03 +0000 |
| commit | d1f2f7f8286ce366efe7c72b731fd3536d751ef1 (patch) | |
| tree | 542a9f30ce391a61982b3a5b3560472c9095af2e /httemplate | |
| parent | 85c7dede23274d2cfeb1259e2ddcf46aa58a899b (diff) | |
backport cust_bill_ApplicationCommon::applied_to_invoice and cust_bill::invnum_date_pretty to 1.7
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/view/cust_main/payment_history.html | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 6cf0c40d5..49c18358b 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -141,8 +141,7 @@ % #completely unapplied % $pre = '<B><FONT COLOR="#FF0000">Unapplied '; % $post = '</FONT></B>'; -% if ( $curuser->access_right('Apply payment') # ) { -% || $curuser->access_right('Post payment') ) { #remove after 1.7.3 +% if ( $curuser->access_right('Apply payment') ) { % $apply = ' ('. include( '/elements/popup_link.html', % 'label' => 'apply', % 'action' => "${p}edit/cust_bill_pay.cgi?". @@ -157,7 +156,7 @@ % && scalar(@cust_pay_refund) == 0 % && $cust_pay->unapplied == 0 ) { % #applied to one invoice, the usual situation -% $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum; +% $desc = ' '. $cust_bill_pay[0]->applied_to_invoice; % } elsif ( scalar(@cust_bill_pay) == 0 % && scalar(@cust_pay_refund) == 1 % && $cust_pay->unapplied == 0 ) { @@ -171,7 +170,7 @@ % if ( $app->isa('FS::cust_bill_pay') ) { % $desc .= ' '. % '$'. $app->amount. -% ' applied to Invoice #'. $app->invnum. +% ' '. $app->applied_to_invoice. % '<BR>'; % #' on '. time2str("%D", $cust_bill_pay->_date). % } elsif ( $app->isa('FS::cust_pay_refund') ) { @@ -187,8 +186,7 @@ % $desc .= ' '. % '<B><FONT COLOR="#FF0000">$'. % $cust_pay->unapplied. ' unapplied</FONT></B>'; -% if ( $curuser->access_right('Apply payment') # ) { -% || $curuser->access_right('Post payment') ) { #remove after 1.7.3 +% if ( $curuser->access_right('Apply payment') ) { % $desc = ' ('. include( '/elements/popup_link.html', % 'label' => 'apply', % 'action' => "${p}edit/cust_bill_pay.cgi?". @@ -342,8 +340,7 @@ % #completely unapplied % $pre = '<B><FONT COLOR="#FF0000">Unapplied '; % $post = '</FONT></B>'; -% if ( $curuser->access_right('Apply credit') # ) { -% || $curuser->access_right('Post credit') ) { #remove after 1.7.3 +% if ( $curuser->access_right('Apply credit') ) { % $apply = ' ('. include( '/elements/popup_link.html', % 'label' => 'apply', % 'action' => "${p}edit/cust_credit_bill.cgi?". @@ -358,7 +355,7 @@ % && scalar(@cust_credit_refund) == 0 % && $cust_credit->credited == 0 ) { % #applied to one invoice, the usual situation -% $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum; +% $desc = ' '. $cust_credit_bill[0]->applied_to_invoice; % } elsif ( scalar(@cust_credit_bill) == 0 % && scalar(@cust_credit_refund) == 1 % && $cust_credit->credited == 0 ) { @@ -372,7 +369,7 @@ % if ( $app->isa('FS::cust_credit_bill') ) { % $desc .= ' '. % '$'. $app->amount. -% ' applied to Invoice #'. $app->invnum. +% ' '. $app->applied_to_invoice. % '<BR>'; % #' on '. time2str("%D", $app->_date). % } elsif ( $app->isa('FS::cust_credit_refund') ) { @@ -387,8 +384,7 @@ % if ( $cust_credit->credited > 0 ) { % $desc .= ' <B><FONT COLOR="#FF0000">$'. % $cust_credit->credited. ' unapplied</FONT></B>'; -% if ( $curuser->access_right('Apply credit') # ) { -% || $curuser->access_right('Post credit') ) { #remove after 1.7.3 +% if ( $curuser->access_right('Apply credit') ) { % $desc = ' ('. include( '/elements/popup_link.html', % 'label' => 'apply', % 'action' => "${p}edit/cust_credit_bill.cgi?". |