BZ5432 follow-up, removing test string

[koha_fer] / admin / aqcontract.pl

diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 9476f06..07fb757 100755 (executable)
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -16,9 +16,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -35,7 +35,7 @@ my $contractnumber = $input->param('contractnumber');
 my $booksellerid   = $input->param('booksellerid');
 my $op             = $input->param('op') || '';
 
-my @bookseller = GetBookSellerFromId($booksellerid);
+my $bookseller = GetBookSellerFromId($booksellerid);
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "admin/aqcontract.tmpl",
@@ -50,8 +50,9 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 $template->param(
     contractnumber => $contractnumber,
     booksellerid   => $booksellerid,
-    booksellername => $bookseller[0]->{name},
+    booksellername => $bookseller->{name},
     DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    dateformat     => C4::Context->preference("dateformat"),
 );
 
 #ADD_FORM: called if $op is 'add_form'. Used to create form to add or  modify a record
@@ -98,7 +99,7 @@ elsif ( $op eq 'add_validate' ) {
         });
     }
 
-    print $input->redirect("aqcontract.pl?booksellerid=$booksellerid");
+    print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?supplierid=$booksellerid");
     exit;
 
     # END $OP eq ADD_VALIDATE
@@ -125,7 +126,7 @@ elsif ( $op eq 'delete_confirmed' ) {
 
     DelContract( { contractnumber => $contractnumber } );
 
-    print $input->redirect("aqcontract.pl?booksellerid=$booksellerid");
+    print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?supplierid=$booksellerid");
     exit;
 
     # END $OP eq DELETE_CONFIRMED