summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/search/report_vend_bill.html11
-rw-r--r--httemplate/search/vend_bill.html7
2 files changed, 17 insertions, 1 deletions
diff --git a/httemplate/search/report_vend_bill.html b/httemplate/search/report_vend_bill.html
index aec1bba..defda70 100644
--- a/httemplate/search/report_vend_bill.html
+++ b/httemplate/search/report_vend_bill.html
@@ -16,6 +16,17 @@
</TD>
</TR>
+ <TR>
+ <TD ALIGN="right" VALIGN="center"><% mt('Payment date') |h %></TD>
+ <TD>
+ <TABLE>
+ <& /elements/tr-input-beginning_ending.html,
+ prefix => 'payment_date',
+ layout => 'horiz',
+ &>
+ </TABLE>
+ </TD>
+ </TR>
</TABLE>
diff --git a/httemplate/search/vend_bill.html b/httemplate/search/vend_bill.html
index ddcc0c9..33eb224 100644
--- a/httemplate/search/vend_bill.html
+++ b/httemplate/search/vend_bill.html
@@ -7,6 +7,7 @@
'count_query' => $count_query,
'count_addl' => [ '$%.2f total', ],
'header' => [ 'Date',
+ 'Payment date',
'Vendor',
'Class',
'Amount',
@@ -14,6 +15,7 @@
],
'fields' => [
sub { time2str('%D', shift->_date) },
+ sub { time2str('%D', shift->payment_date) },
sub { shift->vend_main->vendname },
sub { shift->vend_main->vend_class->classname },
'charged',
@@ -32,9 +34,12 @@ die "access denied"
my %search = ();
# begin/end/beginning/ending
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '_date');
$search{'_date'} = [ $beginning, $ending ];
+($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, 'payment_date');
+$search{'payment_date'} = [ $beginning, $ending ];
+
my $query = FS::vend_bill->search( \%search );
my $count_query = delete( $query->{'count_query'} );