diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
index 0f526ee5d3..0e3ec32f75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
@@ -1,28 +1,28 @@
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
index 1d2d8b2e26..34e8ccc872 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
@@ -1,76 +1,76 @@
-
-
+
+
[% UNLESS noB_address %]
- -
- [% IF ( mandatoryB_address ) %]
-
[% END %]
[% UNLESS noB_address2 %]
- -
- [% IF ( mandatoryB_address2 ) %]
-
- [% ELSE %]
-
- [% END %]
- Address 2:
+
-
+ [% IF ( mandatoryB_address2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
- [% IF ( mandatoryB_address2 ) %]Required[% END %]
-
+ [% IF ( mandatoryB_address2 ) %]Required[% END %]
+
[% END %]
[% UNLESS noB_city %]
- -
- [% IF ( mandatoryB_city ) %]
-
- [% ELSE %]
-
- [% END %]
- City:
+
-
+ [% IF ( mandatoryB_city ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
- [% IF ( mandatoryB_city ) %]Required[% END %]
-
+ [% IF ( mandatoryB_city ) %]Required[% END %]
+
[% END %]
[% UNLESS noB_state %]
- -
- [% IF ( mandatoryB_state ) %]
-
- [% ELSE %]
-
- [% END %]
- State:
+
-
+ [% IF ( mandatoryB_state ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
- [% IF ( mandatoryB_state ) %]Required[% END %]
-
+ [% IF ( mandatoryB_state ) %]Required[% END %]
+
[% END %]
[% UNLESS noB_zipcode %]
- -
- [% IF ( mandatoryB_zipcode ) %]
-
- [% ELSE %]
-
- [% END %]
- Zip/Postal code:
+
-
+ [% IF ( mandatoryB_zipcode ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Zip/Postal code:
- [% IF ( mandatoryB_zipcode ) %]Required[% END %]
-
+ [% IF ( mandatoryB_zipcode ) %]Required[% END %]
+
[% END %]
[% UNLESS noB_country %]
- -
- [% IF ( mandatoryB_country ) %]
-
- [% ELSE %]
-
- [% END %]
- Country:
+
-
+ [% IF ( mandatoryB_country ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
- [% IF ( mandatoryB_country ) %]Required[% END %]
-
+ [% IF ( mandatoryB_country ) %]Required[% END %]
+
[% END %]
[% UNLESS noB_phone %]
-
@@ -85,7 +85,7 @@
[% END %]
[% UNLESS noB_email %]
- -
+
-
[% IF ( mandatoryB_email ) %]
[% ELSE %]
@@ -93,7 +93,7 @@
[% END %]
Email:
- [% IF ( mandatoryB_email ) %]Required[% END %]
+ [% IF ( mandatoryB_email ) %]Required[% END %]
[% END %]
[% UNLESS nocontactnote %]
-
@@ -107,5 +107,5 @@
[% IF ( mandatorycontactnote ) %]Required[% END %]
[% END %]
-
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
index 2f47ce7fbf..31bc204b85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
@@ -1,52 +1,52 @@
-
+
[% UNLESS noaltcontactsurname %]
- -
- [% IF ( mandatoryaltcontactsurname ) %]
-
- [% ELSE %]
-
- [% END %]
- Surname:
+
-
+ [% IF ( mandatoryaltcontactsurname ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Surname:
- [% IF ( mandatoryaltcontactsurname ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactsurname ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactfirstname %]
- -
- [% IF ( mandatoryaltcontactfirstname ) %]
-
- [% ELSE %]
-
- [% END %]
- First name:
+
-
+ [% IF ( mandatoryaltcontactfirstname ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ First name:
- [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactaddress1 %]
- -
- [% IF ( mandatoryaltcontactaddress1 ) %]
-
- [% ELSE %]
-
- [% END %]
- Address:
+
-
+ [% IF ( mandatoryaltcontactaddress1 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
- [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactaddress2 %]
- -
- [% IF ( mandatoryaltcontactaddress2 ) %]
-
- [% ELSE %]
-
- [% END %]
- Address 2:
+
-
+ [% IF ( mandatoryaltcontactaddress2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
- [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactzipcode %]
-
@@ -61,52 +61,52 @@
[% END %]
[% UNLESS noaltcontactaddress3 %]
- -
- [% IF ( mandatoryaltcontactaddress3 ) %]
-
- [% ELSE %]
-
- [% END %]
- City:
+
-
+ [% IF ( mandatoryaltcontactaddress3 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
- [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactstate %]
- -
- [% IF ( mandatoryaltcontactstate ) %]
-
- [% ELSE %]
-
- [% END %]
- State:
+
-
+ [% IF ( mandatoryaltcontactstate ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
- [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactcountry %]
- -
- [% IF ( mandatoryaltcontactcountry ) %]
-
- [% ELSE %]
-
- [% END %]
- Country:
+
-
+ [% IF ( mandatoryaltcontactcountry ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
- [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactphone %]
- -
- [% IF ( mandatoryaltcontactphone ) %]
-
- [% ELSE %]
-
- [% END %]
- Phone:
+
-
+ [% IF ( mandatoryaltcontactphone ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Phone:
- [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
index ff0f99bf5b..ec0d83f1c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
@@ -1,112 +1,112 @@
-
+
[% UNLESS noaltcontactsurname %]
- -
- [% IF ( mandatoryaltcontactsurname ) %]
-
- [% ELSE %]
-
- [% END %]
- Surname:
+
-
+ [% IF ( mandatoryaltcontactsurname ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Surname:
- [% IF ( mandatoryaltcontactsurname ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactsurname ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactfirstname %]
- -
- [% IF ( mandatoryaltcontactfirstname ) %]
-
- [% ELSE %]
-
- [% END %]
- First name:
+
-
+ [% IF ( mandatoryaltcontactfirstname ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ First name:
- [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactaddress1 %]
- -
- [% IF ( mandatoryaltcontactaddress1 ) %]
-
- [% ELSE %]
-
- [% END %]
- Address:
+
-
+ [% IF ( mandatoryaltcontactaddress1 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
- [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactaddress2 %]
- -
- [% IF ( mandatoryaltcontactaddress2 ) %]
-
- [% ELSE %]
-
- [% END %]
- Address 2:
+
-
+ [% IF ( mandatoryaltcontactaddress2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
- [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactaddress3 %]
- -
- [% IF ( mandatoryaltcontactaddress3 ) %]
-
- [% ELSE %]
-
- [% END %]
- City:
+
-
+ [% IF ( mandatoryaltcontactaddress3 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
- [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactstate %]
- -
- [% IF ( mandatoryaltcontactstate ) %]
-
- [% ELSE %]
-
- [% END %]
- State:
+
-
+ [% IF ( mandatoryaltcontactstate ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
- [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactstate ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactzipcode %]
- -
- [% IF ( mandatoryaltcontactzipcode ) %]
-
- [% ELSE %]
-
- [% END %]
- Zip/Postal code:
+
-
+ [% IF ( mandatoryaltcontactzipcode ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Zip/Postal code:
- [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactcountry %]
- -
- [% IF ( mandatoryaltcontactcountry ) %]
-
- [% ELSE %]
-
- [% END %]
- Country:
+
-
+ [% IF ( mandatoryaltcontactcountry ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
- [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactcountry ) %]Required[% END %]
+
[% END %]
[% UNLESS noaltcontactphone %]
- -
- [% IF ( mandatoryaltcontactphone ) %]
-
- [% ELSE %]
-
- [% END %]
- Phone:
+
-
+ [% IF ( mandatoryaltcontactphone ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Phone:
- [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
-
+ [% IF ( mandatoryaltcontactphone ) %]Required[% END %]
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
index 254e2b99a6..96dbdde9f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
@@ -19,7 +19,7 @@
[% END %]
[% END %]
- [% IF ( mandatorystreettype ) %]Required[% END %]
+ [% IF ( mandatorystreettype ) %]Required[% END %]
[% END %]
[% END %]
@@ -32,7 +32,7 @@
[% END %]
Address:
- [% IF ( mandatoryaddress ) %]Required[% END %]
+ [% IF ( mandatoryaddress ) %]Required[% END %]
[% END %]
[% UNLESS nostreetnumber %]
@@ -56,7 +56,7 @@
[% END %]
Address 2:
- [% IF ( mandatoryaddress2 ) %]Required[% END %]
+ [% IF ( mandatoryaddress2 ) %]Required[% END %]
[% END %]
[% UNLESS nozipcode %]
@@ -93,7 +93,7 @@
[% END %]
[% END %]
- [% IF ( mandatorycity ) %]Required[% END %]
+ [% IF ( mandatorycity ) %]Required[% END %]
[% END %]
[% UNLESS nostate %]
@@ -105,7 +105,7 @@
[% END %]
State:
- [% IF ( mandatorystate ) %]Required[% END %]
+ [% IF ( mandatorystate ) %]Required[% END %]
[% END %]
[% UNLESS nocountry %]
@@ -117,8 +117,8 @@
[% END %]
Country:
- [% IF ( mandatorycountry ) %]Required[% END %]
+ [% IF ( mandatorycountry ) %]Required[% END %]
[% END %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
index 60c44b4fb7..3b9a07955b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
@@ -31,7 +31,7 @@
[% END %]
[% END %]
- [% IF ( mandatorystreettype ) %]Required[% END %]
+ [% IF ( mandatorystreettype ) %]Required[% END %]
[% END %]
[% END %]
@@ -44,7 +44,7 @@
[% END %]
Address:
- [% IF ( mandatoryaddress ) %]Required[% END %]
+ [% IF ( mandatoryaddress ) %]Required[% END %]
[% END %]
[% UNLESS noaddress2 %]
@@ -56,7 +56,7 @@
[% END %]
Address 2:
- [% IF ( mandatoryaddress2 ) %]Required[% END %]
+ [% IF ( mandatoryaddress2 ) %]Required[% END %]
[% END %]
[% UNLESS nocity %]
@@ -81,7 +81,7 @@
[% END %]
[% END %]
- [% IF ( mandatorycity ) %]Required[% END %]
+ [% IF ( mandatorycity ) %]Required[% END %]
[% END %]
[% UNLESS nostate %]
@@ -93,7 +93,7 @@
[% END %]
State:
- [% IF ( mandatorystate ) %]Required[% END %]
+ [% IF ( mandatorystate ) %]Required[% END %]
[% END %]
[% UNLESS nozipcode %]
@@ -105,7 +105,7 @@
[% END %]
Zip/Postal code:
- [% IF ( mandatoryzipcode ) %]Required[% END %]
+ [% IF ( mandatoryzipcode ) %]Required[% END %]
[% END %]
[% UNLESS nocountry %]
@@ -117,8 +117,8 @@
[% END %]
Country:
- [% IF ( mandatorycountry ) %]Required[% END %]
+ [% IF ( mandatorycountry ) %]Required[% END %]
[% END %]
-
+
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 37e0adb4dc..8b1b7bd443 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -113,7 +113,7 @@ $template->param(
finesview => 1,
borrowernumber => $borrowernumber,
roadtype => $roadtype,
- branchname => GetBranchName($data->{'branchcode'}),
+ branchname => GetBranchName($data->{'branchcode'}),
total => sprintf("%.2f",$total),
totalcredit => $totalcredit,
is_child => ($data->{'category_type'} eq 'C'),