[freeside-commits] branch master updated. 429a48b18a54917b73b3add468d930f60bcdb2fe

[Mark Wells]

The branch, master has been updated
       via  429a48b18a54917b73b3add468d930f60bcdb2fe (commit)
      from  77783e2521b98f0ca76ebe953873fbdc7cc51e98 (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 429a48b18a54917b73b3add468d930f60bcdb2fe
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jan 7 12:19:59 2014 -0800

    fix method name conflicts, related to #13971

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1569ef4..9a971dd 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -158,7 +158,7 @@ sub notice_name {
   $self->conf->config('notice_name') || 'Invoice'
 }
 
-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.
diff --git a/FS/FS/cust_bill_event.pm b/FS/FS/cust_bill_event.pm
index 36afed0..c91283b 100644
--- a/FS/FS/cust_bill_event.pm
+++ b/FS/FS/cust_bill_event.pm
@@ -83,7 +83,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cust_bill_event'; }
 
-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.
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 7845a20..df59950 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -123,7 +123,7 @@ Creates a new credit.  To add the credit to the database, see L<"insert">.
 =cut
 
 sub table { 'cust_credit'; }
-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.
diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm
index 78d4217..b29ab71 100644
--- a/FS/FS/cust_event.pm
+++ b/FS/FS/cust_event.pm
@@ -73,7 +73,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cust_event'; }
 
-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;
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index a7b9108..ed76559 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -169,7 +169,7 @@ Creates a new payment.  To add the payment to the databse, see L<"insert">.
 =cut
 
 sub table { 'cust_pay'; }
-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.

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

Summary of changes:
 FS/FS/cust_bill.pm       |    2 +-
 FS/FS/cust_bill_event.pm |    2 +-
 FS/FS/cust_credit.pm     |    2 +-
 FS/FS/cust_event.pm      |    2 +-
 FS/FS/cust_pay.pm        |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)