projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 83122 fix dupes on wa_sales tax table updates
[freeside.git]
/
FS
/
FS
/
vend_bill.pm
diff --git
a/FS/FS/vend_bill.pm
b/FS/FS/vend_bill.pm
index
81de694
..
5ea91fb
100644
(file)
--- a/
FS/FS/vend_bill.pm
+++ b/
FS/FS/vend_bill.pm
@@
-1,11
+1,9
@@
package FS::vend_bill;
package FS::vend_bill;
+use base qw(FS::Record);
use strict;
use strict;
-use base qw( FS::Record );
-use FS::Record qw( dbh qsearch qsearchs );
-use FS::vend_main;
+use FS::Record qw( dbh ); # qsearch qsearchs );
use FS::vend_pay;
use FS::vend_pay;
-use FS::vend_bill_pay;
=head1 NAME
=head1 NAME
@@
-169,22
+167,8
@@
sub check {
=item vend_main
=item vend_main
-=cut
-
-sub vend_main {
- my $self = shift;
- qsearchs('vend_main', { 'vendnum', $self->vendnum });
-}
-
=item vend_bill_pay
=item vend_bill_pay
-=cut
-
-sub vend_bill_pay {
- my $self = shift;
- qsearch('vend_bill_pay', { 'vendbillnum', $self->vendbillnum });
-}
-
=item search
=cut
=item search
=cut
@@
-193,6
+177,7
@@
sub search {
my ($class, $param) = @_;
my @where = ();
my ($class, $param) = @_;
my @where = ();
+ my $addl_from = '';
#_date
if ( $param->{_date} ) {
#_date
if ( $param->{_date} ) {
@@
-202,7
+187,7
@@
sub search {
"vend_bill._date < $ending";
}
"vend_bill._date < $ending";
}
- #_date
+ #
payment
_date
if ( $param->{payment_date} ) {
my($beginning, $ending) = @{$param->{payment_date}};
if ( $param->{payment_date} ) {
my($beginning, $ending) = @{$param->{payment_date}};
@@
-210,11
+195,17
@@
sub search {
"vend_pay._date < $ending";
}
"vend_pay._date < $ending";
}
+ if ( $param->{'classnum'} =~ /^(\d+)$/ ) {
+ #also simplistic, but good for now
+ $addl_from .= ' LEFT JOIN vend_main USING (vendnum) ';
+ push @where, "vend_main.classnum = $1";
+ }
+
my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
#simplistic, but how we are for now
my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
#simplistic, but how we are for now
-
my $addl_from
= ' LEFT JOIN vend_bill_pay USING (vendbillnum) '.
-
' LEFT JOIN vend_pay USING (vendpaynum) ';
+
$addl_from .
= ' LEFT JOIN vend_bill_pay USING (vendbillnum) '.
+ ' LEFT JOIN vend_pay USING (vendpaynum) ';
my $count_query = "SELECT COUNT(*), SUM(charged) FROM vend_bill $addl_from $extra_sql";
my $count_query = "SELECT COUNT(*), SUM(charged) FROM vend_bill $addl_from $extra_sql";