@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 1 + 24 files changed, 34 insertions(+), 9 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -104,6 +104,7 @@ + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -393,6 +393,7 @@ Batch list

Choose the file to add to the basket

Accounts
Active
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -414,8 +414,8 @@
[% IF ( books_loop ) %] -

Orders

Files
File name
+ @@ -617,8 +617,8 @@ [% IF (cancelledorders_loop) %]
-

Cancelled orders

Orders

No.
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -333,6 +333,7 @@ fieldset.various li {

Cancelled orders

No.
+ @@ -372,6 +373,7 @@ fieldset.various li {
Opened
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -96,6 +96,7 @@
[% IF ( supplier.loop_basket.size ) %]
Closed
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -265,6 +265,7 @@ Acquisitions › Koha [% ELSIF op == 'duplication_done' %] [% IF new_orders %]
Baskets
No.
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -38,6 +38,7 @@ [% IF ( messages ) %]
New orders
Order line
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -59,9 +59,10 @@ [% END %] - [% IF ( order_loop ) %]

Search results

+ [% IF ( order_loop ) %]
Messages
Type
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -49,6 +49,7 @@ [% END %] [% IF files %]

Search results

Order line (parent)
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -157,6 +157,7 @@ [% IF (adjustments && adjustments.count > 0) %]
Details of invoice files
Name
+ @@ -342,6 +343,7 @@ Show all details
Adjustments
Id Amount
+ @@ -439,8 +441,8 @@ [% END %] [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
-

Files attached to invoice

Orders
Summary
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -49,6 +49,7 @@ Show only subscriptions

Files attached to invoice

Name
+ [% IF CAN_user_acquisition_merge_invoices %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -68,6 +68,7 @@

Check all Uncheck all

[% END %]
Results
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -282,9 +282,9 @@ [% IF (AcqCreateItemOrdering) %]
Late orders
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -49,6 +49,7 @@ [% IF (subs_loop) %]
Items list
Actions
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -44,6 +44,7 @@ [% IF ( suggestions_loop ) %] Show only mine | Show all suggestions
Subscriptions
ISSN
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -39,6 +39,7 @@

Ordered - Fund: [% fund_code | html %]

Suggestions
Mine
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -177,9 +177,9 @@ [% ELSIF (AcqCreateItem == 'receiving') %]
Orders
Title
+ @@ -219,9 +219,9 @@ [% END %] [% ELSIF (AcqCreateItem == 'ordering') %] [% IF (order.items) %] -

Items

Items list
Actions
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -113,8 +113,8 @@ [% UNLESS (invoiceclosedate) %]

Items

Receive?
+ @@ -148,6 +148,7 @@ [% IF ( loop_received ) %]

Pending orders

Basket
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -50,6 +50,7 @@

This invoice number has already been used. Would you like to receive on an existing invoice?

Received
Basket
+ [% FOREACH invoice IN duplicate_invoices %] @@ -80,6 +81,7 @@
Duplicate invoices
Invoice no.Shipment date
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -39,6 +39,7 @@

Spent - Fund: [% fund_code | html %]

Parcels
Line
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -382,8 +382,8 @@ [% IF ( contracts ) %]
-

Contract(s)

Spent
Title
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -39,6 +39,7 @@

Baskets for [% booksellertoname | html %]

[% IF ( basketsloop ) %]

Contract(s)

Name
+ @@ -65,6 +66,7 @@ [% IF ( ordersloop ) %]

Orders for [% booksellerfromname | html %]

Baskets
Basket (#)
+ @@ -101,6 +103,7 @@ [% END %] [% IF ( booksellersloop ) %]
Orders
[% tp('noun', 'Order') | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -98,6 +98,7 @@
Vendors
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -144,6 +144,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( breeding_loop ) %]
Uncertain price orders
Basket
+ --
Results
Server Title