Attachment #111733 for bug #19351

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

Lines 797-802 modules: Link Here

(-)a/admin/columns_settings.yml (+4 lines)
797	columnname: checkout_from	797	columnname: checkout_from
798	-	798	-
799	columnname: callno	799	columnname: callno
		800	-
		801	columnname: copynumber
800	-	802	-
801	columnname: charge	803	columnname: charge
802	-	804	-
Lines 1060-1065 modules: Link Here
1060	columnname: checkout_from	1062	columnname: checkout_from
1061	-	1063	-
1062	columnname: callno	1064	columnname: callno
		1065	-
		1066	columnname: copynumber
1063	-	1067	-
1064	columnname: charge	1068	columnname: charge
1065	-	1069	-

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="14" style="text-align: right; font-weight:bold;">Totals:</td>	3	<td colspan="15" 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 24-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
24	<th scope="col">Checked out on</th>	24	<th scope="col">Checked out on</th>
25	<th scope="col">Checked out from</th>	25	<th scope="col">Checked out from</th>
26	<th scope="col">Call no</th>	26	<th scope="col">Call no</th>
		27	<th scope="col">Copy no</th>
27	<th scope="col">Charge</th>	28	<th scope="col">Charge</th>
28	<th scope="col">Fine</th>	29	<th scope="col">Fine</th>
29	<th scope="col">Price</th>	30	<th scope="col">Price</th>

Lines 399-404 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+10 lines)
399	return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );	399	return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
400	}	400	}
401	},	401	},
		402	{
		403	"mDataProp": function ( oObj ) {
		404	return ( oObj.copynumber ? oObj.copynumber.escapeHtml() : '' );
		405	}
		406	},
402	{	407	{
403	"mDataProp": function ( oObj ) {	408	"mDataProp": function ( oObj ) {
404	if ( ! oObj.charge ) oObj.charge = 0;	409	if ( ! oObj.charge ) oObj.charge = 0;
Lines 770-775 $(document).ready(function() { Link Here
770	return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );	775	return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
771	}	776	}
772	},	777	},
		778	{
		779	"mDataProp": function ( oObj ) {
		780	return ( oObj.copynumber ? oObj.copynumber.escapeHtml() : '' );
		781	}
		782	},
773	{	783	{
774	"mDataProp": function ( oObj ) {	784	"mDataProp": function ( oObj ) {
775	if ( ! oObj.charge ) oObj.charge = 0;	785	if ( ! oObj.charge ) oObj.charge = 0;




        items.itemnotes,
        items.itemnotes_nonpublic,
        items.itemcallnumber,
        items.copynumber,
        items.replacementprice,

        issues.branchcode,

        itemnotes_nonpublic  => $c->{itemnotes_nonpublic},
        branchcode           => $c->{branchcode},
        branchname           => $c->{branchname},
        itemcallnumber       => $c->{itemcallnumber} || q{},
        copynumber           => $c->{copynumber} || q{},
        charge         => $charge,
        fine           => $fine,
        price          => $c->{replacementprice} || q{},
- 

Return to bug 19351

Lines 85-90 my $sql = ' Link Here

(-)a/svc/checkouts (-2 / +3 lines)
85	items.itemnotes,	85	items.itemnotes,
86	items.itemnotes_nonpublic,	86	items.itemnotes_nonpublic,
87	items.itemcallnumber,	87	items.itemcallnumber,
		88	items.copynumber,
88	items.replacementprice,	89	items.replacementprice,
89		90
90	issues.branchcode,	91	issues.branchcode,
Lines 221-227 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
221	itemnotes_nonpublic => $c->{itemnotes_nonpublic},	222	itemnotes_nonpublic => $c->{itemnotes_nonpublic},
222	branchcode => $c->{branchcode},	223	branchcode => $c->{branchcode},
223	branchname => $c->{branchname},	224	branchname => $c->{branchname},
224	itemcallnumber => $c->{itemcallnumber} \|\| q{},	225	itemcallnumber => $c->{itemcallnumber} \|\| q{},
		226	copynumber => $c->{copynumber} \|\| q{},
225	charge => $charge,	227	charge => $charge,
226	fine => $fine,	228	fine => $fine,
227	price => $c->{replacementprice} \|\| q{},	229	price => $c->{replacementprice} \|\| q{},
228	-