Bug 17600: Standardize our EXPORT_OK

[srvgit] / acqui / invoices.pl

diff --git a/acqui/invoices.pl b/acqui/invoices.pl
index 48adb80..b0e1db2 100755 (executable)
--- a/acqui/invoices.pl
+++ b/acqui/invoices.pl
@@ -26,17 +26,16 @@ Search for invoices
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 
-use C4::Acquisition qw/GetInvoices/;
-use C4::Branch qw/GetBranches/;
-use C4::Budgets;
-use Koha::DateUtils;
+use C4::Acquisition qw( GetInvoices GetInvoice );
+use C4::Budgets qw( GetBudget GetBudgets CanUserUseBudget );
+use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Acquisition::Booksellers;
 
 my $input = CGI->new;
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
@@ -44,9 +43,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => 'acqui/invoices.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { 'acquisition' => '*' },
-        debug           => 1,
     }
 );
 
@@ -62,6 +59,7 @@ my $author           = $input->param('author');
 my $publisher        = $input->param('publisher');
 my $publicationyear  = $input->param('publicationyear');
 my $branch           = $input->param('branch');
+my $message_id       = $input->param('message_id');
 my $op               = $input->param('op');
 
 $shipmentdatefrom and $shipmentdatefrom = eval { dt_from_string( $shipmentdatefrom ) };
@@ -83,55 +81,49 @@ if ( $op and $op eq 'do_search' ) {
         author           => $author,
         publisher        => $publisher,
         publicationyear  => $publicationyear,
-        branchcode       => $branch
+        branchcode       => $branch,
+        message_id       => $message_id,
     );
 }
 
 # Build suppliers list
-my @suppliers      = Koha::Acquisition::Bookseller->search;
+my @suppliers      = Koha::Acquisition::Booksellers->search( undef, { order_by => { -asc => 'name' } } );
 my $suppliers_loop = [];
 my $suppliername;
 foreach (@suppliers) {
     my $selected = 0;
-    if ($supplierid && $supplierid == $_->{id} ) {
+    if ($supplierid && $supplierid == $_->id ) {
         $selected = 1;
-        $suppliername = $_->{name};
+        $suppliername = $_->name;
     }
     push @{$suppliers_loop},
       {
-        suppliername => $_->{name},
-        booksellerid   => $_->{id},
+        suppliername => $_->name,
+        booksellerid   => $_->id,
         selected     => $selected,
       };
 }
 
-# Build branches list
-my $branches      = GetBranches();
-my $branches_loop = [];
-my $branchname;
-foreach ( sort keys %$branches ) {
-    my $selected = 0;
-    if ( $branch && $branch eq $_ ) {
-        $selected   = 1;
-        $branchname = $branches->{$_}->{'branchname'};
-    }
-    push @{$branches_loop},
-      {
-        branchcode => $_,
-        branchname => $branches->{$_}->{branchname},
-        selected   => $selected,
-      };
-}
-
 my $budgets = GetBudgets();
 my @budgets_loop;
 foreach my $budget (@$budgets) {
     push @budgets_loop, $budget if CanUserUseBudget( $loggedinuser, $budget, $flags );
 }
 
+my (@openedinvoices, @closedinvoices);
+for my $sub ( @{$invoices} ) {
+    unless ( $sub->{closedate} ) {
+        push @openedinvoices, $sub
+    } else {
+        push @closedinvoices, $sub
+    }
+}
+
 $template->{'VARS'}->{'budgets_loop'} = \@budgets_loop;
 
 $template->param(
+    openedinvoices => \@openedinvoices,
+    closedinvoices => \@closedinvoices,
     do_search => ( $op and $op eq 'do_search' ) ? 1 : 0,
     invoices => $invoices,
     invoicenumber   => $invoicenumber,
@@ -147,9 +139,7 @@ $template->param(
     publisher       => $publisher,
     publicationyear => $publicationyear,
     branch          => $branch,
-    branchname      => $branchname,
     suppliers_loop  => $suppliers_loop,
-    branches_loop   => $branches_loop,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;