@@ -, +, @@ --- installer/data/mysql/sysprefs.sql | 4 +- .../en/includes/member-alt-address-style-de.inc | 102 ++++++------ .../en/includes/member-alt-address-style-us.inc | 120 +++++++------- .../en/includes/member-alt-contact-style-de.inc | 146 +++++++++--------- .../en/includes/member-alt-contact-style-us.inc | 164 ++++++++++---------- .../en/includes/member-main-address-style-de.inc | 14 +- .../en/includes/member-main-address-style-us.inc | 16 +- members/boraccount.pl | 22 ++-- 8 files changed, 294 insertions(+), 294 deletions(-) --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -8,6 +8,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'), ('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'), ('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'), +('addressformat','us','','Choose format to display postal addresses', 'Choice'), ('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option. Example: eng|fre|ita','Textarea'), ('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'), ('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'), @@ -474,6 +475,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'), ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), -('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), -('addressformat','us','','Choose format to display postal addresses', 'Choice') +('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') ; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc +++ a/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 %] -
    4. - [% IF ( mandatoryB_address2 ) %] -
    5. + [% IF ( mandatoryB_address2 ) %] +
    6. + [% IF ( mandatoryB_address2 ) %]Required[% END %] + [% END %] [% UNLESS noB_zipcode %]
    7. @@ -37,40 +37,40 @@
    8. [% END %] [% UNLESS noB_city %] -
    9. - [% IF ( mandatoryB_city ) %] -
    10. + [% IF ( mandatoryB_city ) %] +
    11. + [% IF ( mandatoryB_city ) %]Required[% END %] + [% END %] [% UNLESS noB_state %] -
    12. - [% IF ( mandatoryB_state ) %] -
    13. + [% IF ( mandatoryB_state ) %] +
    14. + [% IF ( mandatoryB_state ) %]Required[% END %] + [% END %] [% UNLESS noB_country %] -
    15. - [% IF ( mandatoryB_country ) %] -
    16. + [% IF ( mandatoryB_country ) %] +
    17. + [% IF ( mandatoryB_country ) %]Required[% END %] + [% END %] [% UNLESS noB_phone %]
    18. @@ -85,7 +85,7 @@
    19. [% END %] [% UNLESS noB_email %] -
    20. +
    21. [% IF ( mandatoryB_email ) %] - [% IF ( mandatoryB_email ) %]Required[% END %]
    22. + [% IF ( mandatoryB_email ) %]Required[% END %] [% END %] [% UNLESS nocontactnote %]
    23. @@ -107,5 +107,5 @@ [% IF ( mandatorycontactnote ) %]Required[% END %]
    24. [% END %] -
    -
    +
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc +++ a/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 %] -
    4. - [% IF ( mandatoryB_address2 ) %] -
    5. + [% IF ( mandatoryB_address2 ) %] +
    6. + [% IF ( mandatoryB_address2 ) %]Required[% END %] + [% END %] [% UNLESS noB_city %] -
    7. - [% IF ( mandatoryB_city ) %] -
    8. + [% IF ( mandatoryB_city ) %] +
    9. + [% IF ( mandatoryB_city ) %]Required[% END %] + [% END %] [% UNLESS noB_state %] -
    10. - [% IF ( mandatoryB_state ) %] -
    11. + [% IF ( mandatoryB_state ) %] +
    12. + [% IF ( mandatoryB_state ) %]Required[% END %] + [% END %] [% UNLESS noB_zipcode %] -
    13. - [% IF ( mandatoryB_zipcode ) %] -
    14. + [% IF ( mandatoryB_zipcode ) %] +
    15. + [% IF ( mandatoryB_zipcode ) %]Required[% END %] + [% END %] [% UNLESS noB_country %] -
    16. - [% IF ( mandatoryB_country ) %] -
    17. + [% IF ( mandatoryB_country ) %] +
    18. + [% IF ( mandatoryB_country ) %]Required[% END %] + [% END %] [% UNLESS noB_phone %]
    19. @@ -85,7 +85,7 @@
    20. [% END %] [% UNLESS noB_email %] -
    21. +
    22. [% IF ( mandatoryB_email ) %] - [% IF ( mandatoryB_email ) %]Required[% END %]
    23. + [% IF ( mandatoryB_email ) %]Required[% END %] [% END %] [% UNLESS nocontactnote %]
    24. @@ -107,5 +107,5 @@ [% IF ( mandatorycontactnote ) %]Required[% END %]
    25. [% END %] -
    -
    +
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc +++ a/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 %] -
  4. - [% IF ( mandatoryaltcontactfirstname ) %] -
  5. + [% IF ( mandatoryaltcontactfirstname ) %] +
  6. + [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress1 %] -
  7. - [% IF ( mandatoryaltcontactaddress1 ) %] -
  8. + [% IF ( mandatoryaltcontactaddress1 ) %] +
  9. + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress2 %] -
  10. - [% IF ( mandatoryaltcontactaddress2 ) %] -
  11. + [% IF ( mandatoryaltcontactaddress2 ) %] +
  12. + [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactzipcode %]
  13. @@ -61,52 +61,52 @@
  14. [% END %] [% UNLESS noaltcontactaddress3 %] -
  15. - [% IF ( mandatoryaltcontactaddress3 ) %] -
  16. + [% IF ( mandatoryaltcontactaddress3 ) %] +
  17. + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactstate %] -
  18. - [% IF ( mandatoryaltcontactstate ) %] -
  19. + [% IF ( mandatoryaltcontactstate ) %] +
  20. + [% IF ( mandatoryaltcontactstate ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactcountry %] -
  21. - [% IF ( mandatoryaltcontactcountry ) %] -
  22. + [% IF ( mandatoryaltcontactcountry ) %] +
  23. + [% IF ( mandatoryaltcontactcountry ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactphone %] -
  24. - [% IF ( mandatoryaltcontactphone ) %] -
  25. + [% IF ( mandatoryaltcontactphone ) %] +
  26. + [% IF ( mandatoryaltcontactphone ) %]Required[% END %] + [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc +++ a/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 %] -
  4. - [% IF ( mandatoryaltcontactfirstname ) %] -
  5. + [% IF ( mandatoryaltcontactfirstname ) %] +
  6. + [% IF ( mandatoryaltcontactfirstname ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress1 %] -
  7. - [% IF ( mandatoryaltcontactaddress1 ) %] -
  8. + [% IF ( mandatoryaltcontactaddress1 ) %] +
  9. + [% IF ( mandatoryaltcontactaddress1 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress2 %] -
  10. - [% IF ( mandatoryaltcontactaddress2 ) %] -
  11. + [% IF ( mandatoryaltcontactaddress2 ) %] +
  12. + [% IF ( mandatoryaltcontactaddress2 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactaddress3 %] -
  13. - [% IF ( mandatoryaltcontactaddress3 ) %] -
  14. + [% IF ( mandatoryaltcontactaddress3 ) %] +
  15. + [% IF ( mandatoryaltcontactaddress3 ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactstate %] -
  16. - [% IF ( mandatoryaltcontactstate ) %] -
  17. + [% IF ( mandatoryaltcontactstate ) %] +
  18. + [% IF ( mandatoryaltcontactstate ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactzipcode %] -
  19. - [% IF ( mandatoryaltcontactzipcode ) %] -
  20. + [% IF ( mandatoryaltcontactzipcode ) %] +
  21. + [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactcountry %] -
  22. - [% IF ( mandatoryaltcontactcountry ) %] -
  23. + [% IF ( mandatoryaltcontactcountry ) %] +
  24. + [% IF ( mandatoryaltcontactcountry ) %]Required[% END %] + [% END %] [% UNLESS noaltcontactphone %] -
  25. - [% IF ( mandatoryaltcontactphone ) %] -
  26. + [% IF ( mandatoryaltcontactphone ) %] +
  27. + [% IF ( mandatoryaltcontactphone ) %]Required[% END %] + [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc +++ a/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 %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc +++ a/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 %] - +
--- a/members/boraccount.pl +++ a/members/boraccount.pl @@ -110,17 +110,17 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettyp $template->param(%$data); $template->param( - finesview => 1, - borrowernumber => $borrowernumber, - roadtype => $roadtype, - branchname => GetBranchName($data->{'branchcode'}), - total => sprintf("%.2f",$total), - totalcredit => $totalcredit, - is_child => ($data->{'category_type'} eq 'C'), - reverse_col => $reverse_col, - accounts => $accts, - activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), - RoutingSerials => C4::Context->preference('RoutingSerials'), + finesview => 1, + borrowernumber => $borrowernumber, + roadtype => $roadtype, + branchname => GetBranchName( $data->{'branchcode'} ), + total => sprintf( "%.2f", $total ), + totalcredit => $totalcredit, + is_child => ( $data->{'category_type'} eq 'C' ), + reverse_col => $reverse_col, + accounts => $accts, + activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), + RoutingSerials => C4::Context->preference('RoutingSerials'), ); output_html_with_http_headers $input, $cookie, $template->output; --