Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --git a/FS/FS/part_pkg_link.pm b/FS/FS/part_pkg_link.pm
index aee0131..2460e99 100644 (file)
--- a/FS/FS/part_pkg_link.pm
+++ b/FS/FS/part_pkg_link.pm
@@ -260,6 +260,11 @@ sub check {
                ") must be an integer multiple of main package period.";
       }
     }
+    if (( $src_pkg->option('delay_cancel',1) && !$dst_pkg->option('delay_cancel',1) ) ||
+        ( $dst_pkg->option('delay_cancel',1) && !$src_pkg->option('delay_cancel',1) )
+    ) {
+      return "Supplemental package must have same value as main package for automatic suspension on cancel.";
+    }
   }
 
   $self->SUPER::check;