diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 8698c8c27..d33284b93 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -37,7 +37,7 @@ class OrderInvoiceCore extends ObjectModel
 	public $delivery_number;
 
 	/** @var integer */
-	public $delivery_date;
+	public $delivery_date = '0000-00-00 00:00:00';
 
 	/** @var float */
 	public $total_discount_tax_excl;
@@ -88,7 +88,7 @@ class OrderInvoiceCore extends ObjectModel
 			'id_order' => 				array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'number' => 				array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'delivery_number' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-			'delivery_date' => 			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+			'delivery_date' => 			array('type' => self::TYPE_DATE, 'validate' => 'isDateFormat'),
 			'total_discount_tax_excl' =>array('type' => self::TYPE_FLOAT),
 			'total_discount_tax_incl' =>array('type' => self::TYPE_FLOAT),
 			'total_paid_tax_excl' =>	array('type' => self::TYPE_FLOAT),
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index cfa9e39d1..42ca59acc 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -539,23 +539,7 @@ class AdminOrdersControllerCore extends AdminController
 				$this->_errors[] = Tools::displayError('You do not have permission to delete here.');
 		}
 		elseif (isset($_GET['messageReaded']))
-		{
 			Message::markAsReaded($_GET['messageReaded'], $this->context->employee->id);
-		}
-		// TODO clean PaymentCC
-		else if (Tools::isSubmit('setTransactionId') && ((int)Tools::getValue('id_order')))
-		{
-			$order = new Order((int)(Tools::getValue('id_order')));
-			$pcc = new PaymentCC((int)Tools::getValue('id_payment_cc'));
-
-			$pcc->id_order = $order->id;
-			$pcc->transaction_id = (string)Tools::getValue('transaction_id');
-			$pcc->id_currency = $order->id_currency;
-			$pcc->amount = $order->total_paid;
-			$pcc->save();
-
-			unset($order, $pcc);
-		}
 		else if (Tools::isSubmit('submitAddPayment'))
 		{
 			if ($this->tabAccess['edit'] === '1')