[freeside-commits] branch master updated. 06f92269d9fe378cfa2f00c958404a6e8df642ff

[Ivan]

The branch, master has been updated
       via  06f92269d9fe378cfa2f00c958404a6e8df642ff (commit)
       via  67065f306c08433774a1044bcd8e5d6254d752da (commit)
       via  de2d2fc7243b193e037e971c096a5030d71ff0c6 (commit)
      from  7ce77a80cf98d1b97e8bcd942d03905902b9d653 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06f92269d9fe378cfa2f00c958404a6e8df642ff
Merge: 67065f3 7ce77a8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 17 09:48:09 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside
    
    Conflicts:
    	httemplate/view/cust_main/packages/contact.html


commit 67065f306c08433774a1044bcd8e5d6254d752da
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 17 09:45:44 2013 -0700

    fix fallout from #22185 (#22601, #22600)

diff --git a/httemplate/view/cust_main/packages/contact.html b/httemplate/view/cust_main/packages/contact.html
index f47705c..5f47cf7 100644
--- a/httemplate/view/cust_main/packages/contact.html
+++ b/httemplate/view/cust_main/packages/contact.html
@@ -14,7 +14,6 @@
   </FONT>
 % } 
 
-</TD>
 <%init>
 
 my $conf = new FS::Conf;

commit de2d2fc7243b193e037e971c096a5030d71ff0c6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 17 09:41:30 2013 -0700

    fix fallout from #22185 (#22601, #22600)

diff --git a/FS/FS/contact_Mixin.pm b/FS/FS/contact_Mixin.pm
index 33cd350..6e8f315 100644
--- a/FS/FS/contact_Mixin.pm
+++ b/FS/FS/contact_Mixin.pm
@@ -4,13 +4,13 @@ use strict;
 use FS::Record qw( qsearchs );
 use FS::contact;
 
-=item contact
+=item contact_obj
 
 Returns the contact object, if any (see L<FS::contact>).
 
 =cut
 
-sub contact {
+sub contact_obj {
   my $self = shift;
   return '' unless $self->contactnum;
   qsearchs( 'contact', { 'contactnum' => $self->contactnum } );
diff --git a/httemplate/elements/tr-select-contact.html b/httemplate/elements/tr-select-contact.html
index 5791178..d6bc67f 100644
--- a/httemplate/elements/tr-select-contact.html
+++ b/httemplate/elements/tr-select-contact.html
@@ -162,7 +162,7 @@ if ( $contactnum && $contactnum > 0 ) {
   if ( $contactnum == -1 ) {
     $contact->$_( $cgi->param($_) ) foreach @contact_fields; #XXX
   } elsif ( $cust_pkg && $cust_pkg->contactnum ) {
-    my $pkg_contact = $cust_pkg->contact;
+    my $pkg_contact = $cust_pkg->contact_obj;
     $contact->$_( $pkg_contact->$_ ) foreach @contact_fields; #XXX why are we making a new one gagain??
     $opt{'empty_label'} ||= 'package contact: '.$pkg_contact->line;
   } elsif ( $cust_main ) {
diff --git a/httemplate/view/cust_main/packages/contact.html b/httemplate/view/cust_main/packages/contact.html
index a6f8a42..f47705c 100644
--- a/httemplate/view/cust_main/packages/contact.html
+++ b/httemplate/view/cust_main/packages/contact.html
@@ -22,7 +22,7 @@ my %opt = @_;
 
 my $cust_pkg       = $opt{'cust_pkg'};
 
-my $contact = $cust_pkg->contact;
+my $contact = $cust_pkg->contact_obj;
 
 sub pkg_change_contact_link {
   my $cust_pkg = shift;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/contact_Mixin.pm                          |    4 ++--
 FS/FS/cust_pkg.pm                               |    5 -----
 httemplate/elements/tr-select-contact.html      |    2 +-
 httemplate/view/cust_main/packages/contact.html |    2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)