Attachment #113386 for bug #23971

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

Lines 232-237 sub ReopenBasket { Link Here

(-)a/C4/Acquisition.pm (+29 lines)
232	WHERE basketno = ?	232	WHERE basketno = ?
233	AND orderstatus NOT IN ( 'complete', 'cancelled' )	233	AND orderstatus NOT IN ( 'complete', 'cancelled' )
234	}, {}, $basketno);	234	}, {}, $basketno);
		235
		236	# Log the basket reopening
		237	if (C4::Context->preference("AcqLog")) {
		238	logaction(
		239	'ACQUISITIONS',
		240	'REOPEN_BASKET',
		241	$basketno
		242	);
		243	}
235	return;	244	return;
236	}	245	}
237		246
Lines 574-579 sub ModBasketHeader { Link Here
574	$sth2->execute($contractnumber,$basketno);	583	$sth2->execute($contractnumber,$basketno);
575	}	584	}
576		585
		586	# Log the basket update
		587	if (C4::Context->preference("AcqLog")) {
		588	logaction(
		589	'ACQUISITIONS',
		590	'MODIFY_BASKET_HEADER',
		591	$basketno
		592	);
		593	}
		594
		595	return;
577	return;	596	return;
578	}	597	}
579		598
Lines 754-759 sub ModBasketUsers { Link Here
754	foreach my $basketuser_id (@basketusers_ids) {	773	foreach my $basketuser_id (@basketusers_ids) {
755	$sth->execute($basketno, $basketuser_id);	774	$sth->execute($basketno, $basketuser_id);
756	}	775	}
		776
		777	# Log the basket update
		778	if (C4::Context->preference("AcqLog")) {
		779	logaction(
		780	'ACQUISITIONS',
		781	'MODIFY_BASKET_USERS',
		782	$basketno
		783	);
		784	}
		785
757	return;	786	return;
758	}	787	}
759		788

Lines 117-124 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +4 lines)
117	[% CASE 'STATUS_CHANGE' %]Change ILL request status	117	[% CASE 'STATUS_CHANGE' %]Change ILL request status
118	[% CASE 'ADD_BASKET' %]Create an acquisitions basket	118	[% CASE 'ADD_BASKET' %]Create an acquisitions basket
119	[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket	119	[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
		120	[% CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header
		121	[% CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users
120	[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket	122	[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket
121	[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket	123	[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
		124	[% CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket
122	[% CASE 'Run' %]Run	125	[% CASE 'Run' %]Run
123	[% CASE %][% action \| html %]	126	[% CASE %][% action \| html %]
124	[% END %]	127	[% END %]
Lines 193-199 Link Here
193	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	196	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
194	[% END %]	197	[% END %]
195		198
196	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'CLOSE_BASKET' 'APPROVE_BASKET' ] %]	199	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]
197	[% IF actions.grep(actx).size %]	200	[% IF actions.grep(actx).size %]
198	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	201	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
199	[% ELSE %]	202	[% ELSE %]
200	-

Return to bug 23971