summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2005-06-08 21:52:46 +0000
committerivan <ivan>2005-06-08 21:52:46 +0000
commitd7ca7fe2132e626d6f4e65905f7592ce1789e39c (patch)
tree176148984ad68a9cfc3feb506aa7da643eb6a4e5
parent04cc48bd2a049909af54b9e58afebffe51cdd1b2 (diff)
last bit to allow -1 for non-pkg, non-tax line items
-rw-r--r--FS/FS/cust_bill_pkg.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 3478904ec..22673234c 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -40,7 +40,7 @@ supported:
=item invnum - invoice (see L<FS::cust_bill>)
-=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package
+=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package, or -1 for the virtual line item (itemdesc is used for the line)
=item setup - setup fee
@@ -50,7 +50,7 @@ supported:
=item edate - ending date of recurring fee
-=item itemdesc - Line item description (currentlty used only when pkgnum is 0)
+=item itemdesc - Line item description (currentlty used only when pkgnum is 0 or -1)
=back
@@ -156,7 +156,7 @@ sub check {
my $error =
$self->ut_numbern('billpkgnum')
- || $self->ut_number('pkgnum')
+ || $self->ut_snumber('pkgnum')
|| $self->ut_number('invnum')
|| $self->ut_money('setup')
|| $self->ut_money('recur')
@@ -166,7 +166,8 @@ sub check {
;
return $error if $error;
- if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
+ #if ( $self->pkgnum != 0 ) { #allow unchecked pkgnum 0 for tax! (add to part_pkg?)
+ if ( $self->pkgnum > 0 ) { #allow -1 for non-pkg line items and 0 for tax (add to part_pkg?)
return "Unknown pkgnum ". $self->pkgnum
unless qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
}