diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-04-02 16:24:58 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-04-02 16:24:58 -0700 |
| commit | 137d53fa8148996a844dff0f179f8c06afe9e592 (patch) | |
| tree | 32af2bc350c1ea40657b1357cc82e4fae369d9bd | |
| parent | 4178a13c1fc66dc732b6236a32df132316466856 (diff) | |
invoice mode in PDF spools, RT#39587
| -rw-r--r-- | FS/FS/Template_Mixin.pm | 4 | ||||
| -rw-r--r-- | FS/FS/cust_bill.pm | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 8dff768d9..031c1f25c 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 42be02a6d..f207d3573 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1128,9 +1128,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{$_} } @@ -1271,6 +1270,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); } |