[freeside-commits] branch master updated. f421a622461d5259804f0da238f349f4a790d91f

[Ivan]

The branch, master has been updated
       via  f421a622461d5259804f0da238f349f4a790d91f (commit)
      from  53846367793e58f00ce32b2fcbd05e9f0ddd179e (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 f421a622461d5259804f0da238f349f4a790d91f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Apr 2 16:24:53 2016 -0700

    invoice mode in PDF spools, RT#39587

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index df1b86d..5153f87 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -147,6 +147,10 @@ sub print_latex {
   $template ||= $self->_agent_template
     if $self->can('_agent_template');
 
+  #the new way
+  $self->set('mode', $params{mode})
+    if $params{mode};
+
   my $pkey = $self->primary_key;
   my $tmp_template = $self->table. '.'. $self->$pkey. '.XXXXXXXX';
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 3ee6d47..79dbbba 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1115,9 +1115,8 @@ sub queueable_email {
   my $self = qsearchs('cust_bill', { 'invnum' => $opt{invnum} } )
     or die "invalid invoice number: " . $opt{invnum};
 
-  if ( $opt{mode} ) {
-    $self->set('mode', $opt{mode});
-  }
+  $self->set('mode', $opt{mode})
+    if $opt{mode};
 
   my %args = map {$_ => $opt{$_}} 
              grep { $opt{$_} }
@@ -1258,6 +1257,10 @@ sub batch_invoice {
       batchnum => $bill_batch->batchnum,
       invnum   => $self->invnum,
   });
+  if ( $self->mode ) {
+    $opt->{mode} ||= $self->mode;
+    $opt->{mode} = $opt->{mode}->modenum if ref $opt->{mode};
+  }
   return $cust_bill_batch->insert($opt);
 }
 

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

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