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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-2 / +9 lines)
Lines 297-304 aside { Link Here
297
            }
297
            }
298
298
299
            &+.action {
299
            &+.action {
300
                background-color: #FFF;
301
                display: flex;
300
                margin-left: 0;
302
                margin-left: 0;
301
                padding: 0;
303
                padding: 1rem;
304
305
                input, button, a {
306
                    display: block;
307
                    flex-grow: 1;
308
                }
302
            }
309
            }
303
        }
310
        }
304
    }
311
    }
Lines 808-814 fieldset { Link Here
808
        box-shadow: none;
815
        box-shadow: none;
809
        clear: both;
816
        clear: both;
810
        float: none;
817
        float: none;
811
        padding: 1rem;
818
        padding: 1rem 1rem 1rem 0;
812
        width: auto;
819
        width: auto;
813
820
814
        a {
821
        a {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-1 / +1 lines)
Lines 74-82 Acquisitions › Koha Link Here
74
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
74
            <input type="hidden" name="basketno" value="[% basket.basketno | html %]" />
75
75
76
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
76
            <input type="hidden" name="ordernumbers" value="[% ordernumbers.join(',') | html %]" />
77
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
78
        </div>
77
        </div>
79
    </fieldset>
78
    </fieldset>
79
    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
80
</form>
80
</form>
81
[% END %]
81
[% END %]
82
82
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +3 lines)
Lines 210-216 Link Here
210
        [% END %]
210
        [% END %]
211
            [% INCLUDE 'filter-orders.inc' %]
211
            [% INCLUDE 'filter-orders.inc' %]
212
            <input type="hidden" name="do_search" value="1" />
212
            <input type="hidden" name="do_search" value="1" />
213
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /></fieldset>
213
        </fieldset>
214
        <fieldset class="action">
215
            <input type="submit" class="btn btn-primary" value="Search" />
214
        </fieldset>
216
        </fieldset>
215
    </form>
217
    </form>
216
[% END %]
218
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-1 / +1 lines)
Lines 96-103 Link Here
96
                      <input name="description" id="description" type="text" /></li>
96
                      <input name="description" id="description" type="text" /></li>
97
                      <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>
97
                      <li><label for="uploadfile">File:</label><input name="uploadfile" type="file" id="uploadfile" /></li>
98
                  </ol>
98
                  </ol>
99
                    <fieldset class="action"><input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" /></fieldset>
100
              </fieldset>
99
              </fieldset>
100
                <fieldset class="action"><input name="upload" type="submit" id="upload" class="btn btn-primary" value="Upload file" /></fieldset>
101
          </form>
101
          </form>
102
      [% END %]
102
      [% END %]
103
    </main>
103
    </main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-35 / +34 lines)
Lines 5-11 Link Here
5
[% USE Price %]
5
[% USE Price %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% USE AuthorisedValues %]
7
[% USE AuthorisedValues %]
8
[% Asset.css("css/humanmsg.css") | $raw %]
9
8
10
[% BLOCK fund_dropdown %]
9
[% BLOCK fund_dropdown %]
11
    <label for="[% form_name | html %]">Fund: </label>
10
    <label for="[% form_name | html %]">Fund: </label>
Lines 18-23 Link Here
18
[% INCLUDE 'doc-head-open.inc' %]
17
[% INCLUDE 'doc-head-open.inc' %]
19
<title>Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>
18
<title>Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>
20
[% INCLUDE 'doc-head-close.inc' %]
19
[% INCLUDE 'doc-head-close.inc' %]
20
[% Asset.css("css/humanmsg.css") | $raw %]
21
</head>
21
</head>
22
22
23
<body id="acq_invoice" class="acq">
23
<body id="acq_invoice" class="acq">
Lines 130-159 Link Here
130
                            [% END # /IF ( invoiceclosedate ) %]
130
                            [% END # /IF ( invoiceclosedate ) %]
131
                        </ol>
131
                        </ol>
132
132
133
                        <fieldset class="rows">
133
                        [% IF available_additional_fields.count %]
134
                            [% IF available_additional_fields.count %]
134
                            [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
135
                                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
135
                        [% END %]
136
                            [% END %]
137
                        </fieldset>
138
136
139
                        [% UNLESS readonly %]
137
                    </fieldset>
138
                    [% UNLESS readonly %]
139
                        <fieldset class="action">
140
                            <input type="hidden" name="op" value="mod" />
140
                            <input type="hidden" name="op" value="mod" />
141
                            <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
141
                            <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
142
                            <fieldset class="action">
142
                            <input type="submit" class="btn btn-primary" value="Save" />
143
                                <input type="submit" class="btn btn-primary" value="Save" />
143
                            [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
144
                                [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %]
144
                                <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
145
                                    <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a>
145
                            [% END %]
146
                                [% END %]
146
                        </fieldset>
147
                            </fieldset>
147
                    [% END %]
148
                        [% END %]
149
                    </fieldset>
150
                </form>
148
                </form>
151
149
152
                <h3>Adjustments</h3>
153
154
                <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
150
                <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
155
                    <fieldset class="rows">
151
                    <fieldset class="rows">
156
                        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
152
                        <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" />
153
                        <h3>Adjustments</h3>
157
                        [% IF (adjustments && adjustments.count > 0) %]
154
                        [% IF (adjustments && adjustments.count > 0) %]
158
                            <table id="invoice_adj_table">
155
                            <table id="invoice_adj_table">
159
                                <tr>
156
                                <tr>
Lines 241-249 Link Here
241
                        [% END # /IF adjustments %]
238
                        [% END # /IF adjustments %]
242
239
243
                        [% UNLESS readonly %]
240
                        [% UNLESS readonly %]
244
                            <p>
241
                            <div id="show_invoice_adjustment">
245
                                <a href="#" id="show_invoice_adjustment" class="toggle_invoice_adjustment"><i class="fa fa-plus"></i> Add an adjustment</a>
242
                                <p>
246
                            </p>
243
                                    <a href="#" class="toggle_invoice_adjustment"><i class="fa fa-plus"></i> Add an adjustment</a>
244
                                </p>
245
                            </div>
247
246
248
                            <fieldset id="add_invoice_adjustment" style="display:none">
247
                            <fieldset id="add_invoice_adjustment" style="display:none">
249
                                <h4>Add an adjustment</h4>
248
                                <h4>Add an adjustment</h4>
Lines 285-302 Link Here
285
                                        <input type="checkbox" name="encumber_open" id="encumber_new" value="new" />
284
                                        <input type="checkbox" name="encumber_open" id="encumber_new" value="new" />
286
                                        <input type="hidden" name="delete" value="">
285
                                        <input type="hidden" name="delete" value="">
287
                                    </li>
286
                                    </li>
288
                                    <li>
289
                                        <span class="label">&nbsp;</span>
290
                                        <a href="#" id="cancel_invoice_adjustment" class="toggle_invoice_adjustment" style="display:none"><i class="fa fa-remove"></i> Cancel</a>
291
                                    </li>
292
                                </ol>
287
                                </ol>
293
                            </fieldset> <!-- /#add_invoice_adjustment -->
288
                            </fieldset> <!-- /#add_invoice_adjustment -->
294
                            <fieldset class="action">
295
                                <input type="hidden" name="op" value="mod_adj" />
296
                                <input type="submit" class="btn btn-primary" value="Update adjustments" />
297
                            </fieldset>
298
                        [% END #/UNLESS readonly %]
289
                        [% END #/UNLESS readonly %]
299
                    </fieldset>
290
                    </fieldset>
291
                    [% UNLESS readonly %]
292
                        <fieldset class="action" id="submit_invoice_adjustment" style="display:none">
293
                            <input type="hidden" name="op" value="mod_adj" />
294
                            <input type="submit" class="btn btn-primary" value="Update adjustments" />
295
                            <a href="#" id="cancel_invoice_adjustment" class="toggle_invoice_adjustment cancel" style="display:none"><i class="fa fa-remove"></i> Cancel</a>
296
                        </fieldset>
297
                    [% END #/UNLESS readonly %]
300
                </form>
298
                </form>
301
299
302
                <p>
300
                <p>
Lines 304-312 Link Here
304
                    [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %]
302
                    [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %]
305
                </p>
303
                </p>
306
304
307
                <h2>Invoice details</h2>
308
309
                <fieldset>
305
                <fieldset>
306
                    <legend>Invoice details</legend>
310
                    [% IF orders_loop.size %]
307
                    [% IF orders_loop.size %]
311
                        <label for="show_all_details">
308
                        <label for="show_all_details">
312
                            <input type="checkbox" style="vertical-align: middle;" id="show_all_details" />
309
                            <input type="checkbox" style="vertical-align: middle;" id="show_all_details" />
Lines 433-440 Link Here
433
                            [% END %]
430
                            [% END %]
434
                        </div>
431
                        </div>
435
                    [% END # /IF orders_loop.size %]
432
                    [% END # /IF orders_loop.size %]
436
                    [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
433
                </fieldset>
437
                        <br />
434
435
                [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
436
                    <div class="page-section">
438
                        <h2>Files attached to invoice</h2>
437
                        <h2>Files attached to invoice</h2>
439
                        <table id="invoice_files_table">
438
                        <table id="invoice_files_table">
440
                            <thead>
439
                            <thead>
Lines 460-467 Link Here
460
                                [% END %]
459
                                [% END %]
461
                            </tbody>
460
                            </tbody>
462
                        </table> <!-- /#invoice_files_table -->
461
                        </table> <!-- /#invoice_files_table -->
463
                    [% END # /IF AcqEnableFiles %]
462
                    </div>
464
                </fieldset>
463
                [% END # /IF AcqEnableFiles %]
465
            </main>
464
            </main>
466
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
465
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
467
466
Lines 563-569 Link Here
563
            updateColumnsVisibility(false);
562
            updateColumnsVisibility(false);
564
            $(".toggle_invoice_adjustment").on("click", function(e){
563
            $(".toggle_invoice_adjustment").on("click", function(e){
565
                e.preventDefault();
564
                e.preventDefault();
566
                $("#show_invoice_adjustment, #cancel_invoice_adjustment, #add_invoice_adjustment").toggle();
565
                $("#show_invoice_adjustment, #cancel_invoice_adjustment, #add_invoice_adjustment, #submit_invoice_adjustment").toggle();
567
            });
566
            });
568
            $("a.delete_adjustment").click(function(){
567
            $("a.delete_adjustment").click(function(){
569
                return ( confirm( _("Are you sure you want to delete this file ?") ) );
568
                return ( confirm( _("Are you sure you want to delete this file ?") ) );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-3 / +3 lines)
Lines 406-415 Link Here
406
                            </li>
406
                            </li>
407
                        [% END %]
407
                        [% END %]
408
                        </ol>
408
                        </ol>
409
                        <fieldset class="action">
410
                            <input type="submit" class="btn btn-primary" value="Search" />
411
                        </fieldset>
412
                    </fieldset> <!-- /.sidebar.brief -->
409
                    </fieldset> <!-- /.sidebar.brief -->
410
                    <fieldset class="action">
411
                        <input type="submit" class="btn btn-primary" value="Search" />
412
                    </fieldset>
413
                    <input type="hidden" name="op" id="op" value="do_search" />
413
                    <input type="hidden" name="op" id="op" value="do_search" />
414
                </form>
414
                </form>
415
                [% INCLUDE 'acquisitions-menu.inc' %]
415
                [% INCLUDE 'acquisitions-menu.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-1 / +1 lines)
Lines 266-273 Link Here
266
            [% END %]
266
            [% END %]
267
        </select>
267
        </select>
268
</ol>
268
</ol>
269
    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
270
</fieldset>
269
</fieldset>
270
    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
271
    </form>
271
    </form>
272
[% INCLUDE 'acquisitions-menu.inc' %]
272
[% INCLUDE 'acquisitions-menu.inc' %]
273
</aside>
273
</aside>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-5 / +6 lines)
Lines 102-108 Link Here
102
                </select>
102
                </select>
103
                <input type="submit" class="btn btn-primary" value="Filter" />
103
                <input type="submit" class="btn btn-primary" value="Filter" />
104
            </form>
104
            </form>
105
            <form action="[% scriptname | html %]" method="post" id="uncertainprices">
105
        </div> <!-- /.page-section -->
106
        <form action="[% scriptname | html %]" method="post" id="uncertainprices">
107
            <fieldset class="rows">
106
                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
108
                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
107
                <input type="hidden" name="op" value="validate" />
109
                <input type="hidden" name="op" value="validate" />
108
                <table id="uncertainpricet">
110
                <table id="uncertainpricet">
Lines 159-167 Link Here
159
                        [% END %]
161
                        [% END %]
160
                    </tbody>
162
                    </tbody>
161
                </table>
163
                </table>
162
                <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
164
            </fieldset>
163
            </form>
165
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
164
        </div> <!-- /.page-section -->
166
        </form>
165
	[% END %]
167
	[% END %]
166
168
167
</main>
169
</main>
168
- 

Return to bug 32746