From 7b0cdb8cda7ded993abb211254a946eeaea58ab6 Mon Sep 17 00:00:00 2001
From: zzuutt <zzuutt34@free.fr>
Date: Tue, 29 Apr 2014 15:31:44 +0200
Subject: [PATCH 1/3] Update address-update.html

---
 templates/frontOffice/default/address-update.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html
index 78ce6f1e7..9182f8b76 100644
--- a/templates/frontOffice/default/address-update.html
+++ b/templates/frontOffice/default/address-update.html
@@ -107,6 +107,19 @@
                     <!--/.form-group-->
                 {/form_field}
 
+                {form_field form=$form field="company"}
+                  <div class="form-group group-company{if $error} has-error{/if}">
+                    <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                      <div class="control-input">
+                        <input type="text" name="{$name}" value="{$value|default:{$COMPANY} nofilter}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder company"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                        {if $error }
+                          <span class="help-block">{$message}</span>
+                          {assign var="error_focus" value="true"}
+                        {/if}
+                      </div>
+                  </div><!--/.form-group-->
+                {/form_field}
+
                 {form_field form=$form field="address1"}
                     <div class="form-group group-address1 {if $error}has-error{/if}">
                         <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
@@ -245,4 +258,4 @@
     </article>
 
     </div><!-- /.layout -->
-{/block}
\ No newline at end of file
+{/block}

From c9199cff0b83e191fba486c2a9c4bc41af8ff895 Mon Sep 17 00:00:00 2001
From: zzuutt <zzuutt@users.noreply.github.com>
Date: Tue, 29 Apr 2014 16:24:25 +0200
Subject: [PATCH 2/3] Update address-update.html

add colon after {$label}
---
 templates/frontOffice/default/address-update.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html
index 9182f8b76..2920e533e 100644
--- a/templates/frontOffice/default/address-update.html
+++ b/templates/frontOffice/default/address-update.html
@@ -60,7 +60,7 @@
                 {form_field form=$form field="title"}
                     {assign var="customer_title_id" value="{$value|default:$TITLE}"}
                     <div class="form-group group-title{if $error} has-error{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                         <div class="control-input">
                             <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 <option value="">-- {intl l="Select Title"} --</option>
@@ -183,7 +183,7 @@
                 {form_field form=$form field="country"}
                     {assign var="customer_country_id" value="{$value|default:$COUNTRY}"}
                     <div class="form-group group-country {if $error}has-error{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                         <div class="control-input">
                             <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 <option value="">-- {intl l="Select Country"} --</option>

From 17c367a21e27057518eb8f2b5e3d7e93499ef44e Mon Sep 17 00:00:00 2001
From: zzuutt <zzuutt@users.noreply.github.com>
Date: Tue, 29 Apr 2014 16:25:52 +0200
Subject: [PATCH 3/3] Update address-update.html

---
 templates/frontOffice/default/address-update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html
index 2920e533e..65e9c0177 100644
--- a/templates/frontOffice/default/address-update.html
+++ b/templates/frontOffice/default/address-update.html
@@ -109,7 +109,7 @@
 
                 {form_field form=$form field="company"}
                   <div class="form-group group-company{if $error} has-error{/if}">
-                    <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                    <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
                       <div class="control-input">
                         <input type="text" name="{$name}" value="{$value|default:{$COMPANY} nofilter}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder company"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                         {if $error }