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

Conflicts:
	httemplate/view/cust_main/packages/contact.html

diff --combined FS/FS/cust_pkg.pm
index bb1b4e3,8012288..741d440
--- 1/FS/FS/cust_pkg.pm
--- 2/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@@ -227,7 -227,7 +227,7 @@@ Create a new billing item.  To add the 
  =cut
  
  sub table { 'cust_pkg'; }
- sub cust_linked { $_[0]->cust_main_custnum; } 
+ sub cust_linked { $_[0]->cust_main_custnum || $_[0]->custnum } 
  sub cust_unlinked_msg {
    my $self = shift;
    "WARNING: can't find cust_main.custnum ". $self->custnum.
@@@ -3569,6 -3569,11 +3569,6 @@@ sub main_pkg 
    return;
  }
  
 -# workaround for name conflict
 -sub pkg_contact {
 -  FS::contact_Mixin::contact(@_);
 -}
 -
  =back
  
  =head1 CLASS METHODS

diff --combined httemplate/view/cust_main/packages/contact.html
index 5f47cf7,bb94534..c3b161b
--- 1/httemplate/view/cust_main/packages/contact.html
--- 2/httemplate/view/cust_main/packages/contact.html
+++ b/httemplate/view/cust_main/packages/contact.html
@@@ -13,7 -13,6 +13,6 @@@
  %#  %   }
    </FONT>
  % } 
- 
  <%init>
  
  my $conf = new FS::Conf;
@@@ -21,7 -20,7 +20,7 @@@ my %opt = @_
  
  my $cust_pkg       = $opt{'cust_pkg'};
  
 -my $contact = $cust_pkg->pkg_contact;
 +my $contact = $cust_pkg->contact_obj;
  
  sub pkg_change_contact_link {
    my $cust_pkg = shift;