[freeside-commits] branch FREESIDE_3_BRANCH updated. ec61d63e707e874ae5ba606accb192dfb6b5ef82

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  ec61d63e707e874ae5ba606accb192dfb6b5ef82 (commit)
       via  efdfd4f1dc1ad957c9aa9d4aca0d8d0f2f49806d (commit)
      from  a7f520e2c78a791d32f62eacfbfef025ba7f1bc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec61d63e707e874ae5ba606accb192dfb6b5ef82
Merge: efdfd4f1d a7f520e2c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 30 12:32:48 2018 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit efdfd4f1dc1ad957c9aa9d4aca0d8d0f2f49806d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 15 11:23:48 2017 -0700

    better filename with quotation # for PDF quotation attachments, RT#76003

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 5dc889960..cefb4bcc3 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2440,7 +2440,7 @@ sub generate_email {
 =item mimebuild_pdf
 
 Returns a list suitable for passing to MIME::Entity->build(), representing
-this invoice as PDF attachment.
+this quotation or invoice as PDF attachment.
 
 =cut
 
@@ -2451,7 +2451,7 @@ sub mimebuild_pdf {
     'Encoding'    => 'base64',
     'Data'        => [ $self->print_pdf(@_) ],
     'Disposition' => 'attachment',
-    'Filename'    => 'invoice-'. $self->invnum. '.pdf',
+    'Filename'    => $self->pdf_filename,
   );
 }
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index b3e86584b..6bfe3339a 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.
diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 1a6641f7d..0fd59775b 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -237,6 +237,11 @@ sub email_subject {
   eval qq("$subject");
 }
 
+sub pdf_filename {
+  my $self = shift;
+  'Quotation-'. $self->quotationnum. '.pdf';
+}
+
 =item cust_or_prosect
 
 =cut

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Template_Mixin.pm | 4 ++--
 FS/FS/cust_bill.pm      | 5 +++++
 FS/FS/quotation.pm      | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)