diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html
index 1eee5d853..634436395 100644
--- a/modules/client/front/descriptor/index.html
+++ b/modules/client/front/descriptor/index.html
@@ -79,13 +79,20 @@
                 </vn-quick-link>
             </div>
             <div ng-transclude="btnTwo">
+                <vn-quick-link
+                    tooltip="Client invoices list"
+                    state="['invoiceOut.index', {q: $ctrl.filter}]"
+                    icon="icon-invoices">
+                </vn-quick-link>
+            </div>
+            <div ng-transclude="btnThree">
                 <vn-quick-link
                     tooltip="New order"
                     state="['order.create', {clientFk: $ctrl.id}]"
                     icon="icon-basketadd">
                 </vn-quick-link>
             </div>
-            <div ng-transclude="btnThree">
+            <div ng-transclude="btnFour">
                 <vn-quick-link
                     tooltip="Go to user"
                     state="['account.card.summary', {id: $ctrl.id}]"
diff --git a/modules/client/front/descriptor/locale/es.yml b/modules/client/front/descriptor/locale/es.yml
index 03cf17e7b..efc240da0 100644
--- a/modules/client/front/descriptor/locale/es.yml
+++ b/modules/client/front/descriptor/locale/es.yml
@@ -2,4 +2,5 @@ Simple ticket: Ticket simple
 View consumer report: Ver informe de consumo
 From date: Fecha desde
 To date: Fecha hasta
-Go to user: Ir al usuario
\ No newline at end of file
+Go to user: Ir al usuario
+Client invoices list: Listado de facturas del cliente
\ No newline at end of file
diff --git a/modules/client/front/fiscal-data/index.js b/modules/client/front/fiscal-data/index.js
index 65129d3f8..397bb20e1 100644
--- a/modules/client/front/fiscal-data/index.js
+++ b/modules/client/front/fiscal-data/index.js
@@ -8,6 +8,14 @@ export default class Controller extends Section {
 
         const hasContactData = this.client.email || this.client.phone || this.client.mobile;
         const hasChangedTaxData = !orgData.isTaxDataChecked && this.client.isTaxDataChecked;
+
+        const shouldInvoice = this.client.isActive && !this.client.hasToInvoice;
+        const clientActivation = this.client.isActive && (orgData.isActive != this.client.isActive);
+        if (shouldInvoice && clientActivation) {
+            this.client.hasToInvoice = true;
+            this.vnApp.showMessage(this.$t('Client invoices enabled'));
+        }
+
         if (hasChangedTaxData && hasContactData)
             this.checkExistingClient();
         else this.save();
diff --git a/modules/client/front/fiscal-data/index.spec.js b/modules/client/front/fiscal-data/index.spec.js
index e028d01f3..17e730914 100644
--- a/modules/client/front/fiscal-data/index.spec.js
+++ b/modules/client/front/fiscal-data/index.spec.js
@@ -50,6 +50,16 @@ describe('Client', () => {
                 expect(controller.save).not.toHaveBeenCalledWith();
                 expect(controller.checkExistingClient).toHaveBeenCalledWith();
             });
+
+            it('should enable the hasToInvoice property any time the form activates the client with isActive', () => {
+                $scope.watcher.orgData.isActive = false;
+                controller.client.isActive = true;
+                controller.client.hasToInvoice = false;
+
+                controller.onSubmit();
+
+                expect(controller.client.hasToInvoice).toBe(true);
+            });
         });
 
         describe('checkExistingClient()', () => {