View | Details | Raw Unified | Return to bug 5872
Collapse All | Expand All

(-)a/admin/smart-rules.pl (-1 / +2 lines)
Lines 153-159 for my $rule ( @issuingrules ) { Link Here
153
    $rule->{'fine'}                        = sprintf('%.2f', $rule->{'fine'});
153
    $rule->{'fine'}                        = sprintf('%.2f', $rule->{'fine'});
154
}
154
}
155
155
156
156
my $defaults;
157
#$defaults = 0;
157
$template->param(default_rules => ($defaults ? 1 : 0));
158
$template->param(default_rules => ($defaults ? 1 : 0));
158
159
159
$template->param(
160
$template->param(
(-)a/installer/data/mysql/kohastructure.sql (+4 lines)
Lines 968-973 CREATE TABLE `issuingrules` ( Link Here
968
  `renewalsallowed` smallint(6) NOT NULL default "0",
968
  `renewalsallowed` smallint(6) NOT NULL default "0",
969
  `reservesallowed` smallint(6) NOT NULL default "0",
969
  `reservesallowed` smallint(6) NOT NULL default "0",
970
  `branchcode` varchar(10) NOT NULL default '',
970
  `branchcode` varchar(10) NOT NULL default '',
971
  `holdspickupdelay` int(11) default NULL,
972
  `renewalperiod` int(11) default NULL,
973
  `allowonshelfholds` tinyint(1) default NULL,
974
  `holdrestricted` tinyint(1) default NULL,
971
  PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
975
  PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
972
  KEY `categorycode` (`categorycode`),
976
  KEY `categorycode` (`categorycode`),
973
  KEY `itemtype` (`itemtype`)
977
  KEY `itemtype` (`itemtype`)
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 4120-4125 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4120
    SetVersion ($DBversion);
4120
    SetVersion ($DBversion);
4121
}
4121
}
4122
4122
4123
$DBversion = 'XXX';
4124
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4125
    $dbh->do("ALTER TABLE issuingrules ADD holdspickupdelay int(11) default NULL");
4126
    $dbh->do("ALTER TABLE issuingrules ADD renewalperiod int(11) default NULL");
4127
    $dbh->do("ALTER TABLE issuingrules ADD allowonshelfholds tinyint(1) default NULL");
4128
    $dbh->do("ALTER TABLE issuingrules ADD holdrestricted tinyint(1) default NULL");
4129
    print "Upgrade to $DBversion done (Add missing columns in issuingrules table)\n";
4130
    SetVersion ($DBversion);
4131
}
4132
4123
=head1 FUNCTIONS
4133
=head1 FUNCTIONS
4124
4134
4125
=head2 DropAllForeignKeys($table)
4135
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl (-4 / +1 lines)
Lines 124-132 var allcheckboxes = $(".checkboxed"); Link Here
124
        radioCheckBox($(this));
124
        radioCheckBox($(this));
125
     });
125
     });
126
 });
126
 });
127
   index = id.IndexOf("_");
127
128
   return id.substr(index+1);
129
}
130
function uncheck_sibling(me){
128
function uncheck_sibling(me){
131
nodename=me.getAttribute("name");
129
nodename=me.getAttribute("name");
132
if (nodename =="barcodes[]"){
130
if (nodename =="barcodes[]"){
133
- 

Return to bug 5872