Lines 179-184
Link Here
|
179 |
[% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] |
179 |
[% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] |
180 |
<span>Match found</span> |
180 |
<span>Match found</span> |
181 |
[% ELSE %] |
181 |
[% ELSE %] |
|
|
182 |
<<<<<<< HEAD |
182 |
[% biblio_lis.overlay_status | html %] |
183 |
[% biblio_lis.overlay_status | html %] |
183 |
[% END %] |
184 |
[% END %] |
184 |
[% IF ( biblio.match_biblionumber ) %] |
185 |
[% IF ( biblio.match_biblionumber ) %] |
Lines 239-279
Link Here
|
239 |
<label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> |
240 |
<label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> |
240 |
<select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id_[% biblio.import_record_id | html %]"> |
241 |
<select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id_[% biblio.import_record_id | html %]"> |
241 |
<option value="">Select a fund (will use default if set)</option> |
242 |
<option value="">Select a fund (will use default if set)</option> |
242 |
[% FOREACH budget IN budget_loop %] |
243 |
[% INCLUDE 'budgets_loop.inc' inactive_class = "b_inactive" %] |
243 |
[% IF ( budget.b_id == biblio.budget_id ) %] |
|
|
244 |
[% IF budget.b_active %] |
245 |
<option |
246 |
value="[% budget.b_id | html %]" |
247 |
data-sort1-authcat="[% budget.b_sort1_authcat | html %]" |
248 |
data-sort2-authcat="[% budget.b_sort2_authcat | html %]" |
249 |
selected="selected" |
250 |
>[% budget.b_txt | html %]</option |
251 |
> |
252 |
[% ELSE %] |
253 |
<option |
254 |
value="[% budget.b_id | html %]" |
255 |
data-sort1-authcat="[% budget.b_sort1_authcat | html %]" |
256 |
data-sort2-authcat="[% budget.b_sort2_authcat | html %]" |
257 |
selected="selected" |
258 |
>[% budget.b_txt | html %] (inactive)</option |
259 |
> |
260 |
[% END %] |
261 |
[% ELSE %] |
262 |
[% IF budget.b_active %] |
263 |
<option value="[% budget.b_id | html %]" data-sort1-authcat="[% budget.b_sort1_authcat | html %]" data-sort2-authcat="[% budget.b_sort2_authcat | html %]" |
264 |
>[% budget.b_txt | html %]</option |
265 |
> |
266 |
[% ELSE %] |
267 |
<option |
268 |
value="[% budget.b_id | html %]" |
269 |
class="b_inactive" |
270 |
data-sort1-authcat="[% budget.b_sort1_authcat | html %]" |
271 |
data-sort2-authcat="[% budget.b_sort2_authcat | html %]" |
272 |
>[% budget.b_txt | html %] (inactive)</option |
273 |
> |
274 |
[% END %] |
275 |
[% END %] |
276 |
[% END %] |
277 |
</select> |
244 |
</select> |
278 |
<span class="required" style="display:none">Required</span> |
245 |
<span class="required" style="display:none">Required</span> |
279 |
[% END %] |
246 |
[% END %] |
Lines 302-307
Link Here
|
302 |
<option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> |
269 |
<option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> |
303 |
[% ELSE %] |
270 |
[% ELSE %] |
304 |
<option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> |
271 |
<option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> |
|
|
272 |
======= |
273 |
<label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> |
274 |
<select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id_[% biblio.import_record_id | html %]"> |
275 |
<option value="">Select a fund (will use default if set)</option> |
276 |
[% INCLUDE 'budgets_loop.inc' inactive_class = "b_inactive" %] |
277 |
</select> |
278 |
<span class="required" style="display:none">Required</span> |
279 |
[% END %] |
280 |
</li> |
281 |
<li class="sort1"> |
282 |
<label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label> |
283 |
<input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1_[% biblio.import_record_id | html %]" value="[% biblio.sort1 | html %]" /> |
284 |
</li> |
285 |
<li class="sort2"> |
286 |
<label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label> |
287 |
<input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2_[% biblio.import_record_id | html %]" value="[% biblio.sort2 | html %]" /> |
288 |
</li> |
289 |
</ol> |
290 |
[% IF ( biblio.iteminfos.size ) %] |
291 |
<div class="item_edit_form"> |
292 |
[% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] |
293 |
[% FOREACH item IN biblio.iteminfos %] |
294 |
<fieldset class="rows"> |
295 |
<legend>Item record [% item.item_id | html %]</legend> |
296 |
<ol> |
297 |
<li> |
298 |
<label for="homebranch_item_[% item.item_id | html %]">homebranch</label> |
299 |
<select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% biblio.import_record_id | html %]"> |
300 |
[% FOREACH l IN libraries %] |
301 |
[% IF l.branchcode == item.homebranch %] |
302 |
<option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> |
303 |
[% ELSE %] |
304 |
<option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> |
305 |
[% END %] |
306 |
>>>>>>> Bug 31606: Make acquisitions fund dropdown consistently show budget name |
305 |
[% END %] |
307 |
[% END %] |
306 |
[% END %] |
308 |
[% END %] |
307 |
</select> |
309 |
</select> |
Lines 409-429
Link Here
|
409 |
disabled="disabled" |
411 |
disabled="disabled" |
410 |
> |
412 |
> |
411 |
<option value="">Select a fund (will use default if set)</option> |
413 |
<option value="">Select a fund (will use default if set)</option> |
412 |
[% FOREACH budget_loo IN budget_loop %] |
414 |
[% INCLUDE 'budgets_loop.inc' inactive_class = "budget_item_inactive" %] |
413 |
[% IF ( budget_loo.b_active ) %] |
|
|
414 |
[% IF ( budget_loo.b_id ) == ( item.budget_id ) %] |
415 |
<option value="[% budget_loo.b_id | html %]" selected="selected">[% budget_loo.b_txt | html %]</option> |
416 |
[% ELSE %] |
417 |
<option value="[% budget_loo.b_id | html %]">[% budget_loo.b_txt | html %]</option> |
418 |
[% END %] |
419 |
[% ELSE %] |
420 |
[% IF ( budget_loo.b_id ) == ( item.budget_id ) %] |
421 |
<option value="[% budget_loo.b_id | html %]" class="buget_item_inactive" selected="selected">[% budget_loo.b_txt | html %] (inactive)</option> |
422 |
[% ELSE %] |
423 |
<option value="[% budget_loo.b_id | html %]" class="budget_item_inactive">[% budget_loo.b_txt | html %] (inactive)</option> |
424 |
[% END %] |
425 |
[% END %] |
426 |
[% END %] |
427 |
</select> |
415 |
</select> |
428 |
<span class="item_fund required">Required</span> |
416 |
<span class="item_fund required">Required</span> |
429 |
</li> |
417 |
</li> |
Lines 602-622
Link Here
|
602 |
<label for="all_budget_id">Fund: </label> |
590 |
<label for="all_budget_id">Fund: </label> |
603 |
<select id="all_budget_id" name="all_budget_id"> |
591 |
<select id="all_budget_id" name="all_budget_id"> |
604 |
<option value="">Select a fund (will populate orders/items if set)</option> |
592 |
<option value="">Select a fund (will populate orders/items if set)</option> |
605 |
[% FOREACH budget_loo IN budget_loop %] |
593 |
[% INCLUDE 'budgets_loop.inc' inactive_class = "b_inactive" %] |
606 |
[% IF ( budget_loo.b_active ) %] |
|
|
607 |
<option value="[% budget_loo.b_id | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]" |
608 |
>[% budget_loo.b_txt | html %]</option |
609 |
> |
610 |
[% ELSE %] |
611 |
<option |
612 |
value="[% budget_loo.b_id | html %]" |
613 |
class="b_inactive" |
614 |
data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" |
615 |
data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]" |
616 |
>[% budget_loo.b_txt | html %] (inactive)</option |
617 |
> |
618 |
[% END %] |
619 |
[% END %] |
620 |
</select> |
594 |
</select> |
621 |
<label for="all_showallbudgets" style="float:none;width:auto;"> Show inactive:</label> |
595 |
<label for="all_showallbudgets" style="float:none;width:auto;"> Show inactive:</label> |
622 |
<input type="checkbox" id="all_showallbudgets" /> |
596 |
<input type="checkbox" id="all_showallbudgets" /> |