diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-12-05 10:45:26 -0800 |
|---|---|---|
| committer | Jeremy Davis <jeremyd@freeside.biz> | 2014-12-10 11:23:48 -0500 |
| commit | a83f6bb859327c0ff55d6aa30e39e8a0f657be75 (patch) | |
| tree | 45626acc9ee47f7253cac441186a8adc60d76f78 /httemplate/edit | |
| parent | 36a9d4661fffb85b8d9ec099ee2dc0ced8991e99 (diff) | |
agent-ize invoice_default_terms, RT#32513
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 3 | ||||
| -rw-r--r-- | httemplate/edit/quick-charge.html | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html index f1daebe90..750862726 100644 --- a/httemplate/edit/cust_main/billing.html +++ b/httemplate/edit/cust_main/billing.html @@ -547,7 +547,8 @@ <TD ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD> <TD WIDTH="408"> <& /elements/select-terms.html, - 'curr_value' => $cust_main->invoice_terms, + 'curr_value' => $cust_main->invoice_terms, + 'agentnum' => $cust_main->agentnum, &> </TD> </TR> diff --git a/httemplate/edit/quick-charge.html b/httemplate/edit/quick-charge.html index e141e7d22..06669fa0e 100644 --- a/httemplate/edit/quick-charge.html +++ b/httemplate/edit/quick-charge.html @@ -200,8 +200,9 @@ function bill_now_changed (what) { > <% mt('with terms') |h %> <& /elements/select-terms.html, - 'curr_value' => scalar($cgi->param('invoice_terms')), - 'disabled' => ( $cgi->param('bill_now') ? 0 : 1 ), + 'curr_value' => scalar($cgi->param('invoice_terms')), + 'disabled' => ( $cgi->param('bill_now') ? 0 : 1 ), + 'agentnum' => $cust_main->agentnum, &> </TD> </TR> @@ -429,9 +430,12 @@ my $default_terms; if ( $cust_main->invoice_terms ) { $default_terms = emt("Customer default ([_1])", $cust_main->invoice_terms); } else { - $default_terms = emt("Default ([_1])", - ($conf->config('invoice_default_terms') || emt('Payable upon receipt')) - ); + $default_terms = + emt( "Default ([_1])", + ( $conf->config('invoice_default_terms', $cust_main->agentnum) + || emt('Payable upon receipt') + ) + ); } my @description; |