@@ -, +, @@
---
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 %]
-
- [% IF ( mandatoryB_address ) %]
-
- [% ELSE %]
-
- [% END %]
- Address:
+
+ [% IF ( mandatoryB_address ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
- [% IF ( mandatoryB_address ) %]Required [% END %]
-
+ [% IF ( mandatoryB_address ) %]Required [% END %]
+
[% 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_zipcode %]
@@ -37,40 +37,40 @@
[% 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_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 %]
-
-
+
+
--- 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 %]
-
- [% IF ( mandatoryB_address ) %]
-
- [% ELSE %]
-
- [% END %]
- Address:
+
+ [% IF ( mandatoryB_address ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
- [% IF ( mandatoryB_address ) %]Required [% END %]
-
+ [% IF ( mandatoryB_address ) %]Required [% END %]
+
[% 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 %]
-
-
+
+
--- 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 %]
-
- [% 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 %]
--- 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 %]
-
- [% 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 %]
--- 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;
--