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

Return to bug 20690