RT# 34134 - removed config option manual_process-single_invoice_amount from config...

Conflicts:
	httemplate/misc/payment.cgi

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 36b330c..50c0a5d 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2804,13 +2804,6 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'manual_process-single_invoice_amount',
-    'section'     => 'payments',
-    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
-    'type'        => 'checkbox',
-  },
-
   {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'payments',

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index f754f5a..80cb15d 100644 (file)
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -14,7 +14,7 @@
 
   <& /elements/tr-select-payment_options.html,
        'custnum'            => $cust_main->custnum,
-       'amount'             => $amount,
+       'amount'             => $balance,
        'process-pkgpart'    => 
           scalar($conf->config('manual_process-pkgpart', $cust_main->agentnum)),
        'process-display'    => scalar($conf->config('manual_process-display')),
@@ -187,15 +187,6 @@ my $payinfo = '';
 
 my $conf = new FS::Conf;
 
-my $amount = '';
-if ( $balance > 0 ) {
-  # when configured to do so, amount will only auto-fill with balance
-  # if balance represents a single invoice
-  $amount = $balance
-    unless $conf->exists('manual_process-single_invoice_amount')
-      && ($cust_main->open_cust_bill != 1);
-}
-
 my $payunique = "webui-payment-". time. "-$$-". rand() * 2**32;
 
 </%init>