summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorlevinse <levinse>2011-04-29 15:07:44 +0000
committerlevinse <levinse>2011-04-29 15:07:44 +0000
commit00ff5cdd16d2e23f5d2b95591d4211248167a433 (patch)
treeee869734f84c2e9f58d83303797eb479a8c56378 /FS
parent046131d0a951a09c8674345c37bb130c910dc7c1 (diff)
make postal invoice fee a per-agent config, RT7240
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Conf.pm1
-rw-r--r--FS/FS/cust_main.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6f99f0ab1..575b1b823 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2987,6 +2987,7 @@ and customer address. Include units.',
'section' => 'billing',
'description' => 'This allows selection of a package to insert on invoices for customers with postal invoices selected.',
'type' => 'select-part_pkg',
+ 'per_agent' => 1,
},
{
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ffc11ac50..61625d84e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3369,7 +3369,7 @@ sub charge {
sub charge_postal_fee {
my $self = shift;
- my $pkgpart = $conf->config('postal_invoice-fee_pkgpart');
+ my $pkgpart = $conf->config('postal_invoice-fee_pkgpart', $self->agentnum);
return '' unless ($pkgpart && grep { $_ eq 'POST' } $self->invoicing_list);
my $cust_pkg = new FS::cust_pkg ( {