summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorlevinse <levinse>2010-12-03 23:38:27 +0000
committerlevinse <levinse>2010-12-03 23:38:27 +0000
commitf626fd72d814be2245c5cf7b2fd3e63b0e8164b4 (patch)
tree8a50ab15ae48b208f95fedfabd5bae91bc08f779 /FS
parent2dced43b8c6083fa0ff7bbe2120c1387c8a2b604 (diff)
fix use of reserved sql word in dsl_note schema, RT7111/RT10806
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Schema.pm2
-rw-r--r--FS/FS/dsl_note.pm4
-rw-r--r--FS/FS/part_export/ikano.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 5f78b51f8..7cccc7fdc 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1871,7 +1871,7 @@ sub tables_hashref {
'columns' => [
'notenum', 'serial', '', '', '', '',
'svcnum', 'int', '', '', '', '',
- 'user', 'varchar', 'NULL', $char_d, '', '',
+ 'author', 'varchar', 'NULL', $char_d, '', '',
'priority', 'char', 'NULL', 1, '', '',
'_date', 'int', 'NULL', '', '', '',
'note', 'text', '', '', '', '',
diff --git a/FS/FS/dsl_note.pm b/FS/FS/dsl_note.pm
index 0155cbd11..832fced92 100644
--- a/FS/FS/dsl_note.pm
+++ b/FS/FS/dsl_note.pm
@@ -34,7 +34,7 @@ FS::Record. The following fields are currently supported:
=item svcnum - the DSL for this note, see L<FS::svc_dsl>
-=item user - export-specific, e.g. note's author or ISP vs. telco/vendor
+=item author - export-specific, e.g. note's author or ISP vs. telco/vendor
=item priority - export-specific, e.g. high priority or not; not used by most
@@ -105,7 +105,7 @@ sub check {
my $error =
$self->ut_numbern('notenum')
|| $self->ut_foreign_key('svcnum', 'svc_dsl', 'svcnum')
- || $self->ut_textn('user')
+ || $self->ut_textn('author')
|| $self->ut_alphasn('priority')
|| $self->ut_numbern('_date')
|| $self->ut_text('note')
diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index 6316b298d..bae683a12 100644
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -250,7 +250,7 @@ sub ikano2fsnote {
new FS::dsl_note( {
'svcnum' => $svcnum,
- 'user' => $by,
+ 'author' => $by,
'priority' => $n->{'HighPriority'} eq 'false' ? 'N' : 'H',
'_date' => int(str2time($n->{'Date'})),
'note' => $n->{'Text'},