@@ -, +, @@
---
.../prog/en/modules/acqui/newordersuggestion.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 8 +++++---
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 7 ++++---
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 ++--
.../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 4 ++--
.../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 4 ++--
9 files changed, 19 insertions(+), 16 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -26,7 +26,7 @@
Basket [% basketno | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Add order from a suggestion
+ Add order from a suggestion
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -21,7 +21,7 @@
Acquisitions
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Ordered - [% fund_code | html %]
+ Ordered - [% fund_code | html %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -26,9 +26,11 @@
[% name | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Receive items from : [% name | html %] [% IF ( invoice ) %]
- [[% invoice | html %]]
- [% END %] (order #[% order.ordernumber | html %])
+ [% IF ( invoice ) %]
+ Receive items from: [% name | html %] [[% invoice | html %]] (order #[% order.ordernumber | html %])
+ [% ELSE %]
+ Receive items from: [% name | html %] (order #[% order.ordernumber | html %])
+ [% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -29,9 +29,10 @@
[% END %]
[% IF invoiceclosedate %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Receipt summary for [% name | html %]
[% IF ( invoice ) %]
- [ [% invoice | html %] ]
+ Receipt summary for [% name | html %] [ [% invoice | html %] ]
+ [% ELSE %]
+ Receipt summary for [% name | html %]
[% END %]
[% END %]
[% ELSE %]
@@ -39,7 +40,7 @@
[% name | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Receive orders from [% name | html %]
+ Receive orders from [% name | html %]
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -21,7 +21,7 @@
[% name | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Receive shipment from vendor [% name | html %]
+ Receive shipment from vendor [% name | html %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -21,7 +21,7 @@
Acquisitions
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Spent - [% fund_code | html %]
+ Spent - [% fund_code | html %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -109,11 +109,11 @@
[% name | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Update: [% name | html %]
+ Update: [% name | html %]
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Add vendor
+ Add vendor
[% END %]
[% END %]
[% ELSE %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -23,11 +23,11 @@
[% booksellername | html %]
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Uncertain prices for vendor [% booksellername | html %]
+ Uncertain prices for vendor [% booksellername | html %]
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Uncertain prices
+ Uncertain prices
[% END %]
[% END %]
[% END #/ WRAPPER breadcrumbs %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -57,14 +57,14 @@ tr.selected td {
[% END %]
[% IF ( opsearch ) %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Order from external source
+ Order from external source
[% END %]
[% ELSE %]
[% WRAPPER breadcrumb_item %]
Order from external source
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
- Search results
+ Search results
[% END %]
[% END # /IF opsearch %]
[% END #/ WRAPPER breadcrumbs %]
--