From f6da293051917c4f9b8dbdf42815c03638808993 Mon Sep 17 00:00:00 2001 From: levinse Date: Fri, 29 Apr 2011 15:07:43 +0000 Subject: [PATCH] make postal invoice fee a per-agent config, RT7240 --- FS/FS/Conf.pm | 1 + FS/FS/cust_main.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 331645ec7..02133b06a 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -3010,6 +3010,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 8345d9267..b2bcbdcc5 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -3410,7 +3410,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 ( { -- 2.11.0