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

(-)a/C4/Auth.pm (+1 lines)
Lines 438-443 sub get_template_and_user { Link Here
438
            reviewson                 => C4::Context->preference("reviewson"),
438
            reviewson                 => C4::Context->preference("reviewson"),
439
            suggestion                => "" . C4::Context->preference("suggestion"),
439
            suggestion                => "" . C4::Context->preference("suggestion"),
440
            virtualshelves            => "" . C4::Context->preference("virtualshelves"),
440
            virtualshelves            => "" . C4::Context->preference("virtualshelves"),
441
	    catalgouinginprocess     => C4::Context->preference("catalgouinginprocess"),
441
            OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"),
442
            OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"),
442
            OpacAddMastheadLibraryPulldown => C4::Context->preference("OpacAddMastheadLibraryPulldown"),
443
            OpacAddMastheadLibraryPulldown => C4::Context->preference("OpacAddMastheadLibraryPulldown"),
443
            OPACXSLTDetailsDisplay           => C4::Context->preference("OPACXSLTDetailsDisplay"),
444
            OPACXSLTDetailsDisplay           => C4::Context->preference("OPACXSLTDetailsDisplay"),
(-)a/C4/Biblio.pm (+24 lines)
Lines 84-89 BEGIN { Link Here
84
      &GetFrameworkCode
84
      &GetFrameworkCode
85
      &GetPublisherNameFromIsbn
85
      &GetPublisherNameFromIsbn
86
      &TransformKohaToMarc
86
      &TransformKohaToMarc
87
      &GetInprocCount
87
88
88
      &CountItemsIssued
89
      &CountItemsIssued
89
    );
90
    );
Lines 366-371 sub ModBiblioframework { Link Here
366
    return 1;
367
    return 1;
367
}
368
}
368
369
370
=head2 GetInprocCount
371
372
  $count= &GetInprocCount()
373
374
Count of items in PROC shelving location. .
375
376
=cut
377
378
sub GetInprocCount {
379
    if (C4::Context->preference('NoZebra')) {
380
        # Read the index Koha-Auth-Number for this authid and count the lines
381
        my $result = C4::Search::NZanalyse("location=PROC");
382
        my @tab = split /;/,$result;
383
        return scalar @tab;
384
    } else {
385
        ### ZOOM search here
386
        my $query;
387
        $query= "location=PROC";
388
                my ($err,$res,$result) = C4::Search::SimpleSearch($query,0,10);
389
        return ($result);
390
    }
391
}
392
369
=head2 DelBiblio
393
=head2 DelBiblio
370
394
371
  my $error = &DelBiblio($dbh,$biblionumber);
395
  my $error = &DelBiblio($dbh,$biblionumber);
(-)a/cataloguing/addbooks.pl (+5 lines)
Lines 135-139 $template->param( Link Here
135
    z3950_search_params => C4::Search::z3950_search_args($query),
135
    z3950_search_params => C4::Search::z3950_search_args($query),
136
);
136
);
137
137
138
if (C4::Context->preference('catalgouinginprocess')) {
139
#Count of items in PROC shelving location.
140
$template->param('inproccount' =>GetInprocCount());
141
}
142
138
output_html_with_http_headers $input, $cookie, $template->output;
143
output_html_with_http_headers $input, $cookie, $template->output;
139
144
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (-1 / +2 lines)
Lines 163-169 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
163
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');
163
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');
164
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo');
164
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo');
165
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo');
165
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo');
166
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoZebraIndexes','\'title\' => \'130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a\',\r\n\'author\' => \'100a,100b,100c,100d,110a,111a,111b,111c,111d,245c,700a,710a,711a,800a,810a,811a\',\r\n\'isbn\' => \'020a\',\r\n\'issn\' => \'022a\',\r\n\'lccn\' => \'010a\',\r\n\'biblionumber\' => \'999c\',\r\n\'itemtype\' => \'942c\',\r\n\'publisher\' => \'260b\',\r\n\'date\' => \'260c\',\r\n\'note\' => \'500a, 501a,504a,505a,508a,511a,518a,520a,521a,522a,524a,526a,530a,533a,538a,541a,546a,555a,556a,562a,563a,583a,585a,582a\',\r\n\'subject\' => \'600*,610*,611*,630*,650*,651*,653*,654*,655*,662*,690*\',\r\n\'dewey\' => \'082\',\r\n\'bc\' => \'952p\',\r\n\'callnum\' => \'952o\',\r\n\'an\' => \'6009,6109,6119\',\r\n\'homebranch\' => \'952a,952c\'','Enter a specific hash for NoZebra indexes. Enter : \'indexname\' => \'100a,245a,500*\',\'index2\' => \'...\'','70|10','Textarea');
166
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoZebraIndexes','\'title\' => \'130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a\',\r\n\'author\' => \'100a,100b,100c,100d,110a,111a,111b,111c,111d,245c,700a,710a,711a,800a,810a,811a\',\r\n\'isbn\' => \'020a\',\r\n\'issn\' => \'022a\',\r\n\'lccn\' => \'010a\',\r\n\'biblionumber\' => \'999c\',\r\n\'itemtype\' => \'942c\',\r\n\'publisher\' => \'260b\',\r\n\'date\' => \'260c\',\r\n\'note\' => \'500a, 501a,504a,505a,508a,511a,518a,520a,521a,522a,524a,526a,530a,533a,538a,541a,546a,555a,556a,562a,563a,583a,585a,582a\',\r\n\'subject\' => \'600*,610*,611*,630*,650*,651*,653*,654*,655*,662*,690*\',\r\n\'dewey\' => \'082\',\r\n\'bc\' => \'952p\',\r\n\'callnum\' => \'952o\',\r\n\'an\' => \'6009,6109,6119\',\r\n\'location\' => \'952c\',\r\n\'homebranch\' => \'952a,952b\'','Enter a specific hash for NoZebra indexes. Enter : \'indexname\' => \'100a,245a,500*\',\'index2\' => \'...\'','70|10','Textarea');
167
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'If ON, users can renew their issues directly from their OPAC account',NULL,'YesNo');
167
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'If ON, users can renew their issues directly from their OPAC account',NULL,'YesNo');
168
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
168
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer');
169
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','holdingbranch|homebranch','Choice');
169
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','holdingbranch|homebranch','Choice');
Lines 278-280 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
278
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
278
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
279
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice');
279
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice');
280
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo');
280
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo');
281
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('catalgouinginprocess','0','Display list of items which are to be cataloged in the cataloguing home page.','','YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +6 lines)
Lines 3915-3921 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3915
    SetVersion ($DBversion);
3915
    SetVersion ($DBversion);
3916
}
3916
}
3917
3917
3918
3918
$DBversion = '3.03.00.010';
3919
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3920
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('catalgouinginprocess','0','Display list of items which are to be cataloged in the cataloguing home page.','','YesNo')");
3921
    print "Upgrade to $DBversion done (Display list of items which are to be cataloged in the cataloguing home page.)\n";
3922
    SetVersion ($DBversion);
3923
}
3919
3924
3920
=head1 FUNCTIONS
3925
=head1 FUNCTIONS
3921
3926
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloguing-menu.inc (+7 lines)
Line 0 Link Here
1
<ul>
2
<!-- TMPL_IF name="inproccount" -->
3
<li>
4
<a href="/cgi-bin/koha/catalogue/search.pl?idx=location&q=PROC&idx=location&idx=location&sort_by=relevance">Cataloguing in Progress[<!-- TMPL_VAR NAME="inproccount" -->]</a></li>
5
<!-- /TMPL_IF -->
6
</ul>
7
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref (+6 lines)
Lines 100-105 Cataloging: Link Here
100
                  economical: Do
100
                  economical: Do
101
            - collapse repeated tags of the same type into one tag entry on the display.
101
            - collapse repeated tags of the same type into one tag entry on the display.
102
        -
102
        -
103
            - pref: catalgouinginprocess
104
              choices:
105
                  yes: Show
106
                  no: "Don't show"
107
            - Display list of items which are to be cataloged in the cataloguing home page.
108
        -
103
            - By default, display biblio records in
109
            - By default, display biblio records in
104
            - pref: IntranetBiblioDefaultView
110
            - pref: IntranetBiblioDefaultView
105
              choices:
111
              choices:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl (-1 / +3 lines)
Lines 13-19 Link Here
13
<!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
13
<!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Cataloging</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Cataloging</div>
16
16
<div id="doc3" class="yui-t2">
17
<!-- TMPL_INCLUDE NAME="cataloguing-menu.inc" -->
18
</div>
17
<div id="doc" class="yui-t7">
19
<div id="doc" class="yui-t7">
18
20
19
   <div id="bd">
21
   <div id="bd">
(-)a/kohaversion.pl (-2 / +1 lines)
Lines 16-22 the kohaversion is divided in 4 parts : Link Here
16
use strict;
16
use strict;
17
17
18
sub kohaversion {
18
sub kohaversion {
19
    our $VERSION = '3.03.00.009';
19
    our $VERSION = '3.03.00.010';
20
    # version needs to be set this way
20
    # version needs to be set this way
21
    # so that it can be picked up by Makefile.PL
21
    # so that it can be picked up by Makefile.PL
22
    # during install
22
    # during install
23
- 

Return to bug 5523