[freeside-commits] freeside/FS/FS cust_main.pm, 1.568.2.7, 1.568.2.8 Conf.pm, 1.397.2.43, 1.397.2.44

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv17913/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_main.pm Conf.pm 
Log Message:
make postal invoice fee a per-agent config, RT7240

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.43
retrieving revision 1.397.2.44
diff -u -w -d -r1.397.2.43 -r1.397.2.44
--- Conf.pm	24 Apr 2011 17:04:39 -0000	1.397.2.43
+++ Conf.pm	29 Apr 2011 15:07:44 -0000	1.397.2.44
@@ -2987,6 +2987,7 @@
     '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,
   },
 
   {

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.568.2.7
retrieving revision 1.568.2.8
diff -u -w -d -r1.568.2.7 -r1.568.2.8
--- cust_main.pm	24 Apr 2011 17:04:39 -0000	1.568.2.7
+++ cust_main.pm	29 Apr 2011 15:07:44 -0000	1.568.2.8
@@ -3369,7 +3369,7 @@
 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 ( {