diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 6d5b16329..1df01c7f0 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -118,7 +118,8 @@
                 label="Company"
                 show-field="code"
                 value-field="id"
-                ng-model="$ctrl.companyFk">
+                ng-model="$ctrl.companyFk"
+                on-change="$ctrl.recalcInvoiceDate($ctrl.companyFk)">
             </vn-autocomplete>
             <vn-autocomplete
                 url="Printers"
diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index 0aa6a4a24..c6185c511 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -7,23 +7,29 @@ class Controller extends Section {
     $onInit() {
         const date = Date.vnNew();
         Object.assign(this, {
-            maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
-            clientsToInvoice: 'all',
+          maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
+          clientsToInvoice: 'all',
         });
 
         this.$http.get('UserConfigs/getUserConfig')
-            .then(res => {
-                this.companyFk = res.data.companyFk;
-                const params = {
-                    companyFk: this.companyFk
-                };
-                return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
-            })
-            .then(res => {
-                this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
-                this.invoiceDate = this.minInvoicingDate;
-            });
-    }
+          .then(res => {
+            this.companyFk = res.data.companyFk;
+            this.recalcInvoiceDate(this.companyFk);
+          });
+      }
+
+      recalcInvoiceDate(companyFk) {
+        const params = { companyFk: companyFk };
+        this.fetchInvoiceDate(params);
+      }
+
+      fetchInvoiceDate(params) {
+        this.$http.get('InvoiceOuts/getInvoiceDate', { params })
+          .then(res => {
+            this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+            this.invoiceDate = this.minInvoicingDate;
+          });
+      }
 
     stopInvoicing() {
         this.status = 'stopping';