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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt (-14 / +16 lines)
Lines 30-49 Link Here
30
            <main>
30
            <main>
31
31
32
    <h1>Select the library account submitting the EDI order</h1>
32
    <h1>Select the library account submitting the EDI order</h1>
33
    <br />
33
34
    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
34
    <div class="page-section">
35
         <p>Select ordering library account: </p>
35
        <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
36
         <select id="ean" name="ean">
36
            <p>Select ordering library account: </p>
37
             [% FOREACH eanacct IN eans %]
37
            <select id="ean" name="ean">
38
             <option value="[% eanacct.ean | html %]">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct.description %][[% eanacct.description | html %]][% END %]</option>
38
                [% FOREACH eanacct IN eans %]
39
             [% END %]
39
                    <option value="[% eanacct.ean | html %]">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct.description %][[% eanacct.description | html %]][% END %]</option>
40
        </select>
40
                [% END %]
41
        <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
41
            </select>
42
        <input type="hidden" value="ediorder" name="op" />
42
            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
43
        <p>
43
            <input type="hidden" value="ediorder" name="op" />
44
            <input type="submit" class="btn btn-primary" value="Send EDI order" />
44
            <p>
45
        </p>
45
                <input type="submit" class="btn btn-primary" value="Send EDI order" />
46
    </form>
46
            </p>
47
        </form>
48
    </div> <!-- /.page-section -->
47
</main>
49
</main>
48
</div> <!-- /.col-sm-10.col-sm-push-2 -->
50
</div> <!-- /.col-sm-10.col-sm-push-2 -->
49
51
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-1 / +1 lines)
Lines 37-43 Link Here
37
37
38
38
39
<h1>EDIFACT messages</h1>
39
<h1>EDIFACT messages</h1>
40
<div id="acqui_edifactmsgs">
40
<div id="acqui_edifactmsgs" class="page-section">
41
41
42
[% IF ( messages ) %]
42
[% IF ( messages ) %]
43
<table id="edi_msgs">
43
<table id="edi_msgs">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +1 lines)
Lines 63-69 Link Here
63
63
64
64
65
    [% IF ( order_loop ) %]<h1>Search results</h1>
65
    [% IF ( order_loop ) %]<h1>Search results</h1>
66
	<div id="acqui_histsearch">
66
    <div id="acqui_histsearch" class="page-section">
67
        <table id="histsearcht">
67
        <table id="histsearcht">
68
            <thead>
68
            <thead>
69
			<tr>
69
			<tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-1 / +1 lines)
Lines 38-44 Link Here
38
            <main>
38
            <main>
39
39
40
<h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
40
<h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
41
<div id="acqui_lateorders">
41
<div id="acqui_lateorders" class="page-section">
42
42
43
[% IF error_claim %]
43
[% IF error_claim %]
44
    [% IF ( error_claim == "no_email" ) %]
44
    [% IF ( error_claim == "no_email" ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-62 / +64 lines)
Lines 45-114 Link Here
45
            <main>
45
            <main>
46
46
47
            <h1>Serials subscriptions</h1>
47
            <h1>Serials subscriptions</h1>
48
            [% IF (done_searched) %]
48
            <div class="page-section">
49
                <label for="show_only_renewed">
49
                [% IF (done_searched) %]
50
                    <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
50
                    <label for="show_only_renewed">
51
                    Show only renewed
51
                        <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
52
                </label>
52
                        Show only renewed
53
                [% IF (subs_loop) %]
53
                    </label>
54
                    <table id="srlt">
54
                    [% IF (subs_loop) %]
55
                        <thead>
55
                        <table id="srlt">
56
                            <tr>
56
                            <thead>
57
                                <th>ISSN</th>
57
                                <tr>
58
                                <th class="anti-the">Title</th>
58
                                    <th>ISSN</th>
59
                                <th> Notes </th>
59
                                    <th class="anti-the">Title</th>
60
                                <th>Vendor</th>
60
                                    <th> Notes </th>
61
                                <th>Library</th>
61
                                    <th>Vendor</th>
62
                                <th>Call number</th>
62
                                    <th>Library</th>
63
                                <th>Expiration date</th>
63
                                    <th>Call number</th>
64
                                <th class="NoSort"></th>
64
                                    <th>Expiration date</th>
65
                            </tr>
65
                                    <th class="NoSort"></th>
66
                        </thead>
66
                                </tr>
67
                        <tbody>
67
                            </thead>
68
                        [% FOREACH sub IN subs_loop %]
68
                            <tbody>
69
                            <tr data-reneweddate="[% sub.reneweddate | html %]" >
69
                            [% FOREACH sub IN subs_loop %]
70
                                <td>[% sub.issn | html %]</td>
70
                                <tr data-reneweddate="[% sub.reneweddate | html %]" >
71
                                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
71
                                    <td>[% sub.issn | html %]</td>
72
                                ---
72
                                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
73
                            [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
73
                                    ---
74
                                </td>
74
                                [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
75
                                <td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
75
                                    </td>
76
                                    [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
76
                                    <td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
77
                                </td>
77
                                        [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
78
                                <td>
78
                                    </td>
79
                                    [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
79
                                    <td>
80
                                </td>
80
                                        [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
81
                                <td>
81
                                    </td>
82
                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
82
                                    <td>
83
                                </td>
83
                                        [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
84
                                <td>
84
                                    </td>
85
                                    [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
85
                                    <td>
86
                                </td>
86
                                        [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
87
                                <td data-order="[% sub.enddate | html %]">
87
                                    </td>
88
                                    [% sub.enddate | $KohaDates %]
88
                                    <td data-order="[% sub.enddate | html %]">
89
                                </td>
89
                                        [% sub.enddate | $KohaDates %]
90
                                <td class="actions">
90
                                    </td>
91
                                    [% IF (sub.alreadyOnOrder) %]
91
                                    <td class="actions">
92
                                        Outstanding order
92
                                        [% IF (sub.alreadyOnOrder) %]
93
                                    [% END %]
93
                                            Outstanding order
94
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
94
                                        [% END %]
95
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
95
                                        [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
96
                                            <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
96
                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
97
                                        </a>
97
                                                <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
98
                                    [% ELSE %]
98
                                            </a>
99
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
99
                                        [% ELSE %]
100
                                    [% END %]
100
                                            <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
101
                                </td>
101
                                        [% END %]
102
                            </tr>
102
                                    </td>
103
                        [% END %]
103
                                </tr>
104
                        </tbody>
104
                            [% END %]
105
                    </table>
105
                            </tbody>
106
                        </table>
107
                    [% ELSE %]
108
                        <p>Sorry, there is no result for your search.</p>
109
                    [% END %]
106
                [% ELSE %]
110
                [% ELSE %]
107
                    <p>Sorry, there is no result for your search.</p>
111
                    <p>Use the search form on the left to find subscriptions.</p>
108
                [% END %]
112
                [% END %]
109
            [% ELSE %]
113
            </div> <!-- /.page-section -->
110
                <p>Use the search form on the left to find subscriptions.</p>
111
            [% END %]
112
        </main>
114
        </main>
113
    </div> <!-- /.col-sm-10.col-sm-push-2 -->
115
    </div> <!-- /.col-sm-10.col-sm-push-2 -->
114
116
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-64 / +67 lines)
Lines 44-115 Link Here
44
            <main>
44
            <main>
45
45
46
<h1>Suggestions</h1>
46
<h1>Suggestions</h1>
47
    [% IF suggestions.size %]
47
48
    <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
48
    <div class="page-section">
49
    <table id="suggestionst">
49
        [% IF suggestions.size %]
50
        <thead>
50
            <a href="#" id="show_only_mine">Show only mine</a> | <a href="#" id="show_all">Show all suggestions</a>
51
        <tr>
51
            <table id="suggestionst">
52
            <th>Mine</th>
52
                <thead>
53
            <th>Suggestion</th>
53
                <tr>
54
            <th>Suggested by</th>
54
                    <th>Mine</th>
55
            <th>Accepted by</th>
55
                    <th>Suggestion</th>
56
            <th>Library</th>
56
                    <th>Suggested by</th>
57
            <th>Fund</th>
57
                    <th>Accepted by</th>
58
            <th>Price</th>
58
                    <th>Library</th>
59
            <th>Quantity</th>
59
                    <th>Fund</th>
60
            <th>Total</th>
60
                    <th>Price</th>
61
            <th>&nbsp;</th>
61
                    <th>Quantity</th>
62
        </tr>
62
                    <th>Total</th>
63
        </thead>
63
                    <th>&nbsp;</th>
64
        <tbody>
64
                </tr>
65
        [% FOREACH suggestion IN suggestions %]
65
                </thead>
66
            <tr>
66
                <tbody>
67
                <td>[% suggestion.managedby | html %]</td>
67
                    [% FOREACH suggestion IN suggestions %]
68
                <td>
68
                        <tr>
69
                    <p>[% suggestion.title | html %] - [% suggestion.author | html %]</p>
69
                            <td>[% suggestion.managedby | html %]</td>
70
                    <p>
70
                            <td>
71
                        [% IF ( suggestion.copyrightdate ) %]&copy; [% suggestion.copyrightdate | html %] [% END %]
71
                                <p>[% suggestion.title | html %] - [% suggestion.author | html %]</p>
72
                        [% IF ( suggestion.volumedesc ) %]volume: <em>[% suggestion.volumedesc | html %]</em> [% END %]
72
                                <p>
73
                        [% IF ( suggestion.isbn ) %]ISBN: <em>[% suggestion.isbn | html %]</em> [% END %]
73
                                    [% IF ( suggestion.copyrightdate ) %]&copy; [% suggestion.copyrightdate | html %] [% END %]
74
                        [% IF ( suggestion.publishercode ) %]<br />published by: [% suggestion.publishercode | html %] [% END %]
74
                                    [% IF ( suggestion.volumedesc ) %]volume: <em>[% suggestion.volumedesc | html %]</em> [% END %]
75
                        [% IF ( suggestion.publicationyear ) %] in <em>[% suggestion.publicationyear | html %]</em> [% END %]
75
                                    [% IF ( suggestion.isbn ) %]ISBN: <em>[% suggestion.isbn | html %]</em> [% END %]
76
                        [% IF ( suggestion.place ) %] in <em>[% suggestion.place | html %]</em> [% END %]
76
                                    [% IF ( suggestion.publishercode ) %]<br />published by: [% suggestion.publishercode | html %] [% END %]
77
                        [% IF ( suggestion.note ) %]<p><em>([% suggestion.note | html %])</em></p> [% END %]
77
                                    [% IF ( suggestion.publicationyear ) %] in <em>[% suggestion.publicationyear | html %]</em> [% END %]
78
                    </p>
78
                                    [% IF ( suggestion.place ) %] in <em>[% suggestion.place | html %]</em> [% END %]
79
                </td>
79
                                    [% IF ( suggestion.note ) %]<p><em>([% suggestion.note | html %])</em></p> [% END %]
80
                <td>[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %]</td>
80
                                </p>
81
                <td>[% INCLUDE 'patron-title.inc' patron => suggestion.manager %]</td>
81
                            </td>
82
                <td>
82
                            <td>[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %]</td>
83
                    [% Branches.GetName(suggestion.branchcode) | html %]
83
                            <td>[% INCLUDE 'patron-title.inc' patron => suggestion.manager %]</td>
84
                </td>
84
                            <td>
85
                <td>
85
                                [% Branches.GetName(suggestion.branchcode) | html %]
86
                    [% suggestion.fund.budget_name | html %]
86
                            </td>
87
                </td>
87
                            <td>
88
                <td>
88
                                [% suggestion.fund.budget_name | html %]
89
                    [% suggestion.price | $Price %]
89
                            </td>
90
                </td>
90
                            <td>
91
                <td>
91
                                [% suggestion.price | $Price %]
92
                    [% IF (suggestion.quantity > 0) %]
92
                            </td>
93
                        [% suggestion.quantity | html %]
93
                            <td>
94
                    [% END %]
94
                                [% IF (suggestion.quantity > 0) %]
95
                </td>
95
                                    [% suggestion.quantity | html %]
96
                <td>
96
                                [% END %]
97
                    [% suggestion.total | $Price %]
97
                            </td>
98
                </td>
98
                            <td>
99
                <td class="actions">
99
                                [% suggestion.total | $Price %]
100
                    [% IF ( suggestion.biblionumber ) %]
100
                            </td>
101
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
101
                            <td class="actions">
102
                    [% ELSE %]
102
                                [% IF ( suggestion.biblionumber ) %]
103
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
103
                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]&amp;biblio=[% suggestion.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
104
                                [% ELSE %]
105
                                    <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestion.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
106
                                [% END %]
107
                            </td>
108
                        </tr>
104
                    [% END %]
109
                    [% END %]
105
                </td>
110
                </tbody>
106
            </tr>
111
            </table>
112
        [% ELSE %]
113
            There are no outstanding (accepted) suggestions.
107
        [% END %]
114
        [% END %]
108
        </tbody>
115
    </div> <!-- /.page-section -->
109
    </table>
110
    [% ELSE %]
111
        There are no outstanding (accepted) suggestions.
112
    [% END %]
113
</main>
116
</main>
114
</div> <!-- /.col-sm-10.col-sm-push-2 -->
117
</div> <!-- /.col-sm-10.col-sm-push-2 -->
115
118
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-80 / +82 lines)
Lines 41-128 Link Here
41
41
42
<h1>Ordered - Fund: [% fund_code | html %]</h1>
42
<h1>Ordered - Fund: [% fund_code | html %]</h1>
43
43
44
<table id="spent">
44
                <div class="page-section">
45
    <thead>
45
                    <table id="spent">
46
    <tr>
46
                        <thead>
47
    <th class="anti-the"> Title </th>
47
                        <tr>
48
    <th> [% tp('noun', 'Order') | html %] </th>
48
                        <th class="anti-the"> Title </th>
49
    <th> Vendor </th>
49
                        <th> [% tp('noun', 'Order') | html %] </th>
50
    <th> Item types </th>
50
                        <th> Vendor </th>
51
    <th> Left on order </th>
51
                        <th> Item types </th>
52
    <th> Estimated cost per unit </th>
52
                        <th> Left on order </th>
53
    <th> Date ordered </th>
53
                        <th> Estimated cost per unit </th>
54
    <th> Subtotal </th>
54
                        <th> Date ordered </th>
55
    </tr>
55
                        <th> Subtotal </th>
56
    </thead>
56
                        </tr>
57
    <tbody>
57
                        </thead>
58
[% FOREACH order IN ordered %]
58
                        <tbody>
59
    <tr>
59
                    [% FOREACH order IN ordered %]
60
    <td class="cell">
60
                        <tr>
61
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
61
                        <td class="cell">
62
        [% order.title | html %]
62
                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
63
            </a>
63
                            [% order.title | html %]
64
    </td>
64
                                </a>
65
    <td class="cell">
65
                        </td>
66
        [% IF ( CAN_user_acquisition_order_manage ) %]
66
                        <td class="cell">
67
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% order.booksellerid | uri %]&amp;basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a>
67
                            [% IF ( CAN_user_acquisition_order_manage ) %]
68
        [% ELSE %]
68
                                <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&amp;booksellerid=[% order.booksellerid | uri %]&amp;basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a>
69
            [% order.ordernumber | html %]
69
                            [% ELSE %]
70
        [% END %]
70
                                [% order.ordernumber | html %]
71
    </td>
71
                            [% END %]
72
    <td class="cell">
72
                        </td>
73
        <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
73
                        <td class="cell">
74
    </td>
74
                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
75
    <td class="cell">
75
                        </td>
76
        [% FOREACH itemtype IN order.itemtypes %]
76
                        <td class="cell">
77
            [% ItemTypes.GetDescription( itemtype ) | html %]
77
                            [% FOREACH itemtype IN order.itemtypes %]
78
            [% IF !loop.last() %] | [% END %]
78
                                [% ItemTypes.GetDescription( itemtype ) | html %]
79
        [% END %]
79
                                [% IF !loop.last() %] | [% END %]
80
    </td>
80
                            [% END %]
81
    <td class="cell">
81
                        </td>
82
        [% order.left | html %]
82
                        <td class="cell">
83
    </td>
83
                            [% order.left | html %]
84
    <td class="data cell">
84
                        </td>
85
        [% order.ecost_tax_included | $Price %]
85
                        <td class="data cell">
86
    </td>
86
                            [% order.ecost_tax_included | $Price %]
87
    <td class="cell" data-order="[% order.entrydate | html %]">
87
                        </td>
88
        [% order.entrydate | $KohaDates %]
88
                        <td class="cell" data-order="[% order.entrydate | html %]">
89
    </td>
89
                            [% order.entrydate | $KohaDates %]
90
    <td class="data cell">
90
                        </td>
91
        [% order.subtotal | $Price %]
91
                        <td class="data cell">
92
    </td>
92
                            [% order.subtotal | $Price %]
93
    </tr>
93
                        </td>
94
[% END %]
94
                        </tr>
95
    </tbody>
95
                    [% END %]
96
    <tfoot>
96
                        </tbody>
97
    [% IF ( adjustments && adjustments.count > 0 ) %]
97
                        <tfoot>
98
            [% FOREACH adjustment IN adjustments %]
98
                        [% IF ( adjustments && adjustments.count > 0 ) %]
99
                <tr>
99
                                [% FOREACH adjustment IN adjustments %]
100
                    <td></td>
100
                                    <tr>
101
                    <td colspan="6">Adjustment cost for invoice
101
                                        <td></td>
102
                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
102
                                        <td colspan="6">Adjustment cost for invoice
103
                            [% adjustment.invoice.invoicenumber | html %]
103
                                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
104
                        </a>
104
                                                [% adjustment.invoice.invoicenumber | html %]
105
                    </td>
105
                                            </a>
106
                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
106
                                        </td>
107
                </tr>
107
                                        <td class="data total">[% adjustment.adjustment | $Price %]</td>
108
            [% END %]
108
                                    </tr>
109
                                [% END %]
109
110
110
    [% END %]
111
                        [% END %]
111
    <tr>
112
                        <tr>
112
        <td> Total </td>
113
                            <td> Total </td>
113
        <td> </td>
114
                            <td> </td>
114
        <td> </td>
115
                            <td> </td>
115
        <td> </td>
116
                            <td> </td>
116
        <td> </td>
117
                            <td> </td>
117
        <td> </td>
118
                            <td> </td>
118
        <td> </td>
119
                            <td> </td>
119
        <td class="data">
120
                            <td class="data">
120
            [% total | $Price %]
121
                                [% total | $Price %]
121
        </td>
122
                            </td>
122
    </tr>
123
                        </tr>
123
    </tfoot>
124
                        </tfoot>
124
125
125
</table>
126
                    </table>
127
                </div> <!-- /.page-section -->
126
128
127
</main>
129
</main>
128
</div> <!-- /.col-sm-10.col-sm-push-2 -->
130
</div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-86 / +90 lines)
Lines 41-141 Link Here
41
41
42
<h1>Spent - Fund: [% fund_code | html %]</h1>
42
<h1>Spent - Fund: [% fund_code | html %]</h1>
43
43
44
<table id="spent">
44
<div class="page-section">
45
    <thead>
46
        <tr>
47
           <th class="anti-the">Title</th>
48
           <th>[% tp('noun', 'Order') | html %]</th>
49
           <th>Vendor</th>
50
           <th>Invoice</th>
51
           <th>Item types</th>
52
           <th>Received</th>
53
           <th>Unit price</th>
54
           <th>Date ordered</th>
55
           <th>Date received</th>
56
           <th>Subtotal</th>
57
        </tr>
58
    </thead>
59
45
60
    [% FOREACH order IN spent %]
46
    <table id="spent">
61
        <tr>
47
        <thead>
62
            <td class="cell">
48
            <tr>
63
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
49
            <th class="anti-the">Title</th>
64
                    [% order.title | html %]
50
            <th>[% tp('noun', 'Order') | html %]</th>
65
                </a>
51
            <th>Vendor</th>
66
            </td>
52
            <th>Invoice</th>
67
            <td class="cell">
53
            <th>Item types</th>
68
                [% order.ordernumber | html %]
54
            <th>Received</th>
69
            </td>
55
            <th>Unit price</th>
70
            <td class="cell">
56
            <th>Date ordered</th>
71
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
57
            <th>Date received</th>
72
            </td>
58
            <th>Subtotal</th>
73
            <td class="cell">
59
            </tr>
74
                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
60
        </thead>
75
            </td>
76
            <td class="cell">
77
                [% FOREACH itemtype IN order.itemtypes %]
78
                    [% ItemTypes.GetDescription( itemtype ) | html %]
79
                    [% IF !loop.last() %] | [% END %]
80
                [% END %]
81
            </td>
82
            <td class="cell">
83
                [% order.quantityreceived | html %]
84
            </td>
85
            <td class="cell">
86
                [% order.unitprice_tax_included | $Price %]
87
            </td>
88
            <td class="cell" data-order="[% order.entrydate | html %]">
89
                [% order.entrydate | $KohaDates %]
90
            </td>
91
            <td class="cell" data-order="[% order.datereceived | html %]">
92
                [% order.datereceived | $KohaDates %]
93
            </td>
94
            <td class="data cell">
95
                [% order.rowtotal | $Price %]
96
            </td>
97
        </tr>
98
    [% END %]
99
61
100
    <tfoot>
62
        [% FOREACH order IN spent %]
101
        [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
102
            <tr>
63
            <tr>
103
                <td colspan="9"> Sub total </td>
64
                <td class="cell">
104
                <td class="data"> [% subtotal | $Price %] </td>
65
                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
66
                        [% order.title | html %]
67
                    </a>
68
                </td>
69
                <td class="cell">
70
                    [% order.ordernumber | html %]
71
                </td>
72
                <td class="cell">
73
                    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
74
                </td>
75
                <td class="cell">
76
                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
77
                </td>
78
                <td class="cell">
79
                    [% FOREACH itemtype IN order.itemtypes %]
80
                        [% ItemTypes.GetDescription( itemtype ) | html %]
81
                        [% IF !loop.last() %] | [% END %]
82
                    [% END %]
83
                </td>
84
                <td class="cell">
85
                    [% order.quantityreceived | html %]
86
                </td>
87
                <td class="cell">
88
                    [% order.unitprice_tax_included | $Price %]
89
                </td>
90
                <td class="cell" data-order="[% order.entrydate | html %]">
91
                    [% order.entrydate | $KohaDates %]
92
                </td>
93
                <td class="cell" data-order="[% order.datereceived | html %]">
94
                    [% order.datereceived | $KohaDates %]
95
                </td>
96
                <td class="data cell">
97
                    [% order.rowtotal | $Price %]
98
                </td>
105
            </tr>
99
            </tr>
106
        [% END %]
100
        [% END %]
107
        [% IF shipmentcosts.size %]
101
108
            [% FOREACH shipmentcost IN shipmentcosts %]
102
        <tfoot>
103
            [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
109
                <tr>
104
                <tr>
110
                    <td></td>
105
                    <td colspan="9"> Sub total </td>
111
                    <td colspan="8">Shipping cost for invoice
106
                    <td class="data"> [% subtotal | $Price %] </td>
112
                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% shipmentcost.invoiceid | uri %]">
113
                             [% shipmentcost.invoicenumber | html %]
114
                        </a>
115
                    </td>
116
                    <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
117
                </tr>
107
                </tr>
118
            [% END %]
108
            [% END %]
119
        [% END %]
109
            [% IF shipmentcosts.size %]
120
        [% IF ( adjustments && adjustments.count > 0 ) %]
110
                [% FOREACH shipmentcost IN shipmentcosts %]
121
            [% FOREACH adjustment IN adjustments %]
111
                    <tr>
122
                <tr>
112
                        <td></td>
123
                    <td></td>
113
                        <td colspan="8">Shipping cost for invoice
124
                    <td colspan="8">Adjustment cost for invoice
114
                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% shipmentcost.invoiceid | uri %]">
125
                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
115
                                [% shipmentcost.invoicenumber | html %]
126
                            [% adjustment.invoice.invoicenumber | html %]
116
                            </a>
127
                        </a>
117
                        </td>
128
                    </td>
118
                        <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td>
129
                    <td class="data total">[% adjustment.adjustment | $Price %]</td>
119
                    </tr>
130
                </tr>
120
                [% END %]
131
            [% END %]
121
            [% END %]
132
        [% END %]
122
            [% IF ( adjustments && adjustments.count > 0 ) %]
133
        <tr>
123
                [% FOREACH adjustment IN adjustments %]
134
            <td colspan="9">TOTAL</td>
124
                    <tr>
135
            <td class="data total">[% total | $Price %]</td>
125
                        <td></td>
136
        </tr>
126
                        <td colspan="8">Adjustment cost for invoice
137
    </tfoot>
127
                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
138
</table>
128
                                [% adjustment.invoice.invoicenumber | html %]
129
                            </a>
130
                        </td>
131
                        <td class="data total">[% adjustment.adjustment | $Price %]</td>
132
                    </tr>
133
                [% END %]
134
            [% END %]
135
            <tr>
136
                <td colspan="9">TOTAL</td>
137
                <td class="data total">[% total | $Price %]</td>
138
            </tr>
139
        </tfoot>
140
    </table>
141
142
</div> <!-- /.page-section -->
139
143
140
</main>
144
</main>
141
</div> <!-- /.col-sm-10.col-sm-push-2 -->
145
</div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-2 / +1 lines)
Lines 129-135 tr.selected td { Link Here
129
    </div> <!-- /.col-sm-6 -->
129
    </div> <!-- /.col-sm-6 -->
130
<div class="col-sm-6">
130
<div class="col-sm-6">
131
<h2>Search targets</h2>
131
<h2>Search targets</h2>
132
    <div id="z3950_search_targets_acq">
132
    <div id="z3950_search_targets_acq" class="page-section">
133
        <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
133
        <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
134
    [% FOREACH serverloo IN serverloop %]
134
    [% FOREACH serverloo IN serverloop %]
135
        <p>
135
        <p>
136
- 

Return to bug 32616