Attachment #7008 for bug #5347

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

Lines 393-399 sub SendAlerts { Link Here

(-)a/C4/Letters.pm (-2 / +2 lines)
393	'Content-Type' => 'text/plain; charset="utf8"',	393	'Content-Type' => 'text/plain; charset="utf8"',
394	);	394	);
395	sendmail(%mail) or carp $Mail::Sendmail::error;	395	sendmail(%mail) or carp $Mail::Sendmail::error;
396	warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";	396	warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}" if $debug;
397	if ( C4::Context->preference("LetterLog") ) {	397	if ( C4::Context->preference("LetterLog") ) {
398	logaction( "ACQUISITION", "Send Acquisition claim letter", "", "order list : " . join( ",", @$externalid ) . "\n$innerletter->{title}\n$innerletter->{content}" ) if $type eq 'claimacquisition';	398	logaction( "ACQUISITION", "Send Acquisition claim letter", "", "order list : " . join( ",", @$externalid ) . "\n$innerletter->{title}\n$innerletter->{content}" ) if $type eq 'claimacquisition';
399	logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';	399	logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
Lines 402-408 sub SendAlerts { Link Here
402	die "This bookseller has no email\n";	402	die "This bookseller has no email\n";
403	}	403	}
404		404
405	warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";	405	warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
406	}	406	}
407		407
408	# send an "account details" notice to a newly created user	408	# send an "account details" notice to a newly created user

Lines 85-91 if ($op and $op eq "send_alert"){ Link Here

(-)a/acqui/lateorders.pl (-1 / +1 lines)
85	if ( $@ ) {	85	if ( $@ ) {
86	$template->param(error_claim => $@);	86	$template->param(error_claim => $@);
87	} else {	87	} else {
88	$template->param(info_claim => "Emails have been sent");	88	$template->{VARS}->{'info_claim'} = 1;
89	}	89	}
90	}	90	}
91		91

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-5 / +7 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>	2	<title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
		4	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
4	<script type="text/javascript">	5	<script type="text/javascript">
5	//<![CDATA[	6	//<![CDATA[
6	$(document).ready(function() {	7	$(document).ready(function() {
Lines 12-17 $(document).ready(function() { Link Here
12	$("input:checkbox[name=claim_for]").attr('disabled', false);	13	$("input:checkbox[name=claim_for]").attr('disabled', false);
13	}	14	}
14	});	15	});
		16	$('#CheckAll').click(function(){ $("#late_orders td").checkCheckboxes();});
		17	$('#CheckNone').click(function(){ $("#late_orders td").unCheckCheckboxes();});
15	});	18	});
16	//]]>	19	//]]>
17	</script>	20	</script>
Lines 35-41 $(document).ready(function() { Link Here
35	<div class="error">[% error_claim %]</div>	38	<div class="error">[% error_claim %]</div>
36	[% END %]	39	[% END %]
37	[% IF info_claim %]	40	[% IF info_claim %]
38	<div class="info">[% info_claim %]</div>	41	<div class="info">Email has been sent.</div>
39	[% END %]	42	[% END %]
40	[% IF ( lateorders ) %]	43	[% IF ( lateorders ) %]
41	<form action="lateorders.pl" name="claim" method="post">	44	<form action="lateorders.pl" name="claim" method="post">
Lines 50-56 $(document).ready(function() { Link Here
50	</select>	53	</select>
51	</p>	54	</p>
52	[% END %]	55	[% END %]
53	<table>	56	<table id="late_orders">
54	<tr>	57	<tr>
55	<th>Order Date</th>	58	<th>Order Date</th>
56	<th>Vendor</th>	59	<th>Vendor</th>
Lines 61-67 $(document).ready(function() { Link Here
61	<th>Claimed date</th>	64	<th>Claimed date</th>
62	<!-- TMPL_IF name="Supplier" -->	65	<!-- TMPL_IF name="Supplier" -->
63	[% IF Supplier %]	66	[% IF Supplier %]
64	<th><input type="checkbox" id="checkAll"></th>	67	<th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
65	[% ELSE %]	68	[% ELSE %]
66	<th></th>	69	<th></th>
67	[% END %]	70	[% END %]
Lines 103-109 $(document).ready(function() { Link Here
103	<td>[% lateorder.claimed_date %]</td>	106	<td>[% lateorder.claimed_date %]</td>
104	<td>	107	<td>
105	[% UNLESS lateorder.budget_lock %]	108	[% UNLESS lateorder.budget_lock %]
106	<input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" supplierid="[% lateorder.supplierid %]"/>	109	<input type="checkbox" class="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" supplierid="[% lateorder.supplierid %]"/>
107	[% END %]	110	[% END %]
108	</td>	111	</td>
109	</td>	112	</td>
110	-

Return to bug 5347