// Manual merge PS 1.5.6.0

2013-10-07 18:22:55 +02:00
parent f78a093a1c c51fe5b22d
commit 77b2b4b6ca
270 changed files with 7787 additions and 640 deletions
@@ -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('Show a breakdown of taxes by tax rate on the invoice when there are several taxes combined'),
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
 					'PS_INVOICE_PREFIX' => array(
 						'title' => $this->l('Invoice prefix:'),
 						'desc' => $this->l('Prefix used for invoice name (e.g. IN00001)'),