Attachment #24948 for bug #11651

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

Lines 46-51 BEGIN { Link Here

(-)a/C4/HoldsQueue.pm (-8 / +59 lines)
46		46
47	&TransportCostMatrix	47	&TransportCostMatrix
48	&UpdateTransportCostMatrix	48	&UpdateTransportCostMatrix
		49
		50	&MarkHoldPrinted
		51	&GetItemNumberFromTmpHold
49	);	52	);
50	}	53	}
51		54
Lines 116-122 Returns hold queue for a holding branch. If branch is omitted, then whole queue Link Here
116	=cut	119	=cut
117		120
118	sub GetHoldsQueueItems {	121	sub GetHoldsQueueItems {
119	my ($branchlimit) = @_;	122	my ($branchlimit, $printstatus) = @_;
120	my $dbh = C4::Context->dbh;	123	my $dbh = C4::Context->dbh;
121		124
122	my @bind_params = ();	125	my @bind_params = ();
Lines 130-135 sub GetHoldsQueueItems { Link Here
130	$query .=" WHERE tmp_holdsqueue.holdingbranch = ?";	133	$query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
131	push @bind_params, $branchlimit;	134	push @bind_params, $branchlimit;
132	}	135	}
		136	if (C4::Context->preference('printSlipFromHoldsQueue')){
		137	$query .= $branchlimit ? " AND" : " WHERE";
		138	$query .= " tmp_holdsqueue.print_status = ?";
		139	push @bind_params, $printstatus;
		140	}
133	$query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";	141	$query .= " ORDER BY ccode, location, cn_sort, author, title, pickbranch, reservedate";
134	my $sth = $dbh->prepare($query);	142	my $sth = $dbh->prepare($query);
135	$sth->execute(@bind_params);	143	$sth->execute(@bind_params);
Lines 267-274 sub GetPendingHoldRequestsForBib { Link Here
267		275
268	my $dbh = C4::Context->dbh;	276	my $dbh = C4::Context->dbh;
269		277
270	my $request_query = "SELECT biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode,	278	my $request_query = "SELECT reserve_id, biblionumber, borrowernumber, itemnumber, priority, reserves.branchcode,
271	reservedate, reservenotes, borrowers.branchcode AS borrowerbranch	279	reservedate, reservenotes, borrowers.branchcode AS borrowerbranch, print_status
272	FROM reserves	280	FROM reserves
273	JOIN borrowers USING (borrowernumber)	281	JOIN borrowers USING (borrowernumber)
274	WHERE biblionumber = ?	282	WHERE biblionumber = ?
Lines 387-392 sub MapItemsToHoldRequests { Link Here
387	if (exists $items_by_itemnumber{$request->{itemnumber}} and	395	if (exists $items_by_itemnumber{$request->{itemnumber}} and
388	not exists $allocated_items{$request->{itemnumber}}) {	396	not exists $allocated_items{$request->{itemnumber}}) {
389	$item_map{$request->{itemnumber}} = {	397	$item_map{$request->{itemnumber}} = {
		398	reserve_id => $request->{reserve_id},
390	borrowernumber => $request->{borrowernumber},	399	borrowernumber => $request->{borrowernumber},
391	biblionumber => $request->{biblionumber},	400	biblionumber => $request->{biblionumber},
392	holdingbranch => $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},	401	holdingbranch => $items_by_itemnumber{$request->{itemnumber}}->{holdingbranch},
Lines 394-399 sub MapItemsToHoldRequests { Link Here
394	item_level => 1,	403	item_level => 1,
395	reservedate => $request->{reservedate},	404	reservedate => $request->{reservedate},
396	reservenotes => $request->{reservenotes},	405	reservenotes => $request->{reservenotes},
		406	print_status => $request->{print_status},
397	};	407	};
398	$allocated_items{$request->{itemnumber}}++;	408	$allocated_items{$request->{itemnumber}}++;
399	$num_items_remaining--;	409	$num_items_remaining--;
Lines 493-498 sub MapItemsToHoldRequests { Link Here
493	delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;	503	delete $items_by_branch{$holdingbranch} unless @$holding_branch_items;
494		504
495	$item_map{$itemnumber} = {	505	$item_map{$itemnumber} = {
		506	reserve_id => $request->{reserve_id},
496	borrowernumber => $request->{borrowernumber},	507	borrowernumber => $request->{borrowernumber},
497	biblionumber => $request->{biblionumber},	508	biblionumber => $request->{biblionumber},
498	holdingbranch => $holdingbranch,	509	holdingbranch => $holdingbranch,
Lines 500-505 sub MapItemsToHoldRequests { Link Here
500	item_level => 0,	511	item_level => 0,
501	reservedate => $request->{reservedate},	512	reservedate => $request->{reservedate},
502	reservenotes => $request->{reservenotes},	513	reservenotes => $request->{reservenotes},
		514	print_status => $request->{print_status},
503	};	515	};
504	$num_items_remaining--;	516	$num_items_remaining--;
505	}	517	}
Lines 517-530 sub CreatePicklistFromItemMap { Link Here
517	my $dbh = C4::Context->dbh;	529	my $dbh = C4::Context->dbh;
518		530
519	my $sth_load=$dbh->prepare("	531	my $sth_load=$dbh->prepare("
520	INSERT INTO tmp_holdsqueue (biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,	532	INSERT INTO tmp_holdsqueue (reserve_id,biblionumber,itemnumber,barcode,surname,firstname,phone,borrowernumber,
521	cardnumber,reservedate,title, itemcallnumber,	533	cardnumber,reservedate,title, itemcallnumber,
522	holdingbranch,pickbranch,notes, item_level_request)	534	holdingbranch,pickbranch,notes, item_level_request,print_status)
523	VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)	535	VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
524	");	536	");
525		537
526	foreach my $itemnumber (sort keys %$item_map) {	538	foreach my $itemnumber (sort keys %$item_map) {
527	my $mapped_item = $item_map->{$itemnumber};	539	my $mapped_item = $item_map->{$itemnumber};
		540	my $reserve_id = $mapped_item->{reserve_id};
528	my $biblionumber = $mapped_item->{biblionumber};	541	my $biblionumber = $mapped_item->{biblionumber};
529	my $borrowernumber = $mapped_item->{borrowernumber};	542	my $borrowernumber = $mapped_item->{borrowernumber};
530	my $pickbranch = $mapped_item->{pickup_branch};	543	my $pickbranch = $mapped_item->{pickup_branch};
Lines 532-537 sub CreatePicklistFromItemMap { Link Here
532	my $reservedate = $mapped_item->{reservedate};	545	my $reservedate = $mapped_item->{reservedate};
533	my $reservenotes = $mapped_item->{reservenotes};	546	my $reservenotes = $mapped_item->{reservenotes};
534	my $item_level = $mapped_item->{item_level};	547	my $item_level = $mapped_item->{item_level};
		548	my $print_status = $mapped_item->{print_status};
535		549
536	my $item = GetItem($itemnumber);	550	my $item = GetItem($itemnumber);
537	my $barcode = $item->{barcode};	551	my $barcode = $item->{barcode};
Lines 546-554 sub CreatePicklistFromItemMap { Link Here
546	my $bib = GetBiblioData($biblionumber);	560	my $bib = GetBiblioData($biblionumber);
547	my $title = $bib->{title};	561	my $title = $bib->{title};
548		562
549	$sth_load->execute($biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,	563	$sth_load->execute($reserve_id,$biblionumber, $itemnumber, $barcode, $surname, $firstname, $phone, $borrowernumber,
550	$cardnumber, $reservedate, $title, $itemcallnumber,	564	$cardnumber, $reservedate, $title, $itemcallnumber,
551	$holdingbranch, $pickbranch, $reservenotes, $item_level);	565	$holdingbranch, $pickbranch, $reservenotes, $item_level,$print_status);
552	}	566	}
553	}	567	}
554		568
Lines 637-642 sub least_cost_branch { Link Here
637	# XXX return a random @branch with minimum cost instead of the first one;	651	# XXX return a random @branch with minimum cost instead of the first one;
638	# return $branch[0] if @branch == 1;	652	# return $branch[0] if @branch == 1;
639	}	653	}
		654	=head2 MarkHoldPrinted
		655	MarkHoldPrinted($reserve_id)
		656	Change print status as printed.
		657	=cut
		658
		659	sub MarkHoldPrinted {
		660	my ( $reserve_id ) = @_;
		661	my $dbh = C4::Context->dbh;
		662	my $strsth="UPDATE reserves INNER JOIN tmp_holdsqueue USING (reserve_id)
		663	SET reserves.print_status = 1 , tmp_holdsqueue.print_status = 1
		664	WHERE reserve_id = ?
		665	";
		666	my $sth = $dbh->prepare($strsth);
		667	$sth->execute($reserve_id);
		668
		669	return 1;
		670	}
640		671
		672	=head2 GetItemNumberFromTmpHold
		673	$itemnumber = GetItemNumberFromTmpHold($reserve_id)
		674	Returns itemnumber associated with hold.
		675	Item number is taken from tmp_holdsqueue table, which is
		676	populated by bulid_holds_queue.pl script.
		677
		678	=cut
		679	sub GetItemNumberFromTmpHold{
		680	my ( $reserve_id ) = @_;
		681	my $dbh = C4::Context->dbh;
		682	my $strsth="SELECT itemnumber
		683	FROM tmp_holdsqueue
		684	WHERE reserve_id = ?
		685	";
		686	my $sth = $dbh->prepare($strsth);
		687	$sth->execute($reserve_id);
		688
		689	my $data = $sth->fetchrow;
		690	return $data;
		691	}
641		692
642	1;	693	1;




        &ToggleLowestPriority

        &ReserveSlip
        &HoldSlip
        &ToggleSuspend
        &SuspendAll


    );
}

=head2 HoldSlip
    HoldSlip($branch, $reserve_id, $itemnumber)

    Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef

=cut

sub HoldSlip {
    my ($branch, $reserve_id, $itemnumber) = @_;

    my $reserve = GetReserveInfo($reserve_id) or return;

    return  C4::Letters::GetPreparedLetter (
        module => 'circulation',
        letter_code => 'RESERVESLIP',
        branchcode => $branch,
        tables => {
            'reserves'    => $reserve,
            'branches'    => $reserve->{branchcode},
            'borrowers'   => $reserve->{borrowernumber},
            'biblio'      => $reserve->{biblionumber},
            'items'       => $itemnumber,
        },
    );
}
=head2 GetReservesControlBranch

  my $reserves_control_branch = GetReservesControlBranch($item, $borrower);




my $run_report     = $params->{'run_report'};
my $branchlimit    = $params->{'branchlimit'};
my $itemtypeslimit = $params->{'itemtypeslimit'};
my $showprinted    = $params->{'showprinted'};


if ( $run_report ) {
    # XXX GetHoldsQueueItems() does not support $itemtypeslimit!
    my $items = GetHoldsQueueItems( $branchlimit, $showprinted, $itemtypeslimit);
    $template->param(
        branchlimit     => $branchlimit,
        total      => scalar @$items,
        itemsloop  => $items,
        run_report => $run_report,
        showprinted => $showprinted,
    );
}


        description => $itemtypes->{$thisitemtype}->{'description'},
    };
}

$template->param(
     branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
   itemtypeloop => \@itemtypesloop,
   printenable => C4::Context->preference('printSlipFromHoldsQueue'),
);

# writing the template




  `lowestPriority` tinyint(1) NOT NULL, -- has this hold been pinned to the lowest priority in the holds queue (1 for yes, 0 for no)
  `suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no)
  `suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
  `print_status` BOOLEAN NOT NULL DEFAULT 0, -- is this hold printed (1 - yes, 0 - no)
  PRIMARY KEY (`reserve_id`),
  KEY `old_reserves_borrowernumber` (`borrowernumber`),
  KEY `old_reserves_biblionumber` (`biblionumber`),

  `lowestPriority` tinyint(1) NOT NULL,
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
  `suspend_until` DATETIME NULL DEFAULT NULL,
  `print_status` BOOLEAN NOT NULL DEFAULT 0, -- is this hold printed (1 - yes, 0 - no)
  PRIMARY KEY (`reserve_id`),
  KEY priorityfoundidx (priority,found),
  KEY `borrowernumber` (`borrowernumber`),


DROP TABLE IF EXISTS `tmp_holdsqueue`;
CREATE TABLE `tmp_holdsqueue` (
  `reserve_id` int(11) NOT NULL,
  `biblionumber` int(11) default NULL,
  `itemnumber` int(11) default NULL,
  `barcode` varchar(20) default NULL,

  `holdingbranch` varchar(10) default NULL,
  `pickbranch` varchar(10) default NULL,
  `notes` text,
  `item_level_request` tinyint(4) NOT NULL default 0,
  `print_status` BOOLEAN NOT NULL DEFAULT 0
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--




    SetVersion($DBversion);
}

$DBversion = "3.15.00.XXX";
if (CheckVersion($DBversion)) {
    $dbh->do("ALTER TABLE reserves ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
    $dbh->do("ALTER TABLE old_reserves ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
    $dbh->do("ALTER TABLE tmp_holdsqueue ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
    $dbh->do("ALTER TABLE tmp_holdsqueue ADD reserve_id INT ( 11 ) FIRST");
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('printSlipFromHoldsQueue', '0', 'NULL', 'If enabled reserve slips can be printed from Holds Queue screen,', 'YesNo');");
    print "Upgrade to $DBversion done \n";
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 112-117 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
112	slip: "open a print slip window"	112	slip: "open a print slip window"
113	- .	113	- .
114	-	114	-
		115	- pref: printSlipFromHoldsQueue
		116	choices:
		117	yes: Enable
		118	no: "Don't enable"
		119	- print reserve slip from holds queue.
		120	-
115	- Include the stylesheet at	121	- Include the stylesheet at
116	- pref: NoticeCSS	122	- pref: NoticeCSS
117	class: url	123	class: url




        "bAutoWidth": false
    });
});

function printReservations() {
    document.hold_print.submit();
}
function selectAll () {
    if(document.hold_print.reserve_id.length == undefined ){
        document.hold_print.reserve_id.checked=true;
    }else if(document.hold_print.reserve_id.length > 0) {
        for (var i=0; i < document.hold_print.reserve_id.length; i++) {
            document.hold_print.reserve_id[i].checked=true;
        }
    }
}
function clearAll () {
    if(document.hold_print.reserve_id.length == undefined ){
        document.hold_print.reserve_id.checked=false;
    }else if(document.hold_print.reserve_id.length > 0) {
        for (var i=0; i < document.hold_print.reserve_id.length; i++) {
            document.hold_print.reserve_id[i].checked=false;
        }
    }
}
//]]>
</script>


    [% ELSE %]
        <div class="dialog message">No items found.</div>
    [% END %]
    [% IF ( printenable ) %]
        <p>
        <input id="printhold" type="submit" class="submit" onclick="printReservations()" value="Print checked holds"/>
        <a href="#" onclick="selectAll(); return false;">Select all</a> |
        <a href="#" onclick="clearAll(); return false;">Clear all</a>
        <br/>
        </p>
        <form id="showprinted" name="showprinted" method="get" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
            <input type="hidden" name="run_report" value="1"/>
            <input type="hidden" name="branchlimit" value="[% branchlimit %]"/>
            [% IF ( showprinted ) %]
                <input type="hidden" name="showprinted" value="0"/>
                <input id="submit_printed" type="submit" class="submit" value="Hide printed holds"/>
            [% ELSE %]
                <input type="hidden" name="showprinted" value="1"/>
                <input id="submit_printed" type="submit" class="submit" value="Show printed holds"/>
            [% END %]
        </form>
    [% END %]
    [% IF ( itemsloop ) %]
        <form id="hold_print" name="hold_print" method="get" action="/cgi-bin/koha/circ/hold-pull-print.pl" target="_blank">
<table id="holdst">
	<thead>
	<tr>
       [% IF (printenable) %]<th class="hq-check">Check</th>[% END %]
        <th class="hq-title">Title</th>
        <th class="hq-collection">Collection</th>
        <th class="hq-itemtype">Item type</th>

	</thead>
     <tbody>[% FOREACH itemsloo IN itemsloop %]
        <tr>
        [% IF ( printenable ) %]
			<td class="hq-print"><input type="checkbox" id="res[% itemsloo.reserve_id %]" name="reserve_id" value="[% itemsloo.reserve_id %]"/></td>
        [% END %]
            <td class="hq-title"><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]"><strong>[% itemsloo.title |html %]</strong> [% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</a></p>
                         <p><strong>[% itemsloo.author %]</strong>
                       <div class="hq-pubdata">  [% IF ( itemsloo.publishercode ) %][% itemsloo.publishercode %][% END %]

        </tr>
    [% END %]</tbody>
    </table>
        [% IF ( printenable ) %]
        </form>
        [% END %]
	[% END %] 
	[% END %]

- 

Return to bug 11651

Lines 7945-7950 if (CheckVersion($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
7945	SetVersion($DBversion);	7945	SetVersion($DBversion);
7946	}	7946	}
7947		7947
		7948	$DBversion = "3.15.00.XXX";
		7949	if (CheckVersion($DBversion)) {
		7950	$dbh->do("ALTER TABLE reserves ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
		7951	$dbh->do("ALTER TABLE old_reserves ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
		7952	$dbh->do("ALTER TABLE tmp_holdsqueue ADD print_status BOOLEAN NOT NULL DEFAULT '0'");
		7953	$dbh->do("ALTER TABLE tmp_holdsqueue ADD reserve_id INT ( 11 ) FIRST");
		7954	$dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('printSlipFromHoldsQueue', '0', 'NULL', 'If enabled reserve slips can be printed from Holds Queue screen,', 'YesNo');");
		7955	print "Upgrade to $DBversion done \n";
		7956	}
		7957
7948	=head1 FUNCTIONS	7958	=head1 FUNCTIONS
7949		7959
7950	=head2 TableExists($table)	7960	=head2 TableExists($table)

Lines 129-134 BEGIN { Link Here

(-)a/C4/Reserves.pm (+26 lines)
129	&ToggleLowestPriority	129	&ToggleLowestPriority
130		130
131	&ReserveSlip	131	&ReserveSlip
		132	&HoldSlip
132	&ToggleSuspend	133	&ToggleSuspend
133	&SuspendAll	134	&SuspendAll
134		135
Lines 2223-2228 sub ReserveSlip { Link Here
2223	);	2224	);
2224	}	2225	}
2225		2226
		2227	=head2 HoldSlip
		2228	HoldSlip($branch, $reserve_id, $itemnumber)
		2229
		2230	Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
		2231
		2232	=cut
		2233
		2234	sub HoldSlip {
		2235	my ($branch, $reserve_id, $itemnumber) = @_;
		2236
		2237	my $reserve = GetReserveInfo($reserve_id) or return;
		2238
		2239	return C4::Letters::GetPreparedLetter (
		2240	module => 'circulation',
		2241	letter_code => 'RESERVESLIP',
		2242	branchcode => $branch,
		2243	tables => {
		2244	'reserves' => $reserve,
		2245	'branches' => $reserve->{branchcode},
		2246	'borrowers' => $reserve->{borrowernumber},
		2247	'biblio' => $reserve->{biblionumber},
		2248	'items' => $itemnumber,
		2249	},
		2250	);
		2251	}
2226	=head2 GetReservesControlBranch	2252	=head2 GetReservesControlBranch
2227		2253
2228	my $reserves_control_branch = GetReservesControlBranch($item, $borrower);	2254	my $reserves_control_branch = GetReservesControlBranch($item, $borrower);

Lines 49-63 my $params = $query->Vars; Link Here

(-)a/circ/view_holdsqueue.pl (-2 / +5 lines)
49	my $run_report = $params->{'run_report'};	49	my $run_report = $params->{'run_report'};
50	my $branchlimit = $params->{'branchlimit'};	50	my $branchlimit = $params->{'branchlimit'};
51	my $itemtypeslimit = $params->{'itemtypeslimit'};	51	my $itemtypeslimit = $params->{'itemtypeslimit'};
		52	my $showprinted = $params->{'showprinted'};
		53
52		54
53	if ( $run_report ) {	55	if ( $run_report ) {
54	# XXX GetHoldsQueueItems() does not support $itemtypeslimit!	56	# XXX GetHoldsQueueItems() does not support $itemtypeslimit!
55	my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);	57	my $items = GetHoldsQueueItems( $branchlimit, $showprinted, $itemtypeslimit);
56	$template->param(	58	$template->param(
57	branchlimit => $branchlimit,	59	branchlimit => $branchlimit,
58	total => scalar @$items,	60	total => scalar @$items,
59	itemsloop => $items,	61	itemsloop => $items,
60	run_report => $run_report,	62	run_report => $run_report,
		63	showprinted => $showprinted,
61	);	64	);
62	}	65	}
63		66
Lines 70-79 foreach my $thisitemtype ( sort keys %$itemtypes ) { Link Here
70	description => $itemtypes->{$thisitemtype}->{'description'},	73	description => $itemtypes->{$thisitemtype}->{'description'},
71	};	74	};
72	}	75	}
73
74	$template->param(	76	$template->param(
75	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),	77	branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
76	itemtypeloop => \@itemtypesloop,	78	itemtypeloop => \@itemtypesloop,
		79	printenable => C4::Context->preference('printSlipFromHoldsQueue'),
77	);	80	);
78		81
79	# writing the template	82	# writing the template

Lines 1622-1627 CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b Link Here

(-)a/installer/data/mysql/kohastructure.sql (-1 / +5 lines)
1622	`lowestPriority` tinyint(1) NOT NULL, -- has this hold been pinned to the lowest priority in the holds queue (1 for yes, 0 for no)	1622	`lowestPriority` tinyint(1) NOT NULL, -- has this hold been pinned to the lowest priority in the holds queue (1 for yes, 0 for no)
1623	`suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no)	1623	`suspend` BOOLEAN NOT NULL DEFAULT 0, -- in this hold suspended (1 for yes, 0 for no)
1624	`suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)	1624	`suspend_until` DATETIME NULL DEFAULT NULL, -- the date this hold is suspended until (NULL for infinitely)
		1625	`print_status` BOOLEAN NOT NULL DEFAULT 0, -- is this hold printed (1 - yes, 0 - no)
1625	PRIMARY KEY (`reserve_id`),	1626	PRIMARY KEY (`reserve_id`),
1626	KEY `old_reserves_borrowernumber` (`borrowernumber`),	1627	KEY `old_reserves_borrowernumber` (`borrowernumber`),
1627	KEY `old_reserves_biblionumber` (`biblionumber`),	1628	KEY `old_reserves_biblionumber` (`biblionumber`),
Lines 1821-1826 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1821	`lowestPriority` tinyint(1) NOT NULL,	1822	`lowestPriority` tinyint(1) NOT NULL,
1822	`suspend` BOOLEAN NOT NULL DEFAULT 0,	1823	`suspend` BOOLEAN NOT NULL DEFAULT 0,
1823	`suspend_until` DATETIME NULL DEFAULT NULL,	1824	`suspend_until` DATETIME NULL DEFAULT NULL,
		1825	`print_status` BOOLEAN NOT NULL DEFAULT 0, -- is this hold printed (1 - yes, 0 - no)
1824	PRIMARY KEY (`reserve_id`),	1826	PRIMARY KEY (`reserve_id`),
1825	KEY priorityfoundidx (priority,found),	1827	KEY priorityfoundidx (priority,found),
1826	KEY `borrowernumber` (`borrowernumber`),	1828	KEY `borrowernumber` (`borrowernumber`),
Lines 2502-2507 CREATE TABLE `user_permissions` ( Link Here
2502		2504
2503	DROP TABLE IF EXISTS `tmp_holdsqueue`;	2505	DROP TABLE IF EXISTS `tmp_holdsqueue`;
2504	CREATE TABLE `tmp_holdsqueue` (	2506	CREATE TABLE `tmp_holdsqueue` (
		2507	`reserve_id` int(11) NOT NULL,
2505	`biblionumber` int(11) default NULL,	2508	`biblionumber` int(11) default NULL,
2506	`itemnumber` int(11) default NULL,	2509	`itemnumber` int(11) default NULL,
2507	`barcode` varchar(20) default NULL,	2510	`barcode` varchar(20) default NULL,
Lines 2516-2522 CREATE TABLE `tmp_holdsqueue` ( Link Here
2516	`holdingbranch` varchar(10) default NULL,	2519	`holdingbranch` varchar(10) default NULL,
2517	`pickbranch` varchar(10) default NULL,	2520	`pickbranch` varchar(10) default NULL,
2518	`notes` text,	2521	`notes` text,
2519	`item_level_request` tinyint(4) NOT NULL default 0	2522	`item_level_request` tinyint(4) NOT NULL default 0,
		2523	`print_status` BOOLEAN NOT NULL DEFAULT 0
2520	) ENGINE=InnoDB DEFAULT CHARSET=utf8;	2524	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2521		2525
2522	--	2526	--

Lines 24-29 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +49 lines)
24	"bAutoWidth": false	24	"bAutoWidth": false
25	});	25	});
26	});	26	});
		27
		28	function printReservations() {
		29	document.hold_print.submit();
		30	}
		31	function selectAll () {
		32	if(document.hold_print.reserve_id.length == undefined ){
		33	document.hold_print.reserve_id.checked=true;
		34	}else if(document.hold_print.reserve_id.length > 0) {
		35	for (var i=0; i < document.hold_print.reserve_id.length; i++) {
		36	document.hold_print.reserve_id[i].checked=true;
		37	}
		38	}
		39	}
		40	function clearAll () {
		41	if(document.hold_print.reserve_id.length == undefined ){
		42	document.hold_print.reserve_id.checked=false;
		43	}else if(document.hold_print.reserve_id.length > 0) {
		44	for (var i=0; i < document.hold_print.reserve_id.length; i++) {
		45	document.hold_print.reserve_id[i].checked=false;
		46	}
		47	}
		48	}
27	//]]>	49	//]]>
28	</script>	50	</script>
29		51
Lines 49-58 $(document).ready(function() { Link Here
49	[% ELSE %]	71	[% ELSE %]
50	<div class="dialog message">No items found.</div>	72	<div class="dialog message">No items found.</div>
51	[% END %]	73	[% END %]
		74	[% IF ( printenable ) %]
		75	<p>
		76	<input id="printhold" type="submit" class="submit" onclick="printReservations()" value="Print checked holds"/>
		77	<a href="#" onclick="selectAll(); return false;">Select all</a> \|
		78	<a href="#" onclick="clearAll(); return false;">Clear all</a>
		79	<br/>
		80	</p>
		81	<form id="showprinted" name="showprinted" method="get" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
		82	<input type="hidden" name="run_report" value="1"/>
		83	<input type="hidden" name="branchlimit" value="[% branchlimit %]"/>
		84	[% IF ( showprinted ) %]
		85	<input type="hidden" name="showprinted" value="0"/>
		86	<input id="submit_printed" type="submit" class="submit" value="Hide printed holds"/>
		87	[% ELSE %]
		88	<input type="hidden" name="showprinted" value="1"/>
		89	<input id="submit_printed" type="submit" class="submit" value="Show printed holds"/>
		90	[% END %]
		91	</form>
		92	[% END %]
52	[% IF ( itemsloop ) %]	93	[% IF ( itemsloop ) %]
		94	<form id="hold_print" name="hold_print" method="get" action="/cgi-bin/koha/circ/hold-pull-print.pl" target="_blank">
53	<table id="holdst">	95	<table id="holdst">
54	<thead>	96	<thead>
55	<tr>	97	<tr>
		98	[% IF (printenable) %]<th class="hq-check">Check</th>[% END %]
56	<th class="hq-title">Title</th>	99	<th class="hq-title">Title</th>
57	<th class="hq-collection">Collection</th>	100	<th class="hq-collection">Collection</th>
58	<th class="hq-itemtype">Item type</th>	101	<th class="hq-itemtype">Item type</th>
Lines 68-73 $(document).ready(function() { Link Here
68	</thead>	111	</thead>
69	<tbody>[% FOREACH itemsloo IN itemsloop %]	112	<tbody>[% FOREACH itemsloo IN itemsloop %]
70	<tr>	113	<tr>
		114	[% IF ( printenable ) %]
		115	<td class="hq-print"><input type="checkbox" id="res[% itemsloo.reserve_id %]" name="reserve_id" value="[% itemsloo.reserve_id %]"/></td>
		116	[% END %]
71	<td class="hq-title"><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]"><strong>[% itemsloo.title \|html %]</strong> [% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</a></p>	117	<td class="hq-title"><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]"><strong>[% itemsloo.title \|html %]</strong> [% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</a></p>
72	<p><strong>[% itemsloo.author %]</strong>	118	<p><strong>[% itemsloo.author %]</strong>
73	<div class="hq-pubdata"> [% IF ( itemsloo.publishercode ) %][% itemsloo.publishercode %][% END %]	119	<div class="hq-pubdata"> [% IF ( itemsloo.publishercode ) %][% itemsloo.publishercode %][% END %]
Lines 96-101 $(document).ready(function() { Link Here
96	</tr>	142	</tr>
97	[% END %]</tbody>	143	[% END %]</tbody>
98	</table>	144	</table>
		145	[% IF ( printenable ) %]
		146	</form>
		147	[% END %]
99	[% END %]	148	[% END %]
100	[% END %]	149	[% END %]
101		150
102	-