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

(-)a/catalogue/detail.pl (-1 / +10 lines)
Lines 243-248 foreach my $item (@items) { Link Here
243
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
243
        $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
244
    }
244
    }
245
245
246
    foreach my $f (qw( itemnotes nonpublicnote )) {
247
        if ($item->{$f}) {
248
            $item->{$f} =~ s|\n|<br />|g;
249
            $itemfields{$f} = 1;
250
        }
251
    }
252
   
246
    # item has a host number if its biblio number does not match the current bib
253
    # item has a host number if its biblio number does not match the current bib
247
    if ($item->{biblionumber} ne $biblionumber){
254
    if ($item->{biblionumber} ne $biblionumber){
248
        $item->{hostbiblionumber} = $item->{biblionumber};
255
        $item->{hostbiblionumber} = $item->{biblionumber};
Lines 258-263 foreach my $item (@items) { Link Here
258
    if ($item->{'materials'} ne ''){
265
    if ($item->{'materials'} ne ''){
259
	$materials_flag = 1;
266
	$materials_flag = 1;
260
    }
267
    }
268
261
    push @itemloop, $item;
269
    push @itemloop, $item;
262
}
270
}
263
271
Lines 276-282 $template->param( Link Here
276
	itemdata_uri        => $itemfields{uri},
284
	itemdata_uri        => $itemfields{uri},
277
	itemdata_copynumber => $itemfields{copynumber},
285
	itemdata_copynumber => $itemfields{copynumber},
278
	volinfo				=> $itemfields{enumchron},
286
	volinfo				=> $itemfields{enumchron},
279
    itemdata_itemnotes  => $itemfields{itemnotes},
287
	itemdata_itemnotes  => $itemfields{itemnotes},
288
	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
280
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
289
	z3950_search_params	=> C4::Search::z3950_search_args($dat),
281
    holdcount           => $holdcount,
290
    holdcount           => $holdcount,
282
        hostrecords         => $hostrecords,
291
        hostrecords         => $hostrecords,
(-)a/catalogue/moredetail.pl (+1 lines)
Lines 168-173 foreach my $item (@items){ Link Here
168
    } else {
168
    } else {
169
        $item->{'issue'}= 0;
169
        $item->{'issue'}= 0;
170
    }
170
    }
171
    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
171
}
172
}
172
$template->param(count => $data->{'count'},
173
$template->param(count => $data->{'count'},
173
	subscriptionsnumber => $subscriptionsnumber,
174
	subscriptionsnumber => $subscriptionsnumber,
(-)a/circ/returns.pl (+1 lines)
Lines 586-591 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
586
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
586
        $ri{itemcallnumber}   = $biblio->{'itemcallnumber'};
587
        $ri{itemtype}         = $biblio->{'itemtype'};
587
        $ri{itemtype}         = $biblio->{'itemtype'};
588
        $ri{itemnote}         = $biblio->{'itemnotes'};
588
        $ri{itemnote}         = $biblio->{'itemnotes'};
589
        $ri{nonpublicnote}    = $biblio->{'nonpublicnote'};
589
        $ri{ccode}            = $biblio->{'ccode'};
590
        $ri{ccode}            = $biblio->{'ccode'};
590
        $ri{itemnumber}       = $biblio->{'itemnumber'};
591
        $ri{itemnumber}       = $biblio->{'itemnumber'};
591
        $ri{barcode}          = $bar_code;
592
        $ri{barcode}          = $bar_code;
(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 756-761 CREATE TABLE `deleteditems` ( Link Here
756
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
756
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
757
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
757
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
758
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
758
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
759
  `nonpublicnote` mediumtext default NULL,
759
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
760
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
760
  `paidfor` mediumtext,
761
  `paidfor` mediumtext,
761
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
762
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
Lines 1022-1027 CREATE TABLE `items` ( -- holdings/item information Link Here
1022
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
1023
  `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved
1023
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
1024
  `restricted` tinyint(1) default NULL, -- authorized value defining use restrictions for this item (MARC21 952$5)
1024
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
1025
  `itemnotes` mediumtext, -- public notes on this item (MARC21 952$x)
1026
  `nonpublicnote` mediumtext default NULL,
1025
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
1027
  `holdingbranch` varchar(10) default NULL, -- foreign key from the branches table for the library that is currently in possession item (MARC21 952$b)
1026
  `paidfor` mediumtext,
1028
  `paidfor` mediumtext,
1027
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- date and time this item was last altered
1029
  `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 4734-4739 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4734
    SetVersion($DBversion);
4734
    SetVersion($DBversion);
4735
}
4735
}
4736
4736
4737
$DBversion = '3.07.00.XXX';
4738
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4739
    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
4740
    $dbh->do("ALTER TABLE deleteditems ADD COLUMN nonpublicnote MEDIUMTEXT AFTER itemnotes");
4741
    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
4742
    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";
4743
}
4744
4737
=head1 FUNCTIONS
4745
=head1 FUNCTIONS
4738
4746
4739
=head2 DropAllForeignKeys($table)
4747
=head2 DropAllForeignKeys($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 409-414 function verify_images() { Link Here
409
		    <td class="materials"> [% itemloo.materials %] </td>
410
		    <td class="materials"> [% itemloo.materials %] </td>
410
		[% END %]
411
		[% END %]
411
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
412
                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
413
                [% IF itemdata_nonpublicnote %]<td class="nonpublicnote">[% itemloo.nonpublicnote %]</td>[% END %]
412
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
414
		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
413
			<td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
415
			<td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
414
		[% END %]
416
		[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (+1 lines)
Lines 176-181 Link Here
176
		[% 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 %]
176
		[% 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 %]
177
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
177
                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
178
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
178
            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
179
            [% IF ITEM_DAT.nonpublicnote %]<li><span class="label">Non-public Note:</span> [% ITEM_DAT.nonpublicnote %]&nbsp;</li>[% END %]
179
            <li><span class="label">Public Note:</span>
180
            <li><span class="label">Public Note:</span>
180
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
181
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
181
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
182
              <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 716-722 No patron matched <span class="ex">[% message %]</span> Link Here
716
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
716
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
717
        [% todayissue.dd %]
717
        [% todayissue.dd %]
718
        </td>
718
        </td>
719
        <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>
719
        <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>
720
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
720
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
721
        <td>[% todayissue.checkoutdate %]</td>
721
        <td>[% todayissue.checkoutdate %]</td>
722
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
722
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
Lines 789-795 No patron matched <span class="ex">[% message %]</span> Link Here
789
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
789
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
790
        [% previssue.dd %]
790
        [% previssue.dd %]
791
        </td>
791
        </td>
792
        <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>
792
        <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>
793
        <td>
793
        <td>
794
            [% previssue.itemtype %]
794
            [% previssue.itemtype %]
795
        </td>
795
        </td>
Lines 897-903 No patron matched <span class="ex">[% message %]</span> Link Here
897
    [% END %]
897
    [% END %]
898
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
898
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
899
            [% relissue.dd %]</td>
899
            [% relissue.dd %]</td>
900
        <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>
900
        <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>
901
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
901
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
902
        <td>[% relissue.displaydate %]</td>
902
        <td>[% relissue.displaydate %]</td>
903
        <td>[% relissue.issuingbranchname %]</td>
903
        <td>[% relissue.issuingbranchname %]</td>
Lines 918-924 No patron matched <span class="ex">[% message %]</span> Link Here
918
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
918
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
919
        [% relprevissue.dd %]
919
        [% relprevissue.dd %]
920
        </td>
920
        </td>
921
        <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>
921
        <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>
922
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
922
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
923
        <td>[% relprevissue.displaydate %]</td>
923
        <td>[% relprevissue.displaydate %]</td>
924
        <td>[% relprevissue.issuingbranchname %]</td>
924
        <td>[% relprevissue.issuingbranchname %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 451-456 function Dopop(link) { Link Here
451
            [% ELSE %]Not checked out[% END %]</td>
451
            [% ELSE %]Not checked out[% END %]</td>
452
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
452
            <td>[% IF ( riloo.bornote ) %]<span class="circ-hlt">[% riloo.bornote %]<br /></span>[% END %]
453
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
453
            [% IF ( riloo.itemnote ) %]<span class="circ-hlt">[% riloo.itemnote %]</span>[% END %]
454
            [% IF ( riloo.nonpublicnote ) %]<span class="circ-hlt">[% riloo.nonpublicnote %]</span>[% END %]
454
            </td>
455
            </td>
455
           </tr>
456
           </tr>
456
        [% END %]
457
        [% END %]
457
- 

Return to bug 4222