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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +4 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[%# USE the plugin and define some macros %]
4
[% PROCESS 'i18n.inc' %]
3
[% BLOCK csv_export %]
5
[% BLOCK csv_export %]
4
    <div class="btn-group">
6
    <div class="btn-group">
5
        <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
7
        <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
Lines 393-399 Link Here
393
                <thead>
395
                <thead>
394
                    <tr>
396
                    <tr>
395
                        <th>No.</th>
397
                        <th>No.</th>
396
                        <th>Order</th>
398
                        <th>[% tp('noun', 'Order') | html %]</th>
397
                        <th>RRP tax exc.</th>
399
                        <th>RRP tax exc.</th>
398
                        <th>Actual cost tax exc.</th>
400
                        <th>Actual cost tax exc.</th>
399
                        <th>ecost tax exc.</th>
401
                        <th>ecost tax exc.</th>
Lines 588-594 Link Here
588
              <thead>
590
              <thead>
589
                <tr>
591
                <tr>
590
                  <th>No.</th>
592
                  <th>No.</th>
591
                  <th>Order</th>
593
                  <th>[% tp('noun', 'Order') | html %]</th>
592
                  <th class="tax_excluded">RRP tax exc.</th>
594
                  <th class="tax_excluded">RRP tax exc.</th>
593
                  <th class="tax_excluded">ecost tax exc.</th>
595
                  <th class="tax_excluded">ecost tax exc.</th>
594
                  <th class="tax_included">RRP tax inc.</th>
596
                  <th class="tax_included">RRP tax inc.</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-1 / +3 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[%# USE the plugin and define some macros %]
4
[% PROCESS 'i18n.inc' %]
3
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Acquisitions &rsaquo; Search existing records</title>
7
<title>Koha &rsaquo; Acquisitions &rsaquo; Search existing records</title>
Lines 68-74 Link Here
68
            </td>
70
            </td>
69
            <td class="actions">
71
            <td class="actions">
70
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
72
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
71
                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
73
                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
72
            </td>
74
            </td>
73
        </tr>
75
        </tr>
74
      [% END %]
76
      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +3 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE Koha %]
5
[% USE Koha %]
6
[%# USE the plugin and define some macros %]
7
[% PROCESS 'i18n.inc' %]
6
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha &rsaquo; Serials [% biblionumber | html %]</title>
10
<title>Koha &rsaquo; Serials [% biblionumber | html %]</title>
Lines 73-79 Link Here
73
                                    [% END %]
75
                                    [% END %]
74
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
76
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
75
                                        <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">
77
                                        <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">
76
                                            <i class="fa fa-plus"></i> Order
78
                                            <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
77
                                        </a>
79
                                        </a>
78
                                    [% ELSE %]
80
                                    [% ELSE %]
79
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
81
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-2 / +4 lines)
Lines 2-7 Link Here
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE Price %]
3
[% USE Price %]
4
[% USE Asset %]
4
[% USE Asset %]
5
[%# USE the plugin and define some macros %]
6
[% PROCESS 'i18n.inc' %]
5
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
9
<title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
Lines 78-86 Link Here
78
                </td>
80
                </td>
79
                <td class="actions">
81
                <td class="actions">
80
                    [% IF ( suggestions_loo.biblionumber ) %]
82
                    [% IF ( suggestions_loo.biblionumber ) %]
81
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
83
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]&amp;biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
82
                    [% ELSE %]
84
                    [% ELSE %]
83
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
85
                        <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a>
84
                    [% END %]
86
                    [% END %]
85
                </td>
87
                </td>
86
            </tr>
88
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-1 / +3 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE Price %]
5
[% USE Price %]
6
[%# USE the plugin and define some macros %]
7
[% PROCESS 'i18n.inc' %]
6
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
10
<title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
Lines 27-33 Link Here
27
    <thead>
29
    <thead>
28
    <tr>
30
    <tr>
29
    <th class="anti-the"> Title </th>
31
    <th class="anti-the"> Title </th>
30
    <th> Order </th>
32
    <th> [% tp('noun', 'Order') | html %] </th>
31
    <th> Vendor </th>
33
    <th> Vendor </th>
32
    <th> Item types </th>
34
    <th> Item types </th>
33
    <th> Left on order </th>
35
    <th> Left on order </th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +4 lines)
Lines 4-9 Link Here
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Price %]
5
[% USE Price %]
6
[% USE currency = format('%.2f') -%]
6
[% USE currency = format('%.2f') -%]
7
[%# USE the plugin and define some macros %]
8
[% PROCESS 'i18n.inc' %]
7
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
8
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
11
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
Lines 165-171 Link Here
165
                [% END %]
167
                [% END %]
166
                </td>
168
                </td>
167
                <td>
169
                <td>
168
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">Order</a><br>
170
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') | html %]</a><br>
169
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br>
171
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br>
170
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a>
172
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a>
171
                </td>
173
                </td>
Lines 329-335 Link Here
329
                [% END %]
331
                [% END %]
330
                </td>
332
                </td>
331
                <td>
333
                <td>
332
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">Order</a><br>
334
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') | html %]</a><br>
333
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br>
335
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br>
334
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | uri %]" class="previewData">Card</a>
336
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | uri %]" class="previewData">Card</a>
335
                </td>
337
                </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-1 / +3 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE Price %]
5
[% USE Price %]
6
[%# USE the plugin and define some macros %]
7
[% PROCESS 'i18n.inc' %]
6
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
10
<title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
Lines 27-33 Link Here
27
    <thead>
29
    <thead>
28
        <tr>
30
        <tr>
29
           <th class="anti-the">Title</th>
31
           <th class="anti-the">Title</th>
30
           <th>Order</th>
32
           <th>[% tp('noun', 'Order') | html %]</th>
31
           <th>Vendor</th>
33
           <th>Vendor</th>
32
           <th>Invoice</th>
34
           <th>Invoice</th>
33
           <th>Item types</th>
35
           <th>Item types</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-2 / +4 lines)
Lines 1-3 Link Here
1
[%# USE the plugin and define some macros %]
2
[% PROCESS 'i18n.inc' %]
1
[% SET footerjs = 1 %]
3
[% SET footerjs = 1 %]
2
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
5
<title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
Lines 13-19 Link Here
13
                <ul>
15
                <ul>
14
                  <li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li>
16
                  <li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li>
15
                  <li><span class="label">Basket: </span>[% basketfromname | html %]</li>
17
                  <li><span class="label">Basket: </span>[% basketfromname | html %]</li>
16
                  <li><span class="label">Order: </span>[% ordernumber | html %]</li>
18
                  <li><span class="label">[% tp('noun', 'Order') | html %]: </span>[% ordernumber | html %]</li>
17
                </ul>
19
                </ul>
18
              </div>
20
              </div>
19
        [% ELSE %]
21
        [% ELSE %]
Lines 65-71 Link Here
65
            <table>
67
            <table>
66
                <thead>
68
                <thead>
67
                    <tr>
69
                    <tr>
68
                        <th>Order</th>
70
                        <th>[% tp('noun', 'Order') | html %]</th>
69
                        <th>Summary</th>
71
                        <th>Summary</th>
70
                        <th>&nbsp;</th>
72
                        <th>&nbsp;</th>
71
                    </tr>
73
                    </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-1 / +3 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[%# USE the plugin and define some macros %]
5
[% PROCESS 'i18n.inc' %]
4
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
5
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %]</title>
8
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %]</title>
Lines 77-83 Link Here
77
        <thead>
79
        <thead>
78
	    <tr>
80
	    <tr>
79
            <th>Basket</th>
81
            <th>Basket</th>
80
           <th>Order</th>
82
           <th>[% tp('noun', 'Order') | html %]</th>
81
            <th>By</th>
83
            <th>By</th>
82
            <th>Uncertain</th>
84
            <th>Uncertain</th>
83
            <th>Price</th>
85
            <th>Price</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +4 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[%# USE the plugin and define some macros %]
4
[% PROCESS 'i18n.inc' %]
3
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source &rsaquo; Search results[% END %]</title>
7
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source &rsaquo; Search results[% END %]</title>
Lines 115-121 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
115
        [% IF ( breeding_loo.breedingid ) %]
117
        [% IF ( breeding_loo.breedingid ) %]
116
118
117
        <tr>
119
        <tr>
118
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
120
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">[% tp('verb', 'Order') | html %]</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
119
            <td>[% breeding_loo.title | html %]</td>
121
            <td>[% breeding_loo.title | html %]</td>
120
            <td>[% breeding_loo.author | html %]</td>
122
            <td>[% breeding_loo.author | html %]</td>
121
            <td>[% breeding_loo.isbn | html %]</td>
123
            <td>[% breeding_loo.isbn | html %]</td>
Lines 143-149 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
143
                    </ul>
145
                    </ul>
144
                </div>
146
                </div>
145
            </td>
147
            </td>
146
            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
148
            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]</a></td>
147
        </tr>
149
        </tr>
148
        [% END %]
150
        [% END %]
149
    [% END %]</tbody>
151
    [% END %]</tbody>
150
- 

Return to bug 23983