Attachment #86493 for bug #4833

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

Lines 95-100 use C4::Auth; # get_template_and_user Link Here

(-)a/acqui/newordersuggestion.pl (+9 lines)
95	use C4::Output;	95	use C4::Output;
96	use C4::Suggestions;	96	use C4::Suggestions;
97	use C4::Biblio;	97	use C4::Biblio;
		98	use C4::Budgets;
98		99
99	use Koha::Acquisition::Booksellers;	100	use Koha::Acquisition::Booksellers;
100		101
Lines 136-141 my $suggestions_loop = SearchSuggestion( Link Here
136	STATUS => 'ACCEPTED'	137	STATUS => 'ACCEPTED'
137	}	138	}
138	);	139	);
		140
		141	foreach my $suggestion (@$suggestions_loop) {
		142	if ($suggestion->{budgetid}){
		143	my $bud = GetBudget( $suggestion->{budgetid} );
		144	$suggestion->{budget_name} = $bud->{budget_name} if $bud;
		145	}
		146	}
		147
139	my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );	148	my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
140	$template->param(	149	$template->param(
141	suggestions_loop => $suggestions_loop,	150	suggestions_loop => $suggestions_loop,

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-1 / +24 lines)
1	[% USE raw %]	1	[% USE raw %]
		2	[% USE Branches %]
		3	[% USE Price %]
2	[% USE Asset %]	4	[% USE Asset %]
3	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
Lines 27-32 Link Here
27	<th>Suggestion</th>	29	<th>Suggestion</th>
28	<th>Suggested by</th>	30	<th>Suggested by</th>
29	<th>Accepted by</th>	31	<th>Accepted by</th>
		32	<th>Library</th>
		33	<th>Fund</th>
		34	<th>Price</th>
		35	<th>Quantity</th>
		36	<th>Total</th>
30	<th> </th>	37	<th> </th>
31	</tr>	38	</tr>
32	</thead>	39	</thead>
Lines 52-57 Link Here
52	<td>	59	<td>
53	[% suggestions_loo.surnamemanagedby \| html %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby \| html %]	60	[% suggestions_loo.surnamemanagedby \| html %][% IF ( suggestions_loo.firstnamemanagedby ) %],[% END %] [% suggestions_loo.firstnamemanagedby \| html %]
54	</td>	61	</td>
		62	<td>
		63	[% Branches.GetName(suggestions_loo.branchcode) \| html %]
		64	</td>
		65	<td>
		66	[% suggestions_loo.budget_name \| html %]
		67	</td>
		68	<td>
		69	[% suggestions_loo.price \| $Price %]
		70	</td>
		71	<td>
		72	[% IF (suggestions_loo.quantity > 0) %]
		73	[% suggestions_loo.quantity \| html %]
		74	[% END %]
		75	</td>
		76	<td>
		77	[% suggestions_loo.total \| $Price %]
		78	</td>
55	<td class="actions">	79	<td class="actions">
56	[% IF ( suggestions_loo.biblionumber ) %]	80	[% IF ( suggestions_loo.biblionumber ) %]
57	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestions_loo.suggestionid \| uri %]&biblio=[% suggestions_loo.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>	81	<a href="neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&suggestionid=[% suggestions_loo.suggestionid \| uri %]&biblio=[% suggestions_loo.biblionumber \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
58	-

Return to bug 4833