Attachment #7404 for bug #7190

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

Lines 1866-1875 sub _FixAccountForLostAndReturned { Link Here

(-)a/C4/Circulation.pm (-1 / +2 lines)
1866	my $item_id = @_ ? shift : $itemnumber; # Send the barcode if you want that logged in the description	1866	my $item_id = @_ ? shift : $itemnumber; # Send the barcode if you want that logged in the description
1867	my $dbh = C4::Context->dbh;	1867	my $dbh = C4::Context->dbh;
1868	# check for charge made for lost book	1868	# check for charge made for lost book
1869	my $sth = $dbh->prepare("SELECT * FROM accountlines WHERE (itemnumber = ?) AND (accounttype='L' OR accounttype='Rep') ORDER BY date DESC");	1869	my $sth = $dbh->prepare("SELECT * FROM accountlines WHERE itemnumber = ? AND accounttype IN ('L', 'Rep', 'W') ORDER BY date DESC, accountno DESC");
1870	$sth->execute($itemnumber);	1870	$sth->execute($itemnumber);
1871	my $data = $sth->fetchrow_hashref;	1871	my $data = $sth->fetchrow_hashref;
1872	$data or return; # bail if there is nothing to do	1872	$data or return; # bail if there is nothing to do
		1873	$data->{accounttype} eq 'W' and return; # Written off
1873		1874
1874	# writeoff this amount	1875	# writeoff this amount
1875	my $offset;	1876	my $offset;

Lines 67-72 if ( $individual \|\| $writeoff ) { Link Here

(-)a/members/paycollect.pl (-1 / +2 lines)
67	my $amount = $input->param('amount');	67	my $amount = $input->param('amount');
68	my $amountoutstanding = $input->param('amountoutstanding');	68	my $amountoutstanding = $input->param('amountoutstanding');
69	$accountno = $input->param('accountno');	69	$accountno = $input->param('accountno');
		70	my $itemnumber = $input->param('itemnumber');
70	my $description = $input->param('description');	71	my $description = $input->param('description');
71	my $title = $input->param('title');	72	my $title = $input->param('title');
72	my $notify_id = $input->param('notify_id');	73	my $notify_id = $input->param('notify_id');
Lines 78-83 if ( $individual \|\| $writeoff ) { Link Here
78	amount => $amount,	79	amount => $amount,
79	amountoutstanding => $amountoutstanding,	80	amountoutstanding => $amountoutstanding,
80	title => $title,	81	title => $title,
		82	itemnumber => $itemnumber,
81	description => $description,	83	description => $description,
82	notify_id => $notify_id,	84	notify_id => $notify_id,
83	notify_level => $notify_level,	85	notify_level => $notify_level,
84	-

Return to bug 7190

Lines 94-99 function moneyFormat(textObj) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (+2 lines)
94	<form name="payindivfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">	94	<form name="payindivfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">
95	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />	95	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
96	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />	96	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
		97	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
97	<input type="hidden" name="description" id="description" value="[% description %]" />	98	<input type="hidden" name="description" id="description" value="[% description %]" />
98	<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />	99	<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />
99	<input type="hidden" name="notify_id" id="notify_id" value="[% notify_id %]" />	100	<input type="hidden" name="notify_id" id="notify_id" value="[% notify_id %]" />
Lines 148-153 function moneyFormat(textObj) { Link Here
148	<form name="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >	149	<form name="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
149	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />	150	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
150	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />	151	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
		152	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
151	<input type="hidden" name="description" id="description" value="[% description %]" />	153	<input type="hidden" name="description" id="description" value="[% description %]" />
152	<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />	154	<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />
153	<input type="hidden" name="notify_id" id="notify_id" value="[% notify_id %]" />	155	<input type="hidden" name="notify_id" id="notify_id" value="[% notify_id %]" />