Attachment #94947 for bug #20194

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

Lines 582-587 modules: Link Here

(-)a/admin/columns_settings.yml (+6 lines)
582	columnname: due_date	582	columnname: due_date
583	-	583	-
584	columnname: title	584	columnname: title
		585	-
		586	columnname: record_type
585	-	587	-
586	columnname: item_type	588	columnname: item_type
587	-	589	-
Lines 795-800 modules: Link Here
795	columnname: due_date	797	columnname: due_date
796	-	798	-
797	columnname: title	799	columnname: title
		800	-
		801	columnname: record_type
798	-	802	-
799	columnname: item_type	803	columnname: item_type
800	-	804	-
Lines 869-874 modules: Link Here
869	-	873	-
870	columnname: dateaccessioned	874	columnname: dateaccessioned
871	is_hidden: 1	875	is_hidden: 1
		876	-
		877	columnname: record_type
872	-	878	-
873	columnname: itype	879	columnname: itype
874	-	880	-

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
1	<tfoot>	1	<tfoot>
2	<tr>	2	<tr>
3	<td colspan="13" style="text-align: right; font-weight:bold;">Totals:</td>	3	<td colspan="14" style="text-align: right; font-weight:bold;">Totals:</td>
4	<td id="totaldue" style="text-align: right;"></td>	4	<td id="totaldue" style="text-align: right;"></td>
5	<td id="totalfine" style="text-align: right;"></td>	5	<td id="totalfine" style="text-align: right;"></td>
6	<td id="totalprice" style="text-align: right;"></td>	6	<td id="totalprice" style="text-align: right;"></td>

Lines 15-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
15	<th scope="col">Due date</th>	15	<th scope="col">Due date</th>
16	<th scope="col">Due date</th>	16	<th scope="col">Due date</th>
17	<th scope="col">Title</th>	17	<th scope="col">Title</th>
		18	<th scope="col">Record-level item type</th>
18	<th scope="col">Item type</th>	19	<th scope="col">Item type</th>
19	<th scope="col">Collection</th>	20	<th scope="col">Collection</th>
20	<th scope="col">Location</th>	21	<th scope="col">Location</th>

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc (+1 lines)
7	<th scope="col">Due date (unformatted, hidden)</th>	7	<th scope="col">Due date (unformatted, hidden)</th>
8	<th scope="col">Due date</th>	8	<th scope="col">Due date</th>
9	<th scope="col">Title</th>	9	<th scope="col">Title</th>
		10	<th scope="col">Record-level item type</th>
10	<th scope="col">Item type</th>	11	<th scope="col">Item type</th>
11	<th scope="col">Collection code</th>	12	<th scope="col">Collection code</th>
12	<th scope="col">Location</th>	13	<th scope="col">Location</th>

Lines 794-800 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +6 lines)
794	<th class="ci-shelvinglocation">Shelving location</th>	794	<th class="ci-shelvinglocation">Shelving location</th>
795	<th class="ci-callnumber">Call number</th>	795	<th class="ci-callnumber">Call number</th>
796	<th class="ci-dateaccessioned">Date acquired</th>	796	<th class="ci-dateaccessioned">Date acquired</th>
797	<th class="ci-type">Type</th>	797	<th class="ci-recordlevelitemtype">Record-level itemtype</th>
		798	<th class="ci-itemtype">Item type</th>
798	<th class="ci-patron">Patron</th>	799	<th class="ci-patron">Patron</th>
799	<th class="ci-note">Note</th>	800	<th class="ci-note">Note</th>
800	</tr>	801	</tr>
Lines 844-850 Link Here
844	<td class="ci-dateaccessioned">	845	<td class="ci-dateaccessioned">
845	[% riloo.dateaccessioned \| $KohaDates %]	846	[% riloo.dateaccessioned \| $KohaDates %]
846	</td>	847	</td>
847	<td class="ci-type">	848	<td class="ci-recordlevelitemtype">
		849	[% ItemTypes.GetDescription( riloo.recordtype ) \| html %]
		850	</td>
		851	<td class="ci-itemtype">
848	[% ItemTypes.GetDescription( riloo.itemtype ) \| html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) \| html %]	852	[% ItemTypes.GetDescription( riloo.itemtype ) \| html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) \| html %]
849	</td>	853	</td>
850	<td class="ci-patron">	854	<td class="ci-patron">

Lines 346-351 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +11 lines)
346	},	346	},
347	"sType": "anti-the"	347	"sType": "anti-the"
348	},	348	},
		349	{
		350	"mDataProp": function ( oObj ) {
		351	return oObj.recordtype_description.escapeHtml();
		352	}
		353	},
349	{	354	{
350	"mDataProp": function ( oObj ) {	355	"mDataProp": function ( oObj ) {
351	return oObj.itemtype_description.escapeHtml();	356	return oObj.itemtype_description.escapeHtml();
Lines 607-613 $(document).ready(function() { Link Here
607		612
608	// Build a summary of checkouts grouped by itemtype	613	// Build a summary of checkouts grouped by itemtype
609	var checkoutsByItype = json.aaData.reduce(function (obj, row) {	614	var checkoutsByItype = json.aaData.reduce(function (obj, row) {
610	obj[row.itemtype_description] = (obj[row.itemtype_description] \|\| 0) + 1;	615	obj[row.type_for_stat] = (obj[row.type_for_stat] \|\| 0) + 1;
611	return obj;	616	return obj;
612	}, {});	617	}, {});
613	var ul = $('<ul>');	618	var ul = $('<ul>');
Lines 724-729 $(document).ready(function() { Link Here
724	},	729	},
725	"sType": "anti-the"	730	"sType": "anti-the"
726	},	731	},
		732	{
		733	"mDataProp": function ( oObj ) {
		734	return oObj.recordtype_description.escapeHtml();
		735	}
		736	},
727	{	737	{
728	"mDataProp": function ( oObj ) {	738	"mDataProp": function ( oObj ) {
729	return oObj.itemtype_description.escapeHtml();	739	return oObj.itemtype_description.escapeHtml();

Lines 161-167 while ( my $c = $sth->fetchrow_hashref() ) { Link Here

(-)a/svc/checkouts (-3 / +5 lines)
161	my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =	161	my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
162	GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );	162	GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
163		163
164	my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );	164	my $type_for_stat = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
		165	my $itemtype = Koha::ItemTypes->find( $c->{itype} );
		166	my $recordtype = Koha::ItemTypes->find( $c->{itemtype} );
165	my $location;	167	my $location;
166	if ( $c->{location} ) {	168	if ( $c->{location} ) {
167	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });	169	my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
Lines 194-201 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
194	part_name => $c->{part_name} // '',	196	part_name => $c->{part_name} // '',
195	author => $c->{author},	197	author => $c->{author},
196	barcode => $c->{barcode},	198	barcode => $c->{barcode},
197	itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype},	199	type_for_stat => $type_for_stat ? $type_for_stat->translated_description : q{},
198	itemtype_description => $itemtype ? $itemtype->translated_description : q{},	200	itemtype_description => $itemtype ? $itemtype->translated_description : q{},
		201	recordtype_description => $recordtype ? $recordtype->translated_description : q{},
199	collection => $collection,	202	collection => $collection,
200	location => $location,	203	location => $location,
201	homebranch => $c->{homebranch},	204	homebranch => $c->{homebranch},
202	-

Return to bug 20194

Lines 589-594 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here

(-)a/circ/returns.pl (-1 / +3 lines)
589	my $item = Koha::Items->find({ barcode => $bar_code });	589	my $item = Koha::Items->find({ barcode => $bar_code });
590	next unless $item; # FIXME The item has been deleted in the meantime,	590	next unless $item; # FIXME The item has been deleted in the meantime,
591	# we could handle that better displaying a message in the template	591	# we could handle that better displaying a message in the template
		592
592	my $biblio = $item->biblio;	593	my $biblio = $item->biblio;
593	# FIXME pass $item to the template and we are done here...	594	# FIXME pass $item to the template and we are done here...
594	$ri{itembiblionumber} = $biblio->biblionumber;	595	$ri{itembiblionumber} = $biblio->biblionumber;
Lines 599-605 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
599	$ri{itemauthor} = $biblio->author;	600	$ri{itemauthor} = $biblio->author;
600	$ri{itemcallnumber} = $item->itemcallnumber;	601	$ri{itemcallnumber} = $item->itemcallnumber;
601	$ri{dateaccessioned} = $item->dateaccessioned;	602	$ri{dateaccessioned} = $item->dateaccessioned;
602	$ri{itemtype} = $item->effective_itemtype;	603	$ri{recordtype} = $biblio->itemtype;
		604	$ri{itemtype} = $item->itype;
603	$ri{itemnote} = $item->itemnotes;	605	$ri{itemnote} = $item->itemnotes;
604	$ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;	606	$ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
605	$ri{ccode} = $item->ccode;	607	$ri{ccode} = $item->ccode;