From d4b75c8ba6a7cd2c967d785b263a05619b258fa3 Mon Sep 17 00:00:00 2001
From: Lamamy Bastien <bastien.lamamy@ph2m.com>
Date: Fri, 14 Oct 2016 17:00:32 +0200
Subject: [PATCH] [bug-#118] Wrong shipping street and vat labels in checkout
 onepage templates

---
 .../base/default/template/checkout/onepage/shipping.phtml     | 2 +-
 .../rwd/default/template/checkout/onepage/shipping.phtml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
index 832d89be3065..fc9570bef5bc 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
@@ -64,7 +64,7 @@
             <?php endfor; ?>
                     <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
                     <li class="wide">
-                        <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
+                        <label for="shipping:vat_id"><?php echo $this->__('VAT Number'); ?></label>
                         <div class="input-box">
                             <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
                         </div>
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index 1fc5d13381dc..5a5113363048 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -58,7 +58,7 @@
             <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
             <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                     <li class="wide">
-                        <label for="billing:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
+                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>
@@ -66,7 +66,7 @@
             <?php endfor; ?>
                     <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
                     <li class="wide">
-                        <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
+                        <label for="shipping:vat_id"><?php echo $this->__('VAT Number'); ?></label>
                         <div class="input-box">
                             <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('VAT Number')); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
                         </div>