projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77783e2
)
fix method name conflicts, related to #13971
author
Mark Wells
<mark@freeside.biz>
Tue, 7 Jan 2014 20:19:59 +0000
(12:19 -0800)
committer
Mark Wells
<mark@freeside.biz>
Tue, 7 Jan 2014 20:19:59 +0000
(12:19 -0800)
FS/FS/cust_bill.pm
patch
|
blob
|
history
FS/FS/cust_bill_event.pm
patch
|
blob
|
history
FS/FS/cust_credit.pm
patch
|
blob
|
history
FS/FS/cust_event.pm
patch
|
blob
|
history
FS/FS/cust_pay.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
1569ef4
..
9a971dd
100644
(file)
--- 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'
}
$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.
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
(file)
--- 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 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.
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
(file)
--- 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'; }
=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.
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
(file)
--- 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 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;
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
(file)
--- 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'; }
=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.
sub cust_unlinked_msg {
my $self = shift;
"WARNING: can't find cust_main.custnum ". $self->custnum.