diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-04-25 14:45:06 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-04-25 14:45:06 -0700 |
| commit | d70cfa65d09780eeb9ff020e122b73634c5c6b35 (patch) | |
| tree | 4723cec3c4150da9629300b68c649fe7dea86566 /FS | |
| parent | 9dfb57058b3856c2a35c27b5c586ea02cf74d010 (diff) | |
| parent | dc15d03b6daa1f41d94f1e2064c3aed4d6971766 (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_pkg/global_Mixin.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/part_pkg/global_Mixin.pm b/FS/FS/part_pkg/global_Mixin.pm index 31d178d8c..0281a51f8 100644 --- a/FS/FS/part_pkg/global_Mixin.pm +++ b/FS/FS/part_pkg/global_Mixin.pm @@ -19,10 +19,10 @@ sub validate_moneyn { my ($option, $valref) = @_; if ( $$valref eq '' ) { return ''; - } elsif ( $$valref =~ /^\s*(\-)?\s*(\d*)(\.\d{1})\s*$/ ) { + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{1})\s*$/ ) { #handle one decimal place without barfing out $$valref = ( ($1||''). ($2||''). ($3.'0') ) || 0; - } elsif ( $$valref =~ /^\s*(\-)?\s*(\d*)(\.\d{2})?\s*$/ ) { + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{2})?\s*$/ ) { $$valref = ( ($1||''). ($2||''). ($3||'') ) || 0; } else { return "Illegal (money) $option: ". $$valref; |