// REVERT MERGE

2011-07-27 13:35:06 +00:00
parent 233c0076b7
commit 5f6f018885
182 changed files with 1335 additions and 6181 deletions
@@ -146,7 +146,6 @@ class OrderDetailControllerCore extends FrontController
 					'messages' => Message::getMessagesByOrderId((int)($order->id)),
 					'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_,
 					'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_,
-			'isRecyclable' => Configuration::get('PS_RECYCLABLE_PACK'),
 					'use_tax' => Configuration::get('PS_TAX'),
 					'group_use_tax' => (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC),
 					'customizedDatas' => $customizedDatas));