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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-37 / +5 lines)
Lines 179-185 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
183
                                                                        [% biblio_lis.overlay_status | html %]
182
                                                                        [% biblio_lis.overlay_status | html %]
184
                                                                    [% END %]
183
                                                                    [% END %]
185
                                                                    [% IF ( biblio.match_biblionumber ) %]
184
                                                                    [% IF ( biblio.match_biblionumber ) %]
Lines 269-309 Link Here
269
                                                                                            <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
268
                                                                                            <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
270
                                                                                        [% ELSE %]
269
                                                                                        [% ELSE %]
271
                                                                                            <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
270
                                                                                            <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" budget_loop = biblio.budget_loop %]
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
307
                                                                                        [% END %]
271
                                                                                        [% END %]
308
                                                                                    [% END %]
272
                                                                                    [% END %]
309
                                                                                </select>
273
                                                                                </select>
Lines 669-674 Link Here
669
                                            class="btn btn-default btn-xs"
633
                                            class="btn btn-default btn-xs"
670
                                            ><i class="fa fa-plus"></i> Add orders</a
634
                                            ><i class="fa fa-plus"></i> Add orders</a
671
                                        >
635
                                        >
636
                                        <a
637
                                            href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]&clear_found=1"
638
                                            class="btn btn-default btn-xs"
639
                                            ><i class="fa fa-plus"></i> Add orders and ignore incoming fund</a
640
                                        >
672
                                    </td>
641
                                    </td>
673
                                </tr>
642
                                </tr>
674
                            [% END # /FOREACH batch_lis %]
643
                            [% END # /FOREACH batch_lis %]
675
- 

Return to bug 31606