From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 24 Oct 2015 22:44:30 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=434137989f7343ada30ceff4056c5f75ef8d9d27;hp=-c

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

434137989f7343ada30ceff4056c5f75ef8d9d27
diff --combined FS/FS/Conf.pm
index a1b0e7cde,4a39fb9c6..594c0e076
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -1675,6 -1675,13 +1675,13 @@@ and customer address. Include units.'
    },
  
    {
+     'key'         => 'refund_receipt_msgnum',
+     'section'     => 'notification',
+     'description' => 'Template to use for manual refund receipts.',
+     %msg_template_options,
+   },
+   
+   {
      'key'         => 'trigger_export_insert_on_payment',
      'section'     => 'billing',
      'description' => 'Enable exports on payment application.',
@@@ -2512,7 -2519,7 +2519,7 @@@
      'section'     => 'billing',
      'description' => 'Available payment types.',
      'type'        => 'selectmultiple',
 -    'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD MCHK PPAL) ],
 +    'select_enum' => [ qw(CARD DCRD CHEK DCHK) ], #BILL CASH WEST MCRD MCHK PPAL) ],
    },
  
    {
diff --combined httemplate/view/cust_main/payment_history.html
index f673748ca,481251478..ebd1e733d
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@@ -194,6 -194,12 +194,6 @@@ my $custnum = $cust_main->custnum
  
  my $curuser = $FS::CurrentUser::CurrentUser;
  
 -my @payby = grep /\w/, $conf->config('payby');
 -#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
 -@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
 -  unless @payby;
 -my %payby = map { $_=>1 } @payby;
 -
  my %status = (
    'Queued'     => 'O', #Open
    'In-transit' => 'I',
@@@ -220,7 -226,7 +220,7 @@@ my %opt = 
    #rights
    ( map { $_ => $curuser->access_right($_) }
        (
-         'View invoices', 'Void invoices', 'Unvoid invoices',
+         'View invoices', 'Void invoices', 'Unvoid invoices', 'Resend invoices',
          'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
          'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment',
          'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
@@@ -234,6 -240,7 +234,7 @@@
    #customer information
    'total_owed'              => $cust_main->total_owed,
    'total_unapplied_refunds' => $cust_main->total_unapplied_refunds,
+   'has_email_address'       => scalar($cust_main->invoicing_list_emailonly),
  );
  
  $opt{'date_format'} ||= '%m/%d/%Y';