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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-4 lines)
Lines 2754-2763 li { Link Here
2754
    }
2754
    }
2755
}
2755
}
2756
2756
2757
.supplier-contact-details {
2758
    float: left;
2759
}
2760
2761
#ADD-contact {
2757
#ADD-contact {
2762
    margin: 0 0 8px 8px;
2758
    margin: 0 0 8px 8px;
2763
}
2759
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-27 / +31 lines)
Lines 40-55 Link Here
40
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
40
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %]
41
</div>
41
</div>
42
42
43
<div id="doc3" class="yui-t2">
43
<div class="main container-fluid">
44
    <div class="row">
45
        <div class="col-sm-10 col-sm-push-2">
46
            <main>
44
47
45
<div id="bd">
46
    <div id="yui-main">
47
    [% IF (cannot_manage_basket) %]
48
    [% IF (cannot_manage_basket) %]
48
        <div class="yui-b">
49
        <div class="dialog alert">You are not authorised to manage this basket.</div>
49
            <p class="error">You are not authorised to manage this basket.</p>
50
        </div>
51
    [% ELSE %]
50
    [% ELSE %]
52
    <div class="yui-b">
51
53
        [% IF !confirm_close && !edi_confirm %]
52
        [% IF !confirm_close && !edi_confirm %]
54
        [% UNLESS ( selectbasketg ) %]
53
        [% UNLESS ( selectbasketg ) %]
55
            [% UNLESS ( closedate ) %]
54
            [% UNLESS ( closedate ) %]
Lines 206-214 Link Here
206
        [% END %]
205
        [% END %]
207
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
206
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
208
        [% IF ( basketno ) %]
207
        [% IF ( basketno ) %]
209
            <div id="acqui_basket_summary" class="yui-g">
208
            <div id="acqui_basket_summary" class="row">
210
                <div class="rows">
209
                <div class="rows">
211
                <div class="yui-u first">
210
                <div class="col-sm-6">
212
                <ol>
211
                <ol>
213
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
212
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
214
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
213
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
Lines 219-225 Link Here
219
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
218
                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
220
                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname | html %]</li>[% END %]
219
                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname | html %]</li>[% END %]
221
                <li id="managedby">
220
                <li id="managedby">
222
                    <form action="" method="post">
221
                    <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
223
                        <span class="label">Managed by:</span>
222
                        <span class="label">Managed by:</span>
224
                        <div style="float:left">
223
                        <div style="float:left">
225
                            <ul id="users_names" style="padding-left:0">
224
                            <ul id="users_names" style="padding-left:0">
Lines 257-263 Link Here
257
                    <li id="managing_library_entry" style="display:none;">
256
                    <li id="managing_library_entry" style="display:none;">
258
                        <span class="label">&nbsp;</span>
257
                        <span class="label">&nbsp;</span>
259
                        <div style="float:left">
258
                        <div style="float:left">
260
                            <form action="" method="post">
259
                            <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
261
                                <select id="select_managing_library" name="branch">
260
                                <select id="select_managing_library" name="branch">
262
                                    <option value="">(no library)</option>
261
                                    <option value="">(no library)</option>
263
                                    [% FOREACH branch IN branches_loop %]
262
                                    [% FOREACH branch IN branches_loop %]
Lines 277-285 Link Here
277
                [% END %]
276
                [% END %]
278
277
279
                </ol>
278
                </ol>
280
                </div>
279
                </div> <!-- /.col-sm-6 -->
281
280
282
                <div class="yui-u">
281
                <div class="col-sm-6">
283
                    <ol>
282
                    <ol>
284
                        [% IF ( creationdate ) %]
283
                        [% IF ( creationdate ) %]
285
                            <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
284
                            <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
Lines 376-391 Link Here
376
                            [% END %]
375
                            [% END %]
377
                        </ol>
376
                        </ol>
378
                    [% END # /IF closeddate %]
377
                    [% END # /IF closeddate %]
379
                </div>
378
                    </div> <!-- /.rows -->
380
            </div>
379
                </div> <!-- /.col-sm-6 -->
381
            </div>
380
            </div> <!-- /#acqui_basket_summary.row -->
382
        [% END %]
381
        [% END %]
383
        [% IF ( duplinbatch ) %]<div class="dialog alert">
382
        [% IF ( duplinbatch ) %]<div class="dialog alert">
384
        <h4>Duplicate warning</h4>
383
        <h4>Duplicate warning</h4>
385
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
384
        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
386
        </div>[% END %]
385
        </div>[% END %]
387
386
388
        <div id="acqui_basket_content" class="yui-g">
387
        <div id="acqui_basket_content">
389
        [% IF ( books_loop ) %]
388
        [% IF ( books_loop ) %]
390
        <h2>Orders</h2>
389
        <h2>Orders</h2>
391
        <label for="show_all_details">
390
        <label for="show_all_details">
Lines 575-581 Link Here
575
        [% END %]
574
        [% END %]
576
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
575
        [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>
577
        [% END %]
576
        [% END %]
578
        </div>
577
        </div> <!-- /#acqui_basket_content -->
579
        [% IF (cancelledorders_loop) %]
578
        [% IF (cancelledorders_loop) %]
580
          <div id="cancelledorders">
579
          <div id="cancelledorders">
581
            <h2>Cancelled orders</h2>
580
            <h2>Cancelled orders</h2>
Lines 652-658 Link Here
652
                [% END %]
651
                [% END %]
653
              </tbody>
652
              </tbody>
654
            </table>
653
            </table>
655
          </div>
654
          </div> <!-- /#cancelledorders -->
656
        [% END %]
655
        [% END %]
657
        <br />
656
        <br />
658
        [% UNLESS ( closedate ) %]
657
        [% UNLESS ( closedate ) %]
Lines 727-740 Link Here
727
        </form>
726
        </form>
728
        </div>
727
        </div>
729
    [% END %]
728
    [% END %]
730
</div>
731
[% END %][%# IF (cannot_manage_basket) %]
729
[% END %][%# IF (cannot_manage_basket) %]
732
</div>
730
733
<div class="yui-b">
731
            </main>
734
    [% INCLUDE 'vendor-menu.inc' %]
732
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
735
    [% INCLUDE 'acquisitions-menu.inc' %]
733
736
</div>
734
        <div class="col-sm-2 col-sm-pull-10">
737
</div>
735
            <aside>
736
                [% INCLUDE 'vendor-menu.inc' %]
737
                [% INCLUDE 'acquisitions-menu.inc' %]
738
            </aside>
739
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
740
    </div> <!-- /.row -->
741
738
742
739
<!-- Modal for editing vendor and internal notes -->
743
<!-- Modal for editing vendor and internal notes -->
740
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
744
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
Lines 755-764 Link Here
755
                <button type="submit" class="btn btn-default">Save</button>
759
                <button type="submit" class="btn btn-default">Save</button>
756
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
760
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
757
            </div>
761
            </div>
762
            </div>
758
        </form>
763
        </form>
759
    </div>
764
    </div>
760
</div>
765
</div>
761
</div>
762
766
763
[% MACRO jsinclude BLOCK %]
767
[% MACRO jsinclude BLOCK %]
764
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
768
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 33-39 Link Here
33
<div class="dialog alert order_error" style="display:none"></div>
33
<div class="dialog alert order_error" style="display:none"></div>
34
34
35
[% IF ( basketno ) %]
35
[% IF ( basketno ) %]
36
    <div id="acqui_basket_summary"  class="yui-g">
36
    <div id="acqui_basket_summary">
37
    <fieldset class="rows">
37
    <fieldset class="rows">
38
        <legend>Basket details</legend>
38
        <legend>Basket details</legend>
39
        <ol>
39
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-13 / +11 lines)
Lines 123-129 Link Here
123
                <a class="btn btn-default btn-sm cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
123
                <a class="btn btn-default btn-sm cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
124
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
124
            [% END %] <i class="fa fa-remove"></i> Cancel</a>
125
        </div>
125
        </div>
126
    <div class="yui-g">
126
127
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
127
        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
128
        <fieldset class="rows">
128
        <fieldset class="rows">
129
            <legend>Company details</legend>
129
            <legend>Company details</legend>
Lines 251-257 Link Here
251
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
251
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
252
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
252
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
253
        [% END %]Cancel</a></fieldset>
253
        [% END %]Cancel</a></fieldset>
254
        </div>
254
255
    </form>
255
    </form>
256
[% ELSE %]
256
[% ELSE %]
257
    <h1>[% name | html %]</h1>
257
    <h1>[% name | html %]</h1>
Lines 296-312 Link Here
296
                [% END %]
296
                [% END %]
297
                [% IF ( notes ) %]<p><strong>Notes: </strong>
297
                [% IF ( notes ) %]<p><strong>Notes: </strong>
298
                    [% notes | html %]</p>[% END %]
298
                    [% notes | html %]</p>[% END %]
299
            </div>
299
            </div> <!-- .supplier-ordering-information -->
300
            </div>
300
            </div> <!-- /.col-sm-6 -->
301
301
302
            <div class="supplier-contact-details col-sm-6">
302
            <div class="col-sm-6">
303
                <h2>Contact</h2>
303
                <div class="supplier-contact-details">
304
                [% FOREACH contact IN contacts %]
304
                    <h2>Contact</h2>
305
                    [% INCLUDE show_contact %]
305
                    [% FOREACH contact IN contacts %]
306
                [% END %]
306
                        [% INCLUDE show_contact %]
307
            </div>
307
                    [% END %]
308
308
                </div>
309
            <div>
310
309
311
                <div class="subscription-details">
310
                <div class="subscription-details">
312
                    <h2>Subscription details</h2>
311
                    <h2>Subscription details</h2>
313
- 

Return to bug 21797