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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-16 / +17 lines)
Lines 14-31 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]][% END %] (order #[% ordernumber %])</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]][% END %] (order #[% ordernumber %])</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
   
18
    <div class="row">
19
   <div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
	<div id="yui-main">
20
            <main>
21
	<div class="yui-b">
22
21
23
<h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]] [% END %] (order #[% ordernumber %])</h1>
22
<h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice |html %]] [% END %] (order #[% ordernumber %])</h1>
24
23
25
[% IF ( count ) %]
24
[% IF ( count ) %]
26
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
25
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
27
<div class="yui-g">
26
<div class="row">
28
<div class="yui-u first">
27
<div class="col-sm-6">
29
    <div class="error" style="display:none"></div>
28
    <div class="error" style="display:none"></div>
30
29
31
    <fieldset class="rows">
30
    <fieldset class="rows">
Lines 151-157 Link Here
151
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
150
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
152
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
151
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
153
	</div>
152
	</div>
154
	<div class="yui-u">
153
    <div class="col-sm-6">
155
    <fieldset class="rows">
154
    <fieldset class="rows">
156
    <legend>Accounting details</legend>
155
    <legend>Accounting details</legend>
157
        <ol>
156
        <ol>
Lines 247-253 Link Here
247
    </fieldset>
246
    </fieldset>
248
247
249
</div>
248
</div>
250
</div><div class="yui-g"><fieldset class="action">
249
</div><div class="row"><fieldset class="action">
251
        <input type="submit"  value="Save" class="button" accesskey="w" />
250
        <input type="submit"  value="Save" class="button" accesskey="w" />
252
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]&sticky_filters=1">Cancel</a>
251
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]&sticky_filters=1">Cancel</a>
253
</fieldset></div>    </form>
252
</fieldset></div>    </form>
Lines 255-267 Link Here
255
    This ordernumber does not exist.
254
    This ordernumber does not exist.
256
[% END %]
255
[% END %]
257
256
258
</div>
257
</main>
259
</div>
258
</div> <!-- /.col-sm-10.col-sm-push-2 -->
260
<div class="yui-b">
261
[% INCLUDE 'acquisitions-menu.inc' %]
262
</div>
263
</div>
264
259
260
<div class="col-sm-2 col-sm-pull-10">
261
    <aside>
262
        [% INCLUDE 'acquisitions-menu.inc' %]
263
    </aside>
264
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
265
</div> <!-- /.row -->
265
[% MACRO jsinclude BLOCK %]
266
[% MACRO jsinclude BLOCK %]
266
    [% Asset.js("js/acquisitions-menu.js") %]
267
    [% Asset.js("js/acquisitions-menu.js") %]
267
[% INCLUDE 'calendar.inc' %]
268
[% INCLUDE 'calendar.inc' %]
Lines 269-275 Link Here
269
    [% Asset.js("js/additem.js") %]
270
    [% Asset.js("js/additem.js") %]
270
    [% Asset.js("js/cataloging.js") %]
271
    [% Asset.js("js/cataloging.js") %]
271
    [% Asset.js("js/prevent_submit.js") %]
272
    [% Asset.js("js/prevent_submit.js") %]
272
    <script type="text/javascript">
273
    <script>
273
        function Check(form) {
274
        function Check(form) {
274
            [% IF (AcqCreateItemReceiving) %]
275
            [% IF (AcqCreateItemReceiving) %]
275
                var total_errors = CheckMandatorySubfields(form);
276
                var total_errors = CheckMandatorySubfields(form);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-11 / +14 lines)
Lines 27-37 Link Here
27
    [% END %]
27
    [% END %]
28
</div>
28
</div>
29
29
30
<div id="doc3" class="yui-t2">
31
30
32
   <div id="bd">
31
<div class="main container-fluid">
33
	<div id="yui-main">
32
    <div class="row">
34
	<div class="yui-b">
33
        <div class="col-sm-10 col-sm-push-2">
34
            <main>
35
35
	[% IF ( receive_error ) %]
36
	[% IF ( receive_error ) %]
36
	<div class="dialog alert">
37
	<div class="dialog alert">
37
	<h3>Error adding items:</h3>
38
	<h3>Error adding items:</h3>
Lines 378-388 Link Here
378
379
379
[% END %]
380
[% END %]
380
381
381
</div>
382
</main>
382
</div>
383
</div> <!-- /.col-sm-10.col-sm-push-2 -->
383
384
385
<div class="col-sm-2 col-sm-pull-10">
386
<aside>
384
387
385
<div class="yui-b">
386
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
388
<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
387
  <fieldset class="brief">
389
  <fieldset class="brief">
388
    <h4>Filter</h4>
390
    <h4>Filter</h4>
Lines 419-434 Link Here
419
  </fieldset>
421
  </fieldset>
420
</form>
422
</form>
421
[% INCLUDE 'acquisitions-menu.inc' %]
423
[% INCLUDE 'acquisitions-menu.inc' %]
422
</div>
424
    </aside>
423
</div>
425
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
426
</div> <!-- /.row -->
424
427
425
[% MACRO jsinclude BLOCK %]
428
[% MACRO jsinclude BLOCK %]
426
    [% Asset.js("js/acquisitions-menu.js") %]
429
    [% Asset.js("js/acquisitions-menu.js") %]
427
    [% INCLUDE 'datatables.inc' %]
430
    [% INCLUDE 'datatables.inc' %]
428
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %]
431
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %]
429
    [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %]
432
    [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %]
430
    <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
433
    <style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
431
    <script type="text/javascript">
434
    <script>
432
435
433
        dt_overwrite_html_sorting_localeCompare();
436
        dt_overwrite_html_sorting_localeCompare();
434
        var sticky_filters = [% sticky_filters %];
437
        var sticky_filters = [% sticky_filters %];
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-12 / +20 lines)
Lines 13-23 Link Here
13
13
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>  &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive shipment from vendor [% name %]</div>
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>  &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive shipment from vendor [% name %]</div>
15
15
16
[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
16
<div class="main container-fluid">
17
   
17
    <div class="row">
18
   <div id="bd">
18
        [% IF ( count ) %]
19
	<div id="yui-main">
19
            <div class="col-sm-10 col-sm-push-2">
20
	<div class="yui-b">
20
        [% ELSE %]
21
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
22
        [% END %]
23
            <main>
21
24
22
[% IF ( error_failed_to_create_invoice ) %]
25
[% IF ( error_failed_to_create_invoice ) %]
23
    <div id="error" class="dialog alert">
26
    <div id="error" class="dialog alert">
Lines 171-180 Link Here
171
            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a></fieldset>
174
            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a></fieldset>
172
        </form>
175
        </form>
173
    </div>
176
    </div>
174
</div>
177
</main>
175
</div>
178
</div> <!-- /.col-sm-10.col-sm-push-2 -->
176
<div class="yui-b">
179
177
[% IF ( count ) %]<form method="get" action="parcels.pl">
180
[% IF ( count ) %]
181
<div class="col-sm-2 col-sm-pull-10">
182
    <aside>
183
    <form method="get" action="parcels.pl">
178
    <fieldset class="brief">
184
    <fieldset class="brief">
179
	<h4>Filter</h4>
185
	<h4>Filter</h4>
180
        <ol>
186
        <ol>
Lines 197-205 Link Here
197
        </ol>
203
        </ol>
198
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Clear</a></fieldset>
204
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Clear</a></fieldset>
199
	</fieldset>
205
	</fieldset>
200
</form>[% END %]
206
</form>
201
</div>
207
</aside>
202
</div>
208
</div>  <!-- /.col-sm-2.col-sm-pull-10 -->
209
[% END %]
210
</div> <!-- /.row -->
203
211
204
[% MACRO jsinclude BLOCK %]
212
[% MACRO jsinclude BLOCK %]
205
    [% Asset.js("js/acquisitions-menu.js") %]
213
    [% Asset.js("js/acquisitions-menu.js") %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-13 / +15 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent - [% fund_code %]</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent - [% fund_code %]</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
18
    <div class="row">
19
<div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
    <div id="yui-main">
20
            <main>
21
        <div class="yui-b">
22
21
23
<h1>Fund: [% fund_code %]</h1>
22
<h1>Fund: [% fund_code %]</h1>
24
<h2>Spent</h2>
23
<h2>Spent</h2>
Lines 78-84 Link Here
78
77
79
    <tfoot>
78
    <tfoot>
80
        [% IF shipmentcosts.size %]
79
        [% IF shipmentcosts.size %]
81
            <tr valign="top">
80
            <tr>
82
                <td colspan="9"> Sub total </td>
81
                <td colspan="9"> Sub total </td>
83
                <td class="data"> [% subtotal %] </td>
82
                <td class="data"> [% subtotal %] </td>
84
            </tr>
83
            </tr>
Lines 97-113 Link Here
97
    </tfoot>
96
    </tfoot>
98
</table>
97
</table>
99
98
100
</div>
99
</main>
101
</div>
100
</div> <!-- /.col-sm-10.col-sm-push-2 -->
102
<div class="yui-b">
101
103
[% INCLUDE 'acquisitions-menu.inc' %]
102
<div class="col-sm-2 col-sm-pull-10">
104
</div>
103
    <aside>
105
</div>
104
        [% INCLUDE 'acquisitions-menu.inc' %]
105
    </aside>
106
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
107
</div> <!-- /.row -->
106
108
107
[% MACRO jsinclude BLOCK %]
109
[% MACRO jsinclude BLOCK %]
108
    [% Asset.js("js/acquisitions-menu.js") %]
110
    [% Asset.js("js/acquisitions-menu.js") %]
109
    [% INCLUDE 'datatables.inc' %]
111
    [% INCLUDE 'datatables.inc' %]
110
    <script type="text/javascript">
112
    <script>
111
        $(document).ready(function() {
113
        $(document).ready(function() {
112
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
114
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
113
                "aoColumnDefs": [
115
                "aoColumnDefs": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-19 / +19 lines)
Lines 99-109 Link Here
99
99
100
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name |html %]</a> &rsaquo; Update: [% name |html %][% ELSE %]Add vendor[% END %] [% ELSE %][% name |html %][% END %]</div>
100
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name |html %]</a> &rsaquo; Update: [% name |html %][% ELSE %]Add vendor[% END %] [% ELSE %][% name |html %][% END %]</div>
101
101
102
<div id="doc3" class="yui-t2">
102
<div class="main container-fluid">
103
    <div class="row">
104
        <div class="col-sm-10 col-sm-push-2">
105
            <main>
103
106
104
<div id="bd">
105
    <div id="yui-main">
106
    <div class="yui-b">
107
    [% IF ( enter ) %]
107
    [% IF ( enter ) %]
108
        [% IF ( booksellerid ) %]
108
        [% IF ( booksellerid ) %]
109
        <h1>Update: [% name |html %]</h1>
109
        <h1>Update: [% name |html %]</h1>
Lines 114-120 Link Here
114
[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
114
[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
115
[% IF ( enter ) %]
115
[% IF ( enter ) %]
116
    <form action="updatesupplier.pl" name="updatesupplier" class="validated" method="post">
116
    <form action="updatesupplier.pl" name="updatesupplier" class="validated" method="post">
117
    <div class="yui-g">
118
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
117
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
119
        <fieldset class="rows">
118
        <fieldset class="rows">
120
            <legend>Company details</legend>
119
            <legend>Company details</legend>
Lines 147-154 Link Here
147
            [% END %]
146
            [% END %]
148
            <button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button>
147
            <button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button>
149
        </fieldset>
148
        </fieldset>
150
    </div>
149
151
        <div class="yui-g">
152
        <fieldset class="rows">
150
        <fieldset class="rows">
153
            <legend>Ordering information</legend>
151
            <legend>Ordering information</legend>
154
            <ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
152
            <ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
Lines 243-254 Link Here
243
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
241
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
244
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
242
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
245
        [% END %]Cancel</a></fieldset>
243
        [% END %]Cancel</a></fieldset>
246
        </div>
247
    </form>
244
    </form>
248
[% ELSE %]
245
[% ELSE %]
249
    <h1>[% name |html %]</h1>
246
    <h1>[% name |html %]</h1>
250
        <div class="yui-g">
247
        <div class="row">
251
            <div id="supplier-company-details" class="yui-u first">
248
            <div id="supplier-company-details" class="col-sm-6">
252
                <h2>Vendor details</h2>
249
                <h2>Vendor details</h2>
253
                <p><span class="label">Company name: </span>[% name |html %]</p>
250
                <p><span class="label">Company name: </span>[% name |html %]</p>
254
                <p><span class="label">Postal address: </span>[% postal |html %]</p>
251
                <p><span class="label">Postal address: </span>[% postal |html %]</p>
Lines 291-297 Link Here
291
            </div>
288
            </div>
292
            </div>
289
            </div>
293
290
294
            <div class="supplier-contact-details yui-u">
291
            <div class="supplier-contact-details col-sm-6">
295
                <h2>Contact</h2>
292
                <h2>Contact</h2>
296
                [% FOREACH contact IN contacts %]
293
                [% FOREACH contact IN contacts %]
297
                    [% INCLUDE show_contact %]
294
                    [% INCLUDE show_contact %]
Lines 310-316 Link Here
310
        </div>
307
        </div>
311
308
312
        [% IF ( contracts ) %]
309
        [% IF ( contracts ) %]
313
            <div id="supplier-contracts" class="yui-g">
310
            <div id="supplier-contracts">
314
                <h2>Contract(s)</h2>
311
                <h2>Contract(s)</h2>
315
                <table id="contractst">
312
                <table id="contractst">
316
                  <thead>
313
                  <thead>
Lines 344-360 Link Here
344
341
345
[% END %]
342
[% END %]
346
343
347
</div>
344
</main>
348
</div>
345
</div> <!-- /.col-sm-10.col-sm-push-2 -->
349
<div class="yui-b">
346
350
[% INCLUDE 'vendor-menu.inc' %]
347
<div class="col-sm-2 col-sm-pull-10">
351
</div>
348
    <aside>
352
</div>
349
        [% INCLUDE 'vendor-menu.inc' %]
350
    </aside>
351
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
352
</div> <!-- /.row -->
353
353
354
[% MACRO jsinclude BLOCK %]
354
[% MACRO jsinclude BLOCK %]
355
    [% Asset.js("js/acquisitions-menu.js") %]
355
    [% Asset.js("js/acquisitions-menu.js") %]
356
    [% INCLUDE 'datatables.inc' %]
356
    [% INCLUDE 'datatables.inc' %]
357
    <script type="text/javascript">
357
    <script>
358
        function confirm_deletion() {
358
        function confirm_deletion() {
359
            if (confirm(_("Confirm deletion of this vendor ?"))) {
359
            if (confirm(_("Confirm deletion of this vendor ?"))) {
360
                window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=delete";
360
                window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=delete";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-13 / +14 lines)
Lines 13-23 Link Here
13
13
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Uncertain prices for vendor [% booksellername %][% ELSE %]Uncertain prices[% END %]</div>
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Uncertain prices for vendor [% booksellername %][% ELSE %]Uncertain prices[% END %]</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div class="main container-fluid">
17
17
    <div class="row">
18
    <div id="bd">
18
        <div class="col-sm-10 col-sm-push-2">
19
    <div id="yui-main">
19
            <main>
20
    <div class="yui-b">
21
20
22
[% INCLUDE 'acquisitions-toolbar.inc' %]
21
[% INCLUDE 'acquisitions-toolbar.inc' %]
23
        [% IF ( validate ) %]
22
        [% IF ( validate ) %]
Lines 131-147 Link Here
131
	</form>
130
	</form>
132
	[% END %]
131
	[% END %]
133
132
134
</div>
133
</main>
135
</div>
134
</div> <!-- /.col-sm-10.col-sm-push-2 -->
136
<div class="yui-b">
135
137
[% INCLUDE 'vendor-menu.inc' %]
136
<div class="col-sm-2 col-sm-pull-10">
138
</div>
137
    <aside>
139
</div>
138
        [% INCLUDE 'vendor-menu.inc' %]
139
    </aside>
140
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
141
</div> <!-- /.row -->
140
142
141
[% MACRO jsinclude BLOCK %]
143
[% MACRO jsinclude BLOCK %]
142
    [% Asset.js("js/acquisitions-menu.js") %]
144
    [% Asset.js("js/acquisitions-menu.js") %]
143
    [% INCLUDE 'datatables.inc' %]
145
    [% INCLUDE 'datatables.inc' %]
144
    <script type="text/javascript">
146
    <script>
145
        $(document).ready(function() {
147
        $(document).ready(function() {
146
            var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
148
            var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
147
                "aoColumnDefs": [
149
                "aoColumnDefs": [
148
- 

Return to bug 20690