@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 2 +- 19 files changed, 22 insertions(+), 18 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -184,7 +184,7 @@ [% END %] [% IF ( NO_BOOKSELLER ) %] -

Vendor not found

+

Vendor not found

[% ELSE %] [% IF ( delete_confirmed ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -39,6 +39,7 @@
[% INCLUDE 'acquisitions-toolbar.inc' %] +

Search for vendor

[% UNLESS ( count == 1 ) %] [% UNLESS count %]

Your search returned no results.

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -32,7 +32,7 @@ [% UNLESS ( confirmcancel ) %]
-

Are you sure you want to cancel this order ([% ordernumber | html %])

+

Are you sure you want to cancel this order ([% ordernumber | html %])

[% IF (del_biblio) %] Bibliographic record will be deleted too. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -50,10 +50,9 @@ Basket [% basket.basketno | html %] › Duplicate existing orders

+

Duplicate existing orders

[% INCLUDE 'blocking_errors.inc' %] -

Duplicate existing orders

- [% IF op == 'search' || op == 'select' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -26,7 +26,7 @@
-

Select the library account submitting the EDI order

+

Select the library account submitting the EDI order


Select ordering library account:

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -25,6 +25,7 @@
+

EDIFACT message display

[% IF no_message %]
The requested message cannot be displayed
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -45,6 +45,9 @@
+ +

Order search

+ [% IF !order_loop && search_done %]
Your search returned no results. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -37,7 +37,7 @@
-

Files for invoice: [% invoicenumber | html %]

+

Files for invoice: [% invoicenumber | html %]

Vendor: [% suppliername | html %]


[% IF errors %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -40,6 +40,7 @@
+

Invoice: [% invoicenumber | html %]

[% INCLUDE 'blocking_errors.inc' %] [% IF ( modified ) %] @@ -47,7 +48,6 @@

Invoice has been modified

[% END %] -

Invoice: [% invoicenumber | html %]

Vendor: [% suppliername | html %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -53,13 +53,13 @@
-

+

[% IF ( ordernumber ) %] Modify order line [% ELSE %] New order [% END %] -

+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -33,7 +33,7 @@
-

Duplicate warning

+

Duplicate warning

You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %] [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] [% ELSIF ( BiblioDefaultViewisbd ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -41,7 +41,7 @@

-

Serials subscriptions

+

Serials subscriptions

[% IF (done_searched) %]