From 29bad9a5446b652c8be85e2ad03c66ef71f1806a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 29 Apr 2015 12:04:07 -0300 Subject: [PATCH] Bug 4041: (QA followup) fix issues raised by koha-qa.pl Signed-off-by: Tomas Cohen Arazi --- .../includes/member-alt-address-style-de.inc | 102 +++++------ .../includes/member-alt-address-style-us.inc | 120 ++++++------- .../includes/member-alt-contact-style-de.inc | 146 ++++++++-------- .../includes/member-alt-contact-style-us.inc | 164 +++++++++--------- .../includes/member-main-address-style-de.inc | 14 +- .../includes/member-main-address-style-us.inc | 16 +- members/boraccount.pl | 2 +- 7 files changed, 282 insertions(+), 282 deletions(-) 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 @@ -
- Alternate address
    +
    + Alternate address
      [% UNLESS noB_address %] -
    1. - [% IF ( mandatoryB_address ) %] -
    2. + [% IF ( mandatoryB_address ) %] +
      3. + [% IF ( mandatoryB_address ) %]Required[% END %] + [% END %] [% UNLESS noB_address2 %] -
    3. - [% IF ( mandatoryB_address2 ) %] -
    4. + [% IF ( mandatoryB_address2 ) %] +
      5. + [% IF ( mandatoryB_address2 ) %]Required[% END %] + [% END %] [% UNLESS noB_zipcode %]
    5. @@ -37,40 +37,40 @@
      6. [% END %] [% UNLESS noB_city %] -
    6. - [% IF ( mandatoryB_city ) %] -
    7. + [% IF ( mandatoryB_city ) %] +
      8. + [% IF ( mandatoryB_city ) %]Required[% END %] + [% END %] [% UNLESS noB_state %] -
    8. - [% IF ( mandatoryB_state ) %] -
    9. + [% IF ( mandatoryB_state ) %] +
      10. + [% IF ( mandatoryB_state ) %]Required[% END %] + [% END %] [% UNLESS noB_country %] -
    10. - [% IF ( mandatoryB_country ) %] -
    11. + [% IF ( mandatoryB_country ) %] +
      12. + [% IF ( mandatoryB_country ) %]Required[% END %] + [% END %] [% UNLESS noB_phone %]
    12. @@ -85,7 +85,7 @@
      13. [% END %] [% UNLESS noB_email %] -
    13. +
    14. [% IF ( mandatoryB_email ) %] - [% IF ( mandatoryB_email ) %]Required[% END %]
      15. + [% IF ( mandatoryB_email ) %]Required[% END %] [% END %] [% UNLESS nocontactnote %]
    15. @@ -107,5 +107,5 @@ [% IF ( mandatorycontactnote ) %]Required[% END %]
      16. [% END %] -
    -
    +
+
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 @@ -
- Alternate address
    +
    + Alternate address
      [% UNLESS noB_address %] -
    1. - [% IF ( mandatoryB_address ) %] -
    2. + [% IF ( mandatoryB_address ) %] +
      3. + [% IF ( mandatoryB_address ) %]Required[% END %] + [% END %] [% UNLESS noB_address2 %] -
    3. - [% IF ( mandatoryB_address2 ) %] -
    4. + [% IF ( mandatoryB_address2 ) %] +
      5. + [% IF ( mandatoryB_address2 ) %]Required[% END %] + [% END %] [% UNLESS noB_city %] -
    5. - [% IF ( mandatoryB_city ) %] -
    6. + [% IF ( mandatoryB_city ) %] +
      7. + [% IF ( mandatoryB_city ) %]Required[% END %] + [% END %] [% UNLESS noB_state %] -
    7. - [% IF ( mandatoryB_state ) %] -
    8. + [% IF ( mandatoryB_state ) %] +
      9. + [% IF ( mandatoryB_state ) %]Required[% END %] + [% END %] [% UNLESS noB_zipcode %] -
    9. - [% IF ( mandatoryB_zipcode ) %] -
    10. + [% IF ( mandatoryB_zipcode ) %] +
      11. + [% IF ( mandatoryB_zipcode ) %]Required[% END %] + [% END %] [% UNLESS noB_country %] -
    11. - [% IF ( mandatoryB_country ) %] -
    12. + [% IF ( mandatoryB_country ) %] +
      13. + [% IF ( mandatoryB_country ) %]Required[% END %] + [% END %] [% UNLESS noB_phone %]
    13. @@ -85,7 +85,7 @@
      14. [% END %] [% UNLESS noB_email %] -
    14. +
    15. [% IF ( mandatoryB_email ) %] - [% IF ( mandatoryB_email ) %]Required[% END %]
      16. + [% IF ( mandatoryB_email ) %]Required[% END %] [% END %] [% UNLESS nocontactnote %]
    16. @@ -107,5 +107,5 @@ [% IF ( mandatorycontactnote ) %]Required[% END %]
      17. [% 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 @@ -
+
Alternate contact
    [% UNLESS noaltcontactsurname %] -
  1. - [% IF ( mandatoryaltcontactsurname ) %] -
  2. + [% IF ( mandatoryaltcontactsurname ) %] +
    3. + [% IF ( mandatoryaltcontactsurname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactfirstname %] -
  3. - [% IF ( mandatoryaltcontactfirstname ) %] -
  4. + [% IF ( mandatoryaltcontactfirstname ) %] +
    5. + [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress1 %] -
  5. - [% IF ( mandatoryaltcontactaddress1 ) %] -
  6. + [% IF ( mandatoryaltcontactaddress1 ) %] +
    7. + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress2 %] -
  7. - [% IF ( mandatoryaltcontactaddress2 ) %] -
  8. + [% IF ( mandatoryaltcontactaddress2 ) %] +
    9. + [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactzipcode %]
  9. @@ -61,52 +61,52 @@
    10. [% END %] [% UNLESS noaltcontactaddress3 %] -
  10. - [% IF ( mandatoryaltcontactaddress3 ) %] -
  11. + [% IF ( mandatoryaltcontactaddress3 ) %] +
    12. + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactstate %] -
  12. - [% IF ( mandatoryaltcontactstate ) %] -
  13. + [% IF ( mandatoryaltcontactstate ) %] +
    14. + [% IF ( mandatoryaltcontactstate ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactcountry %] -
  14. - [% IF ( mandatoryaltcontactcountry ) %] -
  15. + [% IF ( mandatoryaltcontactcountry ) %] +
    16. + [% IF ( mandatoryaltcontactcountry ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactphone %] -
  16. - [% IF ( mandatoryaltcontactphone ) %] -
  17. + [% IF ( mandatoryaltcontactphone ) %] +
    18. + [% 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 @@ -
+
Alternate contact
    [% UNLESS noaltcontactsurname %] -
  1. - [% IF ( mandatoryaltcontactsurname ) %] -
  2. + [% IF ( mandatoryaltcontactsurname ) %] +
    3. + [% IF ( mandatoryaltcontactsurname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactfirstname %] -
  3. - [% IF ( mandatoryaltcontactfirstname ) %] -
  4. + [% IF ( mandatoryaltcontactfirstname ) %] +
    5. + [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress1 %] -
  5. - [% IF ( mandatoryaltcontactaddress1 ) %] -
  6. + [% IF ( mandatoryaltcontactaddress1 ) %] +
    7. + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress2 %] -
  7. - [% IF ( mandatoryaltcontactaddress2 ) %] -
  8. + [% IF ( mandatoryaltcontactaddress2 ) %] +
    9. + [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress3 %] -
  9. - [% IF ( mandatoryaltcontactaddress3 ) %] -
  10. + [% IF ( mandatoryaltcontactaddress3 ) %] +
    11. + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactstate %] -
  11. - [% IF ( mandatoryaltcontactstate ) %] -
  12. + [% IF ( mandatoryaltcontactstate ) %] +
    13. + [% IF ( mandatoryaltcontactstate ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactzipcode %] -
  13. - [% IF ( mandatoryaltcontactzipcode ) %] -
  14. + [% IF ( mandatoryaltcontactzipcode ) %] +
    15. + [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactcountry %] -
  15. - [% IF ( mandatoryaltcontactcountry ) %] -
  16. + [% IF ( mandatoryaltcontactcountry ) %] +
    17. + [% IF ( mandatoryaltcontactcountry ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactphone %] -
  17. - [% IF ( mandatoryaltcontactphone ) %] -
  18. + [% IF ( mandatoryaltcontactphone ) %] +
    19. + [% 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'), -- 2.20.1