X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fparcels.pl;h=df02e21c7c4a8e6e55aadc721370a51a771a2a90;hb=b027b47aa08e6c1735d2e1bc51185fa46cd3038d;hp=fdb46d574429552676bd4eb34afb6dc1148c7358;hpb=108e901043f0766f8c103f3826b5af1cdb6daaa4;p=koha.git

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index fdb46d5744..df02e21c7c 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -44,9 +44,9 @@ To know the supplier this script has to show orders.
 sort list of order by 'orderby'.
 Orderby can be equals to
     * datereceived desc (default value)
-    * aqorders.booksellerinvoicenumber
+    * invoicenumber
     * datereceived
-    * aqorders.booksellerinvoicenumber desc
+    * invoicenumber desc
 
 =item filter
 
@@ -75,18 +75,20 @@ use C4::Output;
 use C4::Dates qw/format_date/;
 use C4::Acquisition;
 use C4::Bookseller qw/ GetBookSellerFromId /;
+use C4::Budgets;
 
 my $input          = CGI->new;
 my $booksellerid     = $input->param('booksellerid');
-my $order          = $input->param('orderby') || 'datereceived desc';
+my $order          = $input->param('orderby') || 'shipmentdate desc';
 my $startfrom      = $input->param('startfrom');
 my $code           = $input->param('filter');
 my $datefrom       = $input->param('datefrom');
 my $dateto         = $input->param('dateto');
 my $resultsperpage = $input->param('resultsperpage');
+my $op             = $input->param('op');
 $resultsperpage ||= 20;
 
-our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => 'acqui/parcels.tmpl',
         query           => $input,
         type            => 'intranet',
@@ -96,8 +98,56 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my $invoicenumber = $input->param('invoice');
+my $shipmentdate = $input->param('shipmentdate');
+my $shipmentcost = $input->param('shipmentcost');
+my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid');
+if($shipmentdate) {
+    $shipmentdate = C4::Dates->new($shipmentdate)->output('iso');
+}
+
+if ( $op and $op eq 'new' ) {
+    if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) {
+        my @invoices = GetInvoices(
+            supplierid    => $booksellerid,
+            invoicenumber => $invoicenumber,
+        );
+        if ( scalar @invoices > 0 ) {
+            $template->{'VARS'}->{'duplicate_invoices'} = \@invoices;
+            $template->{'VARS'}->{'invoicenumber'}      = $invoicenumber;
+            $template->{'VARS'}->{'shipmentdate'}       = $shipmentdate;
+            $template->{'VARS'}->{'shipmentcost'}       = $shipmentcost;
+            $template->{'VARS'}->{'shipmentcost_budgetid'} =
+              $shipmentcost_budgetid;
+        }
+    }
+    $op = 'confirm' unless $template->{'VARS'}->{'duplicate_invoices'};
+}
+if ($op and $op eq 'confirm') {
+    my $invoiceid = AddInvoice(
+        invoicenumber => $invoicenumber,
+        booksellerid => $booksellerid,
+        shipmentdate => $shipmentdate,
+        shipmentcost => $shipmentcost,
+        shipmentcost_budgetid => $shipmentcost_budgetid,
+    );
+    if(defined $invoiceid) {
+        # Successful 'Add'
+        print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
+        exit 0;
+    } else {
+        $template->param(error_failed_to_create_invoice => 1);
+    }
+}
+
 my $bookseller = GetBookSellerFromId($booksellerid);
-my @parcels = GetParcels( $booksellerid, $order, $code, $datefrom, $dateto );
+my @parcels = GetInvoices(
+    supplierid => $booksellerid,
+    invoicenumber => $code,
+    shipmentdatefrom => $datefrom,
+    shipmentdateto => $dateto,
+    order_by => $order
+);
 my $count_parcels = @parcels;
 
 # multi page display gestion
@@ -114,19 +164,40 @@ for my $i ( $startfrom .. $last_row) {
 
     push @{$loopres},
       { number           => $i + 1,
-        code             => $p->{booksellerinvoicenumber},
-        nullcode         => $p->{booksellerinvoicenumber} eq 'NULL',
-        emptycode        => $p->{booksellerinvoicenumber} eq q{},
-        raw_datereceived => $p->{datereceived},
-        datereceived     => format_date( $p->{datereceived} ),
-        bibcount         => $p->{biblio},
-        reccount         => $p->{itemsreceived},
-        itemcount        => $p->{itemsexpected},
+        invoiceid        => $p->{invoiceid},
+        code             => $p->{invoicenumber},
+        nullcode         => $p->{invoicenumber} eq 'NULL',
+        emptycode        => $p->{invoicenumber} eq q{},
+        raw_datereceived => $p->{shipmentdate},
+        datereceived     => format_date( $p->{shipmentdate} ),
+        bibcount         => $p->{receivedbiblios} || 0,
+        reccount         => $p->{receiveditems} || 0,
+        itemcount        => $p->{itemsexpected} || 0,
       };
 }
 if ($count_parcels) {
     $template->param( searchresults => $loopres, count => $count_parcels );
 }
+
+# build budget list
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy;
+foreach my $r (@{$budgets}) {
+    next unless (CanUserUseBudget($loggedinuser, $r, $flags));
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
+    }
+    push @{$budget_loop}, {
+        b_id  => $r->{budget_id},
+        b_txt => $r->{budget_name},
+        b_active => $r->{budget_period_active},
+    };
+}
+
+@{$budget_loop} =
+  sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
+
+
 $template->param(
     orderby                  => $order,
     filter                   => $code,
@@ -134,10 +205,10 @@ $template->param(
     dateto                   => $dateto,
     resultsperpage           => $resultsperpage,
     name                     => $bookseller->{'name'},
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    datereceived_today       => C4::Dates->new()->output(),
+    shipmentdate_today       => C4::Dates->new()->output(),
     booksellerid             => $booksellerid,
     GST                      => C4::Context->preference('gist'),
+    budgets                  => $budget_loop,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;