From f03d83a94cccaa26f2978f6835e33632556153c4 Mon Sep 17 00:00:00 2001
From: reindertvetter <reindert@myparcel.nl>
Date: Mon, 4 Jul 2016 15:14:29 +0200
Subject: [PATCH] Fix PostNL location on label

---
 app/code/community/TIG/MyParcel2014/Model/Sales/Order.php | 5 +++++
 app/code/community/TIG/MyParcel2014/etc/config.xml        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php b/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
index 2142b0ca..b462c895 100644
--- a/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
+++ b/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
@@ -23,6 +23,11 @@ public function getShippingAddress() {
             $helper = Mage::helper('tig_myparcel');
             $usePgAddress = $helper->getConfig('pakjegemak_use_shipment_address') === '1';
 
+            $parentFunctions = debug_backtrace();
+            if($parentFunctions[3]['function'] == '_getConsignmentData') {
+                $usePgAddress = false;
+            }
+
             $pgAddress = false;
             $shippingAddress = false;
 
diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
index 351d9a7f..51124064 100644
--- a/app/code/community/TIG/MyParcel2014/etc/config.xml
+++ b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <TIG_MyParcel2014>
-            <version>1.5.6</version>
+            <version>1.5.7</version>
         </TIG_MyParcel2014>
     </modules>
     <global>