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

diff --git a/FS/FS/contact_email.pm b/FS/FS/contact_email.pm
index a0ff273..8d6bbbf 100644 (file)
--- a/FS/FS/contact_email.pm
+++ b/FS/FS/contact_email.pm
@@ -2,6 +2,7 @@ package FS::contact_email;
 use base qw( FS::Record );
 
 use strict;
+use FS::Msgcat qw( gettext );
 
 =head1 NAME
 

diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index f30508d..b160343 100644 (file)
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -405,6 +405,11 @@ sub search {
 
 }
 
+# stub this so that calling ->cust_bill doesn't return an empty string
+sub cust_bill {
+  return;
+}
+
 =back
 
 =head1 BUGS