From 54bb284a60dab066d7ad0b08005ada576d0f31f1 Mon Sep 17 00:00:00 2001
From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
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 <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../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 ) %]
+        <li>
         [% SET roadtype_desc = '' %]
         [% IF streettype %]
             [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
         [% END %]
-        <li>
         [% IF streetnumber %] [% streetnumber %][% END %]
         [%IF roadtype_desc %] [% roadtype_desc %][% END %]
+            [% address %]
         </li>
-            <li class="patronaddress1">[% address %]
-            </li>
     [% END %]
     [% IF ( address2 ) %]
         <li class="patronaddress2">[% address2 %]</li>
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 @@
 <fieldset class="rows" id="memberentry_mainaddress">
     <legend id="main_address_lgd">Main address</legend><ol>
-[% UNLESS nostreetnumber %]
-    <li>
-    [% IF ( mandatorystreetnumber ) %]
-        <label for="streetnumber" class="required">
-    [% ELSE %]
-        <label for="streetnumber">
-    [% END %]
-        Street number: </label>
-        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
-    [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
-    </li>
-[% END %]
 [% UNLESS nostreettype %]
+    [% UNLESS nostreetnumber %]
+        [% IF ( mandatorystreetnumber ) %]
+            <label for="streetnumber" class="required">
+        [% ELSE %]
+            <label for="streetnumber">
+        [% END %]
+            Street number: </label>
+            <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
+        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
+    [% END %]
+
     [% IF roadtypes %]
         <li>
         [% IF ( mandatorystreettype ) %]
diff --git a/members/member-password.pl b/members/member-password.pl
index 2d9b2ccb76..4fdf699427 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -136,6 +136,7 @@ $template->param(
     country                    => $bor->{'country'},
     phone                      => $bor->{'phone'},
     phonepro                   => $bor->{'phonepro'},
+    streetnumber               => $bor->{'streetnumber'},
     mobile                     => $bor->{'mobile'},
     email                      => $bor->{'email'},
     emailpro                   => $bor->{'emailpro'},
-- 
2.39.5