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

(-)a/catalogue/detail.pl (-1 / +10 lines)
Lines 245-250 foreach my $item (@items) { Link Here
245
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
245
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
246
    }
246
    }
247
247
248
    foreach my $f (qw( itemnotes nonpublicnote )) {
249
        if ($item->{$f}) {
250
            $item->{$f} =~ s|\n|<br />|g;
251
            $itemfields{$f} = 1;
252
        }
253
    }
254
248
    # item has a host number if its biblio number does not match the current bib
255
    # item has a host number if its biblio number does not match the current bib
249
    if ($item->{biblionumber} ne $biblionumber){
256
    if ($item->{biblionumber} ne $biblionumber){
250
        $item->{hostbiblionumber} = $item->{biblionumber};
257
        $item->{hostbiblionumber} = $item->{biblionumber};
Lines 260-265 foreach my $item (@items) { Link Here
260
    if ($item->{'materials'} ne ''){
267
    if ($item->{'materials'} ne ''){
261
	$materials_flag = 1;
268
	$materials_flag = 1;
262
    }
269
    }
270
263
    push @itemloop, $item;
271
    push @itemloop, $item;
264
}
272
}
265
273
Lines 278-284 $template->param( Link Here
278
	itemdata_uri        => $itemfields{uri},
286
	itemdata_uri        => $itemfields{uri},
279
	itemdata_copynumber => $itemfields{copynumber},
287
	itemdata_copynumber => $itemfields{copynumber},
280
	volinfo				=> $itemfields{enumchron},
288
	volinfo				=> $itemfields{enumchron},
281
    itemdata_itemnotes  => $itemfields{itemnotes},
289
      itemdata_itemnotes  => $itemfields{itemnotes},
290
 itemdata_nonpublicnote  => $itemfields{nonpublicnote},
282
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
291
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
283
    holdcount           => $holdcount,
292
    holdcount           => $holdcount,
284
        hostrecords         => $hostrecords,
293
        hostrecords         => $hostrecords,
(-)a/catalogue/moredetail.pl (+1 lines)
Lines 183-188 foreach my $item (@items){ Link Here
183
        }
183
        }
184
    }
184
    }
185
185
186
    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
186
}
187
}
187
$template->param(count => $data->{'count'},
188
$template->param(count => $data->{'count'},
188
	subscriptionsnumber => $subscriptionsnumber,
189
	subscriptionsnumber => $subscriptionsnumber,
(-)a/circ/returns.pl (+1 lines)
Lines 588-593 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
588
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
588
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
589
        $ri{itemtype}         = $biblio->{'itemtype'};
589
        $ri{itemtype}         = $biblio->{'itemtype'};
590
        $ri{itemnote}         = $biblio->{'itemnotes'};
590
        $ri{itemnote}         = $biblio->{'itemnotes'};
591
        $ri{nonpublicnote}    = $biblio->{'nonpublicnote'};
591
        $ri{ccode}            = $biblio->{'ccode'};
592
        $ri{ccode}            = $biblio->{'ccode'};
592
        $ri{itemnumber}       = $biblio->{'itemnumber'};
593
        $ri{itemnumber}       = $biblio->{'itemnumber'};
593
        $ri{barcode}          = $bar_code;
594
        $ri{barcode}          = $bar_code;
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 765-770 CREATE TABLE `deleteditems` ( Link Here
765
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
765
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
766
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
766
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
767
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
767
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
768
  `nonpublicnote` mediumtext default NULL,
768
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
769
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
769
  `paidfor` mediumtext,
770
  `paidfor` mediumtext,
770
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
771
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
Lines 1032-1037 CREATE TABLE `items` ( -- holdings/item information Link Here
1032
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
1033
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
1033
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
1034
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
1034
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
1035
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
1036
  `nonpublicnote` mediumtext default NULL,
1035
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
1037
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
1036
  `paidfor` mediumtext,
1038
  `paidfor` mediumtext,
1037
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
1039
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 5336-5341 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5336
    SetVersion($DBversion);
5336
    SetVersion($DBversion);
5337
}
5337
}
5338
5338
5339
$DBversion = '3.09.00.XXX';
5340
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
5341
    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
5342
    $dbh->do("ALTER TABLE deleteditems ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
5343
    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
5344
    print "Upgrade to $DBversion done (Make nonpublicnote easier to use. <b>If you have mapped your items to a MARC field other than 952 (system default), please check your Koha to MARC mapping for items.nonpublicnote</b>)\n";
5345
}
5346
5339
=head1 FUNCTIONS
5347
=head1 FUNCTIONS
5340
5348
5341
=head2 TableExists($table)
5349
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+2 lines)
Lines 281-286 function verify_images() { Link Here
281
                [% IF ( itemdata_copynumber ) %]<th>Copy no.</th>[% END %]
281
                [% IF ( itemdata_copynumber ) %]<th>Copy no.</th>[% END %]
282
                [% IF materials %]<th>Materials specified</th>[% END %]
282
                [% IF materials %]<th>Materials specified</th>[% END %]
283
                [% IF ( itemdata_itemnotes ) %]<th>Public notes</th>[% END %]
283
                [% IF ( itemdata_itemnotes ) %]<th>Public notes</th>[% END %]
284
                [% IF itemdata_nonpublicnote %]<th>Non-public note</th>[% END %]
284
        [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
285
        [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
285
        [% IF ( hostrecords ) %]<th>Host records</th>[% END %]
286
        [% IF ( hostrecords ) %]<th>Host records</th>[% END %]
286
		[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
287
		[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
Lines 405-410 function verify_images() { Link Here
405
		    <td class="materials"> [% itemloo.materials %] </td>
406
		    <td class="materials"> [% itemloo.materials %] </td>
406
		[% END %]
407
		[% END %]
407
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
408
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
409
                [% IF itemdata_nonpublicnote %]<td class="nonpublicnote">[% itemloo.nonpublicnote %]</td>[% END %]
408
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
410
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
409
            <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print label</a></td>
411
            <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print label</a></td>
410
		[% END %]
412
		[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (+1 lines)
Lines 206-211 Link Here
206
                [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
206
                [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
207
                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>[% END %]
207
                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>[% END %]
208
                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>[% END %]
208
                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>[% END %]
209
                [% IF ( ITEM_DAT.nonpublicnote ) %]<li><span class="label">Non-public note:</span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>[% END %]
209
                <li><span class="label">Public note:</span>
210
                <li><span class="label">Public note:</span>
210
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
211
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
211
                <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
212
                <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +4 lines)
Lines 726-732 No patron matched <span class="ex">[% message %]</span> Link Here
726
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
726
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
727
        [% todayissue.dd %]
727
        [% todayissue.dd %]
728
        </td>
728
        </td>
729
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
729
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %][% IF ( todayissue.nonpublicnote ) %]- <span class="circ-hlt">[% todayissue.nonpublicnote %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
730
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
730
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
731
        <td>[% todayissue.checkoutdate %]</td>
731
        <td>[% todayissue.checkoutdate %]</td>
732
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
732
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
Lines 799-805 No patron matched <span class="ex">[% message %]</span> Link Here
799
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
799
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
800
        [% previssue.dd %]
800
        [% previssue.dd %]
801
        </td>
801
        </td>
802
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
802
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
803
        <td>
803
        <td>
804
            [% previssue.itemtype %]
804
            [% previssue.itemtype %]
805
        </td>
805
        </td>
Lines 907-913 No patron matched <span class="ex">[% message %]</span> Link Here
907
    [% END %]
907
    [% END %]
908
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
908
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
909
            [% relissue.dd %]</td>
909
            [% relissue.dd %]</td>
910
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
910
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %][% IF ( relissue.nonpublicnote ) %]- <span class="circ-hlt">[% relissue.nonpublicnote %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
911
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
911
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
912
        <td>[% relissue.displaydate %]</td>
912
        <td>[% relissue.displaydate %]</td>
913
        <td>[% relissue.issuingbranchname %]</td>
913
        <td>[% relissue.issuingbranchname %]</td>
Lines 928-934 No patron matched <span class="ex">[% message %]</span> Link Here
928
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
928
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
929
        [% relprevissue.dd %]
929
        [% relprevissue.dd %]
930
        </td>
930
        </td>
931
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
931
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
932
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
932
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
933
        <td>[% relprevissue.displaydate %]</td>
933
        <td>[% relprevissue.displaydate %]</td>
934
        <td>[% relprevissue.issuingbranchname %]</td>
934
        <td>[% relprevissue.issuingbranchname %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 453-458 $(document).ready(function () { Link Here
453
            [% ELSE %]Not checked out[% END %]</td>
453
            [% ELSE %]Not checked out[% END %]</td>
454
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
454
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
455
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
455
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
456
            [% IF ( riloo.nonpublicnote ) %]<span class="circ-hlt">[% riloo.nonpublicnote %]</span>[% END %]
456
            </td>
457
            </td>
457
           </tr>
458
           </tr>
458
        [% END %]
459
        [% END %]
459
- 

Return to bug 4222