From 00f68f1dbf594d26d960e4115c9813af1268104a Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 26 Aug 2012 00:29:53 +0200 Subject: [PATCH] Bug 8415: Follow up - Fixing some smaller issues 1) Changes the updatedatabase to be a bit more precise and always add the new field after claimed_date, like it is in kohastructure.sql. 2) Fixes capitalization rules for the new link to create a serial order. 3) Hides EAN search field when marcflavour is not UNIMARC. --- acqui/newordersubscription.pl | 1 + installer/data/mysql/updatedatabase.pl | 4 ++-- .../en/includes/acquisitions-add-to-basket.inc | 2 +- .../prog/en/includes/subscriptions-search.inc | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/acqui/newordersubscription.pl b/acqui/newordersubscription.pl index 86db2e2..948fea3 100755 --- a/acqui/newordersubscription.pl +++ b/acqui/newordersubscription.pl @@ -104,5 +104,6 @@ $template->param( basketname => $basket->{'basketname'}, booksellername => $bookseller->{'name'}, unfolded_search => 1, + marcflavour => uc(C4::Context->preference("marcflavour")), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 6f50be3..f429a4b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5637,8 +5637,8 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = "3.09.00.XXX"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - $dbh->do("ALTER TABLE `aqorders` ADD `subscriptionid` int(11) default NULL"); - print "Upgrade to $DBversion done (Alter table aqorders done)\n"; + $dbh->do("ALTER TABLE `aqorders` ADD `subscriptionid` int(11) default NULL AFTER `claimed_date`"); + print "Upgrade to $DBversion done (Add subscriptionid to table aqorders)\n"; SetVersion ($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 0391df7..a7a64b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -6,7 +6,7 @@