@@ -, +, @@
missing class
- Create / edit a customer to have streetnumber, streettype and address in
both main address and alternate address
- Switch syspref addressformat ot French style
- Verify that both main address and alternate address display as expected
on patron's detail page (street number, street type and address on same
line)
---
.../prog/en/includes/member-display-address-style-fr.inc | 3 +--
.../prog/en/includes/member-display-alt-address-style-fr.inc | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
@@ -1,11 +1,10 @@
[% IF ( address or address2 ) %]
[% IF ( address ) %]
-
[% SET roadtype_desc = '' %]
[% IF streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
[% END %]
- [% IF streetnumber %][% streetnumber %] [% END %]
+ [% IF streetnumber %][% streetnumber %] [% END %]
[%IF roadtype_desc %][% roadtype_desc %] [% END %]
[% address %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc
@@ -1,20 +1,20 @@
[% IF ( B_address or B_address2 ) %]
[% IF ( B_address ) %]
[% SET roadtype_desc = '' %]
- [% IF B_streetnumber %] [% B_streetnumber %][% END %]
[% IF B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
[% END %]
- [% B_address %]
- [%IF roadtype_desc %] [% roadtype_desc %][% END %]
+ [% IF B_streetnumber %][% B_streetnumber %][% END %]
+ [%IF roadtype_desc %][% roadtype_desc %] [% END %]
+ [% B_address %]
[% END %]
[% IF ( B_address2 ) %]
[% B_address2 %]
[% END %]
[% END %]
-[% IF ( B_city ) %]
- [%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
+[% IF ( B_city ) %]
+ [%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
[% B_city %]
[% IF ( B_state ) %][% B_state %][% END %]
[% IF ( B_country ) %]
[% B_country %][% END %]
--