projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_main_note.pm
diff --git
a/FS/FS/cust_main_note.pm
b/FS/FS/cust_main_note.pm
index
06da096
..
2288d7c
100644
(file)
--- a/
FS/FS/cust_main_note.pm
+++ b/
FS/FS/cust_main_note.pm
@@
-1,10
+1,10
@@
package FS::cust_main_note;
package FS::cust_main_note;
+use base qw( FS::otaker_Mixin FS::Record );
use strict;
use strict;
-use base qw( FS::otaker_Mixin FS::Record );
use Carp;
use Carp;
-use FS::Record qw( qsearch qsearchs );
-use FS::
cust_note_class
;
+use FS::Record qw( qsearch
s ); #qw( qsearch
qsearchs );
+use FS::
Conf
;
=head1 NAME
=head1 NAME
@@
-113,9
+113,16
@@
sub check {
|| $self->ut_numbern('_date')
|| $self->ut_textn('otaker')
|| $self->ut_anything('comments')
|| $self->ut_numbern('_date')
|| $self->ut_textn('otaker')
|| $self->ut_anything('comments')
+ || $self->ut_numbern('sticky')
;
return $error if $error;
;
return $error if $error;
+ if (!$self->classnum) {
+ my $conf = new FS::Conf;
+ return 'Note class is required'
+ if $conf->exists('cust_main_note-require_class');
+ }
+
$self->SUPER::check;
}
$self->SUPER::check;
}
@@
-124,17
+131,6
@@
sub check {
Returns the customer note class, as an FS::cust_note_class object, or the empty
string if there is no note class.
Returns the customer note class, as an FS::cust_note_class object, or the empty
string if there is no note class.
-=cut
-
-sub cust_note_class {
- my $self = shift;
- if ( $self->classnum ) {
- qsearchs('cust_note_class', { 'classnum' => $self->classnum } );
- } else {
- return '';
- }
-}
-
=item classname
Returns the customer note class name, or the empty string if there is no
=item classname
Returns the customer note class name, or the empty string if there is no