[*] BO : Improvement invoices management

controllers/admin/AdminOrdersController.php

@@ -588,7 +588,8 @@ class AdminOrdersControllerCore extends AdminController
 			else
 				$this->_errors[] = Tools::displayError('You do not have permission to edit here.');
 		}
-		elseif (Tools::isSubmit('submitEditNote')) {
+		elseif (Tools::isSubmit('submitEditNote'))
+		{
 			$id_order_invoice = (int)Tools::getValue('id_order_invoice');
 			$note = Tools::getValue('note');
 			$order_invoice = new OrderInvoice($id_order_invoice);
@@ -829,6 +830,7 @@ class AdminOrdersControllerCore extends AdminController
 			'can_edit' => ($this->tabAccess['edit'] == 1),
 			'current_id_lang' => $this->context->language->id,
 			'invoices_collection' => $order->getInvoicesCollection(),
+			'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(),
 			'HOOK_INVOICE' => Hook::exec('invoice', array('id_order' => $order->id)),
 			'HOOK_ADMIN_ORDER' => Hook::exec('adminOrder', array('id_order' => $order->id))
 		);

controllers/admin/AdminStatusesController.php

@@ -283,6 +283,21 @@ class AdminStatusesControllerCore extends AdminController
 						'name' => 'name'
 					)
 				),
+				array(
+					'type' => 'checkbox',
+					'name' => 'paid',
+					'values' => array(
+						'query' => array(
+							array(
+								'id' => 'on',
+								'name' => $this->l('Set order as paid'),
+								'val' => '1'
+							),
+						),
+						'id' => 'id',
+						'name' => 'name'
+					)
+				),
 				array(
 					'type' => 'select_template',
 					'label' => $this->l('Template:'),
@@ -311,7 +326,8 @@ class AdminStatusesControllerCore extends AdminController
 			'invoice_on' => $this->getFieldValue($obj, 'invoice'),
 			'hidden_on' => $this->getFieldValue($obj, 'hidden'),
 			'send_email_on' => $this->getFieldValue($obj, 'send_email'),
-			'shipped_on' => $this->getFieldValue($obj, 'shipped')
+			'shipped_on' => $this->getFieldValue($obj, 'shipped'),
+			'paid_on' => $this->getFieldValue($obj, 'paid')
 		);
 
 		return parent::renderForm();
@@ -491,6 +507,7 @@ class AdminStatusesControllerCore extends AdminController
 			$_POST['send_email'] = (int)Tools::getValue('send_email_on');
 			$_POST['hidden'] = (int)Tools::getValue('hidden_on');
 			$_POST['shipped'] = (int)Tools::getValue('shipped_on');
+			$_POST['paid'] = (int)Tools::getValue('paid_on');
 			if (!$_POST['send_email'])
 			{
 				$languages = Language::getLanguages(false);