diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-01-29 14:34:43 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-01-29 14:34:43 -0800 |
| commit | cc31c0b9d0af6ef6986a0349ae083ca29820eeac (patch) | |
| tree | eab3b5e825675f6b10b3eea326fbf4eef95957c8 | |
| parent | e345aa297433b9653f42fc81145eb107c482a19d (diff) | |
fix for data in latest cch update, RT#26740
| -rw-r--r-- | FS/FS/tax_rate.pm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index 095939f9a..c54f5a64a 100644 --- a/FS/FS/tax_rate.pm +++ b/FS/FS/tax_rate.pm @@ -215,7 +215,7 @@ sub check { $self->ut_numbern('taxnum') || $self->ut_text('geocode') || $self->ut_textn('data_vendor') - || $self->ut_textn('location') + || $self->ut_cch_textn('location') || $self->ut_foreign_key('taxclassnum', 'tax_class', 'taxclassnum') || $self->ut_snumbern('effective_date') || $self->ut_float('tax') @@ -229,7 +229,7 @@ sub check { || $self->ut_floatn('excessfee') || $self->ut_floatn('feemax') || $self->ut_numbern('maxtype') - || $self->ut_textn('taxname') + || $self->ut_cch_textn('taxname') || $self->ut_numbern('taxauth') || $self->ut_numbern('basetype') || $self->ut_numbern('passtype') @@ -245,6 +245,18 @@ sub check { } +#ut_text / ut_textn w/ ` added cause now that's in the data +sub ut_cch_textn { + my($self,$field)=@_; + $self->getfield($field) + =~ /^([\wô \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]\<\>\`]*)$/ + or return gettext('illegal_or_empty_text'). " $field: ". + $self->getfield($field); + $self->setfield($field,$1); + ''; + +} + =item taxclass_description Returns the human understandable value associated with the related |