diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 951b462fe..4e4e0d2ab 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -243,7 +243,7 @@ class OrderInvoiceCore extends ObjectModel
 		WHERE od.`id_order` = '.(int)$this->id_order.'
 		AND od.`id_order_invoice` = '.(int)$this->id.'
 		AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD
-		);
+		) || Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
 	}
 
 	/**
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 4eee707a4..b242bde0b 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -42,6 +42,12 @@ class AdminInvoicesControllerCore extends AdminController
 						'cast' => 'intval',
 						'type' => 'bool'
 					),
+					'PS_INVOICE_TAXES_BREAKDOWN' => array(
+						'title' => $this->l('Enable the breakdown of taxes on the invoice:'),
+						'desc' => $this->l('Enable the breakdown of taxes on the invoice when there are computed (like in QC)'),
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
 					'PS_INVOICE_PREFIX' => array(
 						'title' => $this->l('Invoice prefix:'),
 						'desc' => $this->l('Prefix used for invoice name (e.g. IN00001)'),