X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fglobal_Mixin.pm;h=e82602e1acfcb533533cdde3ab8c6fd2181faf23;hb=e3ceac324435da66323d6e58b46ed86cf2bf0b90;hp=31d178d8cd3bcdb823a33a5f79d4972f11f31d5a;hpb=5422bc1098d49e736caa9c61b3eb941060920d5e;p=freeside.git diff --git a/FS/FS/part_pkg/global_Mixin.pm b/FS/FS/part_pkg/global_Mixin.pm index 31d178d8c..e82602e1a 100644 --- a/FS/FS/part_pkg/global_Mixin.pm +++ b/FS/FS/part_pkg/global_Mixin.pm @@ -19,11 +19,11 @@ 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*$/ ) { - $$valref = ( ($1||''). ($2||''). ($3||'') ) || 0; + $$valref = ( ($1||''). ($2.'0') ) || 0; + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{2})?\s*$/ ) { + $$valref = ( ($1||''). ($2||'') ) || 0; } else { return "Illegal (money) $option: ". $$valref; }