projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #32230 Message templates not displaying in send email export
[freeside.git]
/
FS
/
FS
/
part_export
/
send_email.pm
diff --git
a/FS/FS/part_export/send_email.pm
b/FS/FS/part_export/send_email.pm
index
05f6236
..
f1c376f
100644
(file)
--- a/
FS/FS/part_export/send_email.pm
+++ b/
FS/FS/part_export/send_email.pm
@@
-6,7
+6,6
@@
use FS::part_export;
use FS::Record qw(qsearch qsearchs);
use FS::Conf;
use FS::msg_template;
use FS::Record qw(qsearch qsearchs);
use FS::Conf;
use FS::msg_template;
-use FS::Misc qw(send_email);
@ISA = qw(FS::part_export);
@ISA = qw(FS::part_export);
@@
-21,7
+20,8
@@
my %template_select = (
%templates = (0 => '',
map { $_->msgnum, $_->msgname }
qsearch({ table => 'msg_template',
%templates = (0 => '',
map { $_->msgnum, $_->msgname }
qsearch({ table => 'msg_template',
- hashref => {},
+ hashref => { disabled => { 'op' => '!=',
+ 'value' => 1 },
order_by => 'ORDER BY msgnum ASC'
})
);
order_by => 'ORDER BY msgnum ASC'
})
);
@@
-85,6
+85,7
@@
tie my %options, 'Tie::IxHash', (
'Send an email message',
'options' => \%options,
'nodomain' => '',
'Send an email message',
'options' => \%options,
'nodomain' => '',
+ 'no_machine' => 1,
'notes' => '
Send an email message. The subject and body of the message
will be generated from a message template.'
'notes' => '
Send an email message. The subject and body of the message
will be generated from a message template.'