@@ -, +, @@
---
.../en/includes/member-alt-address-style-us.inc | 111 ++++++
.../en/includes/member-alt-contact-style-us.inc | 112 +++++++
.../en/includes/member-main-address-style-us.inc | 124 +++++++
.../prog/en/modules/members/memberentrygen.tt | 350 +-------------------
4 files changed, 350 insertions(+), 347 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
--- 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
@@ -0,0 +1,111 @@
+
--- 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
@@ -0,0 +1,112 @@
+
--- 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
@@ -0,0 +1,124 @@
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -470,130 +470,7 @@
[% END %]
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
-
+[% INCLUDE 'member-main-address-style-us.inc' %]
[% END # nostreet && nocity etc group%]
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
@@ -682,233 +559,12 @@
[% IF ( step_6 ) %]
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
-
+[% INCLUDE 'member-alt-address-style-us.inc' %]
[% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
[% END %]
[% IF ( step_2 ) %]
[% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
-
+[% INCLUDE 'member-alt-contact-style-us.inc' %]
[% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
[% END %]
--