From 54bb284a60dab066d7ad0b08005ada576d0f31f1 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Fri, 24 Mar 2017 12:47:42 +0000 Subject: [PATCH] Bug 18110: Corrected display address format - minor changes on address format - corrected member-password so that steetnumber is given to the template Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../member-display-address-style-fr.inc | 5 ++-- .../includes/member-main-address-style-fr.inc | 23 +++++++++---------- members/member-password.pl | 1 + 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc index 5d4f197686..07fc74b993 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc +++ b/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 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc index e666ef9ab5..4e8dc802b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc @@ -1,18 +1,17 @@
    Main address
      -[% UNLESS nostreetnumber %] -
    1. - [% IF ( mandatorystreetnumber ) %] -
    2. -[% END %] [% UNLESS nostreettype %] + [% UNLESS nostreetnumber %] + [% IF ( mandatorystreetnumber ) %] +