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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +2 lines)
Lines 395-401 Link Here
395 
                <thead>
 395 
                <thead>
396 
                    <tr>
 396 
                    <tr>
397 
                        <th>No.</th>
 397 
                        <th>No.</th>
398 
                        <th>[% tp('noun', 'Order') %]</th>
 398 
                        <th>[% tp('noun', 'Order') | html %]</th>
399 
                        <th>RRP tax exc.</th>
 399 
                        <th>RRP tax exc.</th>
400 
                        <th>Actual cost tax exc.</th>
 400 
                        <th>Actual cost tax exc.</th>
401 
                        <th>ecost tax exc.</th>
 401 
                        <th>ecost tax exc.</th>
Lines 590-596 Link Here
590 
              <thead>
 590 
              <thead>
591 
                <tr>
 591 
                <tr>
592 
                  <th>No.</th>
 592 
                  <th>No.</th>
593 
                  <th>[% tp('noun', 'Order') %]</th>
 593 
                  <th>[% tp('noun', 'Order') | html %]</th>
594 
                  <th class="tax_excluded">RRP tax exc.</th>
 594 
                  <th class="tax_excluded">RRP tax exc.</th>
595 
                  <th class="tax_excluded">ecost tax exc.</th>
 595 
                  <th class="tax_excluded">ecost tax exc.</th>
596 
                  <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 / +1 lines)
Lines 70-76 Link Here
70 
            </td>
 70 
            </td>
71 
            <td class="actions">
 71 
            <td class="actions">
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>
 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>
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') %]</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>
74 
            </td>
 74 
            </td>
75 
        </tr>
 75 
        </tr>
76 
      [% END %]
 76 
      [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
Lines 75-81 Link Here
75 
                                    [% END %]
 75 
                                    [% END %]
76 
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
 76 
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
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">
 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">
78 
                                            <i class="fa fa-plus"></i> [% tp('verb', 'Order') %]
 78 
                                            <i class="fa fa-plus"></i> [% tp('verb', 'Order') | html %]
79 
                                        </a>
 79 
                                        </a>
80 
                                    [% ELSE %]
 80 
                                    [% ELSE %]
81 
                                        <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 / +2 lines)
Lines 80-88 Link Here
80 
                </td>
 80 
                </td>
81 
                <td class="actions">
 81 
                <td class="actions">
82 
                    [% IF ( suggestions_loo.biblionumber ) %]
 82 
                    [% IF ( suggestions_loo.biblionumber ) %]
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') %]</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>
84 
                    [% ELSE %]
 84 
                    [% ELSE %]
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') %]</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>
86 
                    [% END %]
 86 
                    [% END %]
87 
                </td>
 87 
                </td>
88 
            </tr>
 88 
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-1 / +1 lines)
Lines 29-35 Link Here
29 
    <thead>
 29 
    <thead>
30 
    <tr>
 30 
    <tr>
31 
    <th class="anti-the"> Title </th>
 31 
    <th class="anti-the"> Title </th>
32 
    <th> [% tp('noun', 'Order') %] </th>
 32 
    <th> [% tp('noun', 'Order') | html %] </th>
33 
    <th> Vendor </th>
 33 
    <th> Vendor </th>
34 
    <th> Item types </th>
 34 
    <th> Item types </th>
35 
    <th> Left on order </th>
 35 
    <th> Left on order </th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-2 / +2 lines)
Lines 167-173 Link Here
167 
                [% END %]
 167 
                [% END %]
168 
                </td>
 168 
                </td>
169 
                <td>
 169 
                <td>
170 
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">[% tp('noun', '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>
171 
                  <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>
172 
                  <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>
173 
                </td>
 173 
                </td>
Lines 331-337 Link Here
331 
                [% END %]
 331 
                [% END %]
332 
                </td>
 332 
                </td>
333 
                <td>
 333 
                <td>
334 
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') %]</a><br>
 334 
                  <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">[% tp('noun', 'Order') | html %]</a><br>
335 
                  <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>
336 
                  <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>
337 
                </td>
 337 
                </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-1 / +1 lines)
Lines 29-35 Link Here
29 
    <thead>
 29 
    <thead>
30 
        <tr>
 30 
        <tr>
31 
           <th class="anti-the">Title</th>
 31 
           <th class="anti-the">Title</th>
32 
           <th>[% tp('noun', 'Order') %]</th>
 32 
           <th>[% tp('noun', 'Order') | html %]</th>
33 
           <th>Vendor</th>
 33 
           <th>Vendor</th>
34 
           <th>Invoice</th>
 34 
           <th>Invoice</th>
35 
           <th>Item types</th>
 35 
           <th>Item types</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (-2 / +2 lines)
Lines 15-21 Link Here
15 
                <ul>
 15 
                <ul>
16 
                  <li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li>
 16 
                  <li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li>
17 
                  <li><span class="label">Basket: </span>[% basketfromname | html %]</li>
 17 
                  <li><span class="label">Basket: </span>[% basketfromname | html %]</li>
18 
                  <li><span class="label">[% tp('noun', 'Order') %]: </span>[% ordernumber | html %]</li>
 18 
                  <li><span class="label">[% tp('noun', 'Order') | html %]: </span>[% ordernumber | html %]</li>
19 
                </ul>
 19 
                </ul>
20 
              </div>
 20 
              </div>
21 
        [% ELSE %]
 21 
        [% ELSE %]
Lines 67-73 Link Here
67 
            <table>
 67 
            <table>
68 
                <thead>
 68 
                <thead>
69 
                    <tr>
 69 
                    <tr>
70 
                        <th>[% tp('noun', 'Order') %]</th>
 70 
                        <th>[% tp('noun', 'Order') | html %]</th>
71 
                        <th>Summary</th>
 71 
                        <th>Summary</th>
72 
                        <th>&nbsp;</th>
 72 
                        <th>&nbsp;</th>
73 
                    </tr>
 73 
                    </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-1 / +1 lines)
Lines 79-85 Link Here
79 
        <thead>
 79 
        <thead>
80 
	    <tr>
 80 
	    <tr>
81 
            <th>Basket</th>
 81 
            <th>Basket</th>
82 
           <th>[% tp('noun', 'Order') %]</th>
 82 
           <th>[% tp('noun', 'Order') | html %]</th>
83 
            <th>By</th>
 83 
            <th>By</th>
84 
            <th>Uncertain</th>
 84 
            <th>Uncertain</th>
85 
            <th>Price</th>
 85 
            <th>Price</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-3 / +2 lines)
Lines 117-123 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
117 
        [% IF ( breeding_loo.breedingid ) %]
 117 
        [% IF ( breeding_loo.breedingid ) %]
118 

          118
          

        

        

          119
          
        <tr>

          119
          
        <tr>

        

          
            

              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') %]</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>

            

        

          121
          
            <td>[% breeding_loo.title | html %]</td>

          121
          
            <td>[% breeding_loo.title | html %]</td>

        

        

          122
          
            <td>[% breeding_loo.author | html %]</td>

          122
          
            <td>[% breeding_loo.author | html %]</td>

        

        

          123
          
            <td>[% breeding_loo.isbn | html %]</td>

          123
          
            <td>[% breeding_loo.isbn | html %]</td>

        

  

    
      
            Lines 145-151
          tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
      
      
        Link Here
      
    
  

        

          145
          
                    </ul>

          145
          
                    </ul>

        

        

          146
          
                </div>

          146
          
                </div>

        

        

          147
          
            </td>

          147
          
            </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') %]</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>

            

        

          149
          
        </tr>

          149
          
        </tr>

        

        

          150
          
        [% END %]

          150
          
        [% END %]

        

        

          151
          
    [% END %]</tbody>

          151
          
    [% END %]</tbody>

        

            

              152
              
- 

              
              
            






  

  Return to bug 23983