[freeside-commits] freeside/FS/FS Conf.pm, 1.180, 1.180.2.1 cust_main.pm, 1.271.2.1, 1.271.2.2

[Kristian Hoffmann,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv20565

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Conf.pm cust_main.pm 
Log Message:
Option to disable the charging of the setup fee while a package is suspended.

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.180
retrieving revision 1.180.2.1
diff -u -d -r1.180 -r1.180.2.1
--- Conf.pm	14 Feb 2007 03:12:25 -0000	1.180
+++ Conf.pm	7 Mar 2007 19:49:15 -0000	1.180.2.1
@@ -2045,6 +2045,13 @@
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'disable_setup_suspended_pkgs',
+    'section'     => 'billing',
+    'description' => 'Disables charging of setup fees for suspended packages.',
+    'type'       => 'checkbox',
+  },
+
 );
 
 1;

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.271.2.1
retrieving revision 1.271.2.2
diff -u -d -r1.271.2.1 -r1.271.2.2
--- cust_main.pm	2 Mar 2007 23:48:22 -0000	1.271.2.1
+++ cust_main.pm	7 Mar 2007 19:49:15 -0000	1.271.2.2
@@ -1902,7 +1902,14 @@
     ###
 
     my $setup = 0;
-    if ( !$cust_pkg->setup || $options{'resetup'} ) {
+    if ( ! $cust_pkg->setup &&
+         (
+           ( $conf->exists('disable_setup_suspended_pkgs') &&
+            ! $cust_pkg->getfield('susp')
+          ) || ! $conf->exists('disable_setup_suspended_pkgs')
+         )
+      || $options{'resetup'}
+    ) {
     
       warn "    bill setup\n" if $DEBUG > 1;