X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=2d937a8277d6bd14be5d2946bb4c4fc084f628e5;hb=057ae504915d912bc60df87c9914e11752edf680;hp=b3e86584b8ce4473aebece577ceda90a5a221e7a;hpb=02ccaf002b3c1f5274266061786dc7d03047fe30;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index b3e86584b..2d937a827 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1166,6 +1166,11 @@ sub email_subject {
   eval qq("$subject");
 }
 
+sub pdf_filename {
+  my $self = shift;
+  'Invoice-'. $self->invnum. '.pdf';
+}
+
 =item lpr_data HASHREF
 
 Returns the postscript or plaintext for this invoice as an arrayref.
@@ -2920,15 +2925,11 @@ sub _items_total {
     }
 
   }
-
-  if ( $conf->exists('invoice_show_prior_due_date') ) {
+  if ( $conf->exists('invoice_show_prior_due_date') && !$conf->exists('invoice_omit_due_date') ) {
     # then the due date should be shown with Total New Charges,
     # and should NOT be shown with the Balance Due message.
     if ( $self->due_date ) {
-      # localize the "Please pay by" message and the date itself
-      # (grammar issues with this, yeah)
-      $new_charges_desc .= ' - ' . $self->mt('Please pay by') . ' ' .
-                           $self->due_date2str('short');
+      $new_charges_desc .= $self->invoice_pay_by_msg;
     } elsif ( $self->terms ) {
       # phrases like "due on receipt" should be localized
       $new_charges_desc .= ' - ' . $self->mt($self->terms);