gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'kc/master'

This commit is contained in:
Chris Cormack 2010-07-08 15:02:45 +12:00 committed by Chris Cormack
parent f46abf8b90 6127553c44
commit 89afee2810
15 changed files with 102 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Record.pm
View File

@ -362,7 +362,7 @@ sub marcrecord2csv {
# Getting the record
my $record = GetMarcBiblio($biblio);
next unless $record;
# Getting the framework
my $frameworkcode = GetFrameworkCode($biblio);

5
acqui/basketgroup.pl
View File

@ -238,7 +238,10 @@ sub printbasketgrouppdf{
}
$orders{$basket->{basketno}}=\@ba_orders;
}
print $input->header( -type => 'application/pdf', -attachment => $basketgroup->{name}.'.pdf' );
print $input->header(
-type => 'application/pdf',
-attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf'
);
my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} || C4::Context->preference("gist")) || die "pdf generation failed";
print $pdf;
exit;

2
acqui/newordersuggestion.pl
View File

@ -133,7 +133,7 @@ my $suggestions_loop =
author => $author,
title => $title,
publishercode => $publishercode,
status => 'ACCEPTED'});
STATUS => 'ACCEPTED'});
my $vendor = GetBookSellerFromId($supplierid);
$template->param(
suggestions_loop => $suggestions_loop,

32
debian/rules vendored
View File

@ -55,6 +55,38 @@ override_dh_auto_install:
install -m 0644 koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css \
koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \
$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \
-e 's:url(.*/skin.css.*):url(skin.css):' \
$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \

1
debian/scripts/koha-remove vendored
View File

@ -30,6 +30,7 @@ DROP DATABASE koha_$name;
FLUSH PRIVILEGES;
eof
koha-stop-zebra $name
rm "/etc/apache2/sites-available/$name"
rm "/etc/koha/sites/$name/koha-conf.xml"
rm "/etc/koha/sites/$name/zebra-biblios.cfg"

13
etc/zebradb/ccl.properties
View File

@ -775,6 +775,19 @@ Host-item 1=1033
# language and/or script.
#Title-parallel 1=35
#Video
video-mt 1=Video-mt
Video-mt video-mt
Graphics-type 1=Graphic-type
Graphics-support 1=Graphic-support
Type-Of-Serial 1=Type-Of-Serial
Frequency-code 1=Frequency-code
Regularity-code 1=Regularity-code
Material-type 1=Material-type
Literature-Code 1=Literature-Code
Biography-code 1=Biography-code
Illustration-code 1=Illustration-code
#Title-related- 1026 Serial titles related to this 247, 780, 785
#periodical item, either the immediate
# predecessor or the immediate

6
installer/data/mysql/kohastructure.sql
View File

@ -104,7 +104,8 @@ CREATE TABLE `authorised_values` (
`imageurl` varchar(200) default NULL,
PRIMARY KEY (`id`),
KEY `name` (`category`),
KEY `lib` (`lib`)
KEY `lib` (`lib`),
KEY `auth_value_idx` (`authorised_value`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
@ -279,7 +280,8 @@ CREATE TABLE `borrower_attribute_types` (
`password_allowed` tinyint(1) NOT NULL default 0,
`staff_searchable` tinyint(1) NOT NULL default 0,
`authorised_value_category` varchar(10) default NULL,
PRIMARY KEY (`code`)
PRIMARY KEY (`code`),
KEY `auth_val_cat_idx` (`authorised_value_category`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--

28
installer/data/mysql/updatedatabase.pl
View File

@ -2874,6 +2874,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$DBversion = '3.01.00.077';
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do("SET FOREIGN_KEY_CHECKS=0 ");
$dbh->do("DROP TABLE IF EXISTS `aqbudgetperiods` ");
$dbh->do(qq|
CREATE TABLE `aqbudgetperiods` (
@ -2890,7 +2892,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do(<<ADDPERIODS);
INSERT INTO aqbudgetperiods (budget_period_startdate,budget_period_enddate,budget_period_active,budget_period_description,budget_period_locked)
SELECT DISTINCT startdate, enddate, 1, concat(startdate," ",enddate),1 from aqbudget
SELECT DISTINCT startdate, enddate, NOW() BETWEEN startdate and enddate, concat(startdate," ",enddate),NOT NOW() BETWEEN startdate AND enddate from aqbudget
ADDPERIODS
# SORRY , NO AQBUDGET/AQBOOKFUND -> AQBUDGETS IMPORT JUST YET,
# BUT A NEW CLEAN AQBUDGETS TABLE CREATE FOR NOW..
@ -2906,18 +2908,19 @@ ADDPERIODS
#$dbh->do("drop table aqbudget;");
$dbh->do(<<BUDGETNAME);
ALTER TABLE aqbudget RENAME `aqbudgets`
BUDGETNAME
my $maxbudgetid=$dbh->selectcol_arrayref(<<IDsBUDGET);
SELECT MAX(aqbudgetid) from aqbudgets
my $maxbudgetid = $dbh->selectcol_arrayref(<<IDsBUDGET);
SELECT MAX(aqbudgetid) from aqbudget
IDsBUDGET
$$maxbudgetid[0] = 0 if !$$maxbudgetid[0];
$dbh->do(<<BUDGETAUTOINCREMENT);
ALTER TABLE `aqbudgets` AUTO_INCREMENT=$$maxbudgetid[0]
ALTER TABLE aqbudget AUTO_INCREMENT=$$maxbudgetid[0]
BUDGETAUTOINCREMENT
$dbh->do(<<BUDGETNAME);
ALTER TABLE aqbudget RENAME `aqbudgets`
BUDGETNAME
$dbh->do(<<BUDGETS);
ALTER TABLE `aqbudgets`
@ -2996,9 +2999,8 @@ BUDGETDROPDATES
# cannot do until aqorderbreakdown removed
# $dbh->do("DROP TABLE aqbookfund ");
# $dbh->do("ALTER TABLE aqorders ADD FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON UPDATE CASCADE " ); ????
$dbh->do("SET FOREIGN_KEY_CHECKS=1 ");
print "Upgrade to $DBversion done (Adding new aqbudgetperiods, aqbudgets and aqbudget_planning tables )\n";
SetVersion ($DBversion);
@ -3677,6 +3679,14 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){
SetVersion ($DBversion);
}
$DBversion = '3.01.00.143';
if (C4::Context->preference('Version') < TransformToNum($DBversion)){
$dbh->do(qq{CREATE INDEX auth_value_idx ON authorised_values (authorised_value)});
$dbh->do(qq{CREATE INDEX auth_val_cat_idx ON borrower_attribute_types (authorised_value_category)});
print "Create index on authorised_values and borrower_attribute_types (bug 4139)";
SetVersion ($DBversion);
}
=item DropAllForeignKeys($table)

2
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
View File

@ -6,7 +6,7 @@
You did not specify any search criteria.
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />
<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" ESCAPE="HTML" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>

2
kohaversion.pl
View File

@ -11,7 +11,7 @@ use strict;
sub kohaversion {
our $VERSION = '3.01.00.142';
our $VERSION = '3.01.00.143';
# version needs to be set this way
# so that it can be picked up by Makefile.PL

7
members/memberentry.pl
View File

@ -246,6 +246,11 @@ if ($op eq 'save' || $op eq 'insert'){
$template->param('ERROR_age_limitations' => "$low to $high");
}
}
if(C4::Context->preference('uppercasesurnames')) {
$newdata{'surname'} = uc($newdata{'surname'});
}
if (C4::Context->preference("IndependantBranches")) {
if ($userenv && $userenv->{flags} % 2 != 1){
$debug and print STDERR " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
@ -273,7 +278,7 @@ if ($op eq 'save' || $op eq 'insert'){
}
}
if ($op eq 'modify' || $op eq 'insert' || $op eq 'save' ){
if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save') and ($step == 0 or $step == 3 )){
if (exists ($newdata{'dateexpiry'}) && !($newdata{'dateexpiry'})){
my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
$newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);

18
opac/opac-ISBDdetail.pl
View File

@ -50,6 +50,7 @@ use C4::Output;
use CGI;
use MARC::Record;
use C4::Biblio;
use C4::Items;
use C4::Acquisition;
use C4::Review;
use C4::Serials; # uses getsubscriptionfrom biblionumber
@ -123,9 +124,19 @@ $template->param(
subscriptionsnumber => $subscriptionsnumber,
);
# my @blocs = split /\@/,$ISBD;
# my @fields = $record->fields();
my $norequests = 1;
my $res = GetISBDView($biblionumber, "opac");
my @items = &GetItemsInfo($biblionumber, 'opac');
my $itemtypes = GetItemTypes();
for my $itm (@items) {
$norequests = 0
if ( (not $itm->{'wthdrawn'} )
&& (not $itm->{'itemlost'} )
&& ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} )
&& (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
&& ($itm->{'itemnumber'} ) );
}
my $reviews = getreviews( $biblionumber, 1 );
foreach ( @$reviews ) {
@ -139,6 +150,9 @@ foreach ( @$reviews ) {
$template->param(
RequestOnOpac => C4::Context->preference("RequestOnOpac"),
AllowOnShelfHolds => C4::Context->preference('AllowOnShelfHolds'),
norequests => $norequests,
ISBD => $res,
biblionumber => $biblionumber,
reviews => $reviews,

1
opac/opac-basket.pl
View File

@ -62,6 +62,7 @@ foreach my $biblionumber ( @bibs ) {
my $dat = &GetBiblioData($biblionumber);
my $record = &GetMarcBiblio($biblionumber);
next unless $record;
my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );

1
opac/opac-downloadcart.pl
View File

@ -66,6 +66,7 @@ if ($bib_list && $format) {
foreach my $biblio (@bibs) {
my $record = GetMarcBiblio($biblio);
next unless $record;
switch ($format) {
case "iso2709" { $output .= $record->as_usmarc(); }

1
opac/opac-downloadshelf.pl
View File

@ -70,6 +70,7 @@ if ($shelfid && $format) {
my $biblionumber = $biblio->{biblionumber};
my $record = GetMarcBiblio($biblionumber);
next unless $record;
switch ($format) {
case "iso2709" { $output .= $record->as_usmarc(); }