@@ -, +, @@
- minor changes on address format
- corrected member-password so that steetnumber is given to the template
---
.../includes/member-display-address-style-fr.inc | 5 ++---
.../en/includes/member-main-address-style-fr.inc | 23 +++++++++++-----------
members/member-password.pl | 1 +
3 files changed, 14 insertions(+), 15 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,15 +1,14 @@
[% IF ( address or address2 ) %]
[% IF ( address ) %]
+
[% SET roadtype_desc = '' %]
[% IF streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
[% END %]
-
[% IF streetnumber %] [% streetnumber %][% END %]
[%IF roadtype_desc %] [% roadtype_desc %][% END %]
+ [% address %]
- [% address %]
-
[% END %]
[% IF ( address2 ) %]
[% address2 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
@@ -1,18 +1,17 @@