[freeside-commits] freeside/FS/FS Conf.pm, 1.244, 1.245 cust_main.pm, 1.373, 1.374

[Jeff Finucane,420,,]

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

Modified Files:
	Conf.pm cust_main.pm 
Log Message:
option for no postal fee on one-time charges

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- Conf.pm	27 Sep 2008 03:01:43 -0000	1.244
+++ Conf.pm	30 Sep 2008 20:22:38 -0000	1.245
@@ -2012,6 +2012,13 @@
   },
 
   {
+    'key'         => 'postal_invoice-recurring_only',
+    'section'     => 'billing',
+    'description' => 'The postal invoice fee is omitted on invoices without reucrring charges when this is set.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'batch-enable',
     'section'     => 'billing',
     'description' => 'Enable credit card and/or ACH batching - leave disabled for real-time installations.',

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- cust_main.pm	26 Sep 2008 03:54:25 -0000	1.373
+++ cust_main.pm	30 Sep 2008 20:22:38 -0000	1.374
@@ -2147,7 +2147,12 @@
     return "can't charge postal invoice fee for customer ".
       $self->custnum. ": $postal_pkg";
   }
-  if ( $postal_pkg ) {
+  if ( $postal_pkg &&
+       ( scalar( grep { $_->recur && $_->recur > 0 } @cust_bill_pkg) ||
+         !$conf->exists('postal_invoice-recurring_only')
+       )
+     )
+  {
     foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
       my $error =
         $self->_make_lines( 'part_pkg'            => $part_pkg,