X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Finvoice.pl;h=5971ed161a2e5465cf3195e0cdc2d71aec9df5e2;hb=54616c37e25b969907f9da2cf021e7e23ced836c;hp=6e6bb25138c7f16e30fd771a390ec829565e2464;hpb=0db3cccf87fdb14b5556a8a1044d89a5b2baabc5;p=koha.git

diff --git a/acqui/invoice.pl b/acqui/invoice.pl
index 6e6bb25138..5971ed161a 100755
--- a/acqui/invoice.pl
+++ b/acqui/invoice.pl
@@ -83,9 +83,20 @@ elsif ( $op && $op eq 'mod' ) {
         ReopenInvoice($invoiceid);
     } elsif ($input->param('close')) {
         CloseInvoice($invoiceid);
+    } elsif ($input->param('merge')) {
+        my @sources = $input->param('merge');
+        MergeInvoices($invoiceid, \@sources);
     }
     $template->param( modified => 1 );
 }
+elsif ( $op && $op eq 'delete' ) {
+    DelInvoice($invoiceid);
+    my $referer = $input->param('referer') || 'invoices.pl';
+    if ($referer) {
+        print $input->redirect($referer);
+        exit 0;
+    }
+}
 
 my $details     = GetInvoiceDetails($invoiceid);
 my $bookseller  = GetBookSellerFromId( $details->{booksellerid} );
@@ -185,7 +196,7 @@ $template->param(
     invoiceid        => $details->{'invoiceid'},
     invoicenumber    => $details->{'invoicenumber'},
     suppliername     => $details->{'suppliername'},
-    supplierid       => $details->{'booksellerid'},
+    booksellerid       => $details->{'booksellerid'},
     datereceived     => $details->{'datereceived'},
     shipmentdate     => $details->{'shipmentdate'},
     billingdate      => $details->{'billingdate'},