From: Alex Brelsfoard <alex@freeside.biz>
Date: Wed, 28 Jan 2015 19:44:00 +0000 (-0500)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=42e878b29ae26943d7dc3acfbb7f095a56ae0a2f;hp=063d9f211aa19a26755279ad7277648cfdae6313

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 a0ff27393..8d6bbbf6f 100644
--- 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 f30508d34..b160343de 100644
--- 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