[Koha-patches] [PATCH] Bug 5872: Add missing columns and little bugfixes

[Julian Maurice]

Some columns are missing in issuingrules table. This patch adds them.
Some misplaced javascript code caused tabs to not display correctly in
circulation.pl
In admin/smart-rules.pl a variable was used without being declared.
---
 admin/smart-rules.pl                               |    3 ++-
 installer/data/mysql/kohastructure.sql             |    4 ++++
 installer/data/mysql/updatedatabase.pl             |   10 ++++++++++
 .../prog/en/modules/circ/circulation.tmpl          |    4 +---
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 6b98e84..d859c63 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -153,7 +153,8 @@ for my $rule ( @issuingrules ) {
     $rule->{'fine'}                        = sprintf('%.2f', $rule->{'fine'});
 }
 
-
+my $defaults;
+#$defaults = 0;
 $template->param(default_rules => ($defaults ? 1 : 0));
 
 $template->param(
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a62e07c..f7d2460 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -968,6 +968,10 @@ CREATE TABLE `issuingrules` (
   `renewalsallowed` smallint(6) NOT NULL default "0",
   `reservesallowed` smallint(6) NOT NULL default "0",
   `branchcode` varchar(10) NOT NULL default '',
+  `holdspickupdelay` int(11) default NULL,
+  `renewalperiod` int(11) default NULL,
+  `allowonshelfholds` tinyint(1) default NULL,
+  `holdrestricted` tinyint(1) default NULL,
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 8395644..74720bb 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4120,6 +4120,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = 'XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE issuingrules ADD holdspickupdelay int(11) default NULL");
+    $dbh->do("ALTER TABLE issuingrules ADD renewalperiod int(11) default NULL");
+    $dbh->do("ALTER TABLE issuingrules ADD allowonshelfholds tinyint(1) default NULL");
+    $dbh->do("ALTER TABLE issuingrules ADD holdrestricted tinyint(1) default NULL");
+    print "Upgrade to $DBversion done (Add missing columns in issuingrules table)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index dbb43d0..1788b32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -124,9 +124,7 @@ var allcheckboxes = $(".checkboxed");
         radioCheckBox($(this));
      });
  });
-   index = id.IndexOf("_");
-   return id.substr(index+1);
-}
+
 function uncheck_sibling(me){
 nodename=me.getAttribute("name");
 if (nodename =="barcodes[]"){
-- 
1.7.4.1