// Fixed fix

2013-07-23 14:19:13 +02:00
parent 87a4b75df4
commit c829ac5b7d
1 changed files with 3 additions and 1 deletions
@@ -254,7 +254,9 @@ class OrderCore extends ObjectModel
 	public function __construct($id = null, $id_lang = null)
 	{
 		parent::__construct($id, $id_lang);
-		if ($this->id_customer && Context::getContext()->controller->controller_type != 'admin')
+		
+		$is_admin = (is_object(Context::getContext()->controller) && Context::getContext()->controller->controller_type == 'admin');
+		if ($this->id_customer && !$is_admin)
 		{
 			$customer = new Customer((int)($this->id_customer));
 			$this->_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);