Attachment #111302 for bug #23971

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

Lines 265-270 sub ReopenBasket { Link Here

(-)a/C4/Acquisition.pm (+29 lines)
265	WHERE basketno = ?	265	WHERE basketno = ?
266	AND orderstatus NOT IN ( 'complete', 'cancelled' )	266	AND orderstatus NOT IN ( 'complete', 'cancelled' )
267	}, {}, $basketno);	267	}, {}, $basketno);
		268
		269	# Log the basket reopening
		270	if (C4::Context->preference("AcqLog")) {
		271	logaction(
		272	'ACQUISITIONS',
		273	'REOPEN_BASKET',
		274	$basketno
		275	);
		276	}
268	return;	277	return;
269	}	278	}
270		279
Lines 633-638 sub ModBasketHeader { Link Here
633	$sth2->execute($contractnumber,$basketno);	642	$sth2->execute($contractnumber,$basketno);
634	}	643	}
635		644
		645	# Log the basket update
		646	if (C4::Context->preference("AcqLog")) {
		647	logaction(
		648	'ACQUISITIONS',
		649	'MODIFY_BASKET_HEADER',
		650	$basketno
		651	);
		652	}
		653
		654	return;
636	return;	655	return;
637	}	656	}
638		657
Lines 813-818 sub ModBasketUsers { Link Here
813	foreach my $basketuser_id (@basketusers_ids) {	832	foreach my $basketuser_id (@basketusers_ids) {
814	$sth->execute($basketno, $basketuser_id);	833	$sth->execute($basketno, $basketuser_id);
815	}	834	}
		835
		836	# Log the basket update
		837	if (C4::Context->preference("AcqLog")) {
		838	logaction(
		839	'ACQUISITIONS',
		840	'MODIFY_BASKET_USERS',
		841	$basketno
		842	);
		843	}
		844
816	return;	845	return;
817	}	846	}
818		847

Lines 104-111 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +4 lines)
104	[% CASE 'STATUS_CHANGE' %]Change ILL request status	104	[% CASE 'STATUS_CHANGE' %]Change ILL request status
105	[% CASE 'ADD_BASKET' %]Create an acquisitions basket	105	[% CASE 'ADD_BASKET' %]Create an acquisitions basket
106	[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket	106	[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
		107	[% CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header
		108	[% CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users
107	[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket	109	[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket
108	[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket	110	[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
		111	[% CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket
109	[% CASE 'Run' %]Run	112	[% CASE 'Run' %]Run
110	[% CASE %][% action \| html %]	113	[% CASE %][% action \| html %]
111	[% END %]	114	[% END %]
Lines 180-186 Link Here
180	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	183	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
181	[% END %]	184	[% END %]
182		185
183	[% 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' ] %]	186	[% 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' ] %]
184	[% IF actions.grep(actx).size %]	187	[% IF actions.grep(actx).size %]
185	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	188	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
186	[% ELSE %]	189	[% ELSE %]
187	-

Return to bug 23971