From 7fa4eabf86df48b01a25ee1981e7f0475d3a12c4 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 14 Jun 2023 14:59:18 +0200
Subject: [PATCH 1/4] refs #5842 fix: recalcula invoiceDate cuando se cambia la
 company

---
 .../front/global-invoicing/index.html         |  3 +-
 .../front/global-invoicing/index.js           | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 6d5b16329f..1df01c7f0f 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 0aa6a4a24d..c6185c5115 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';

From 14ebcf96c05931c6318d7dbcbab2f3ded84cfee7 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 15 Jun 2023 07:24:17 +0200
Subject: [PATCH 2/4] refs #5842 refactor: change names

---
 modules/invoiceOut/front/global-invoicing/index.html | 2 +-
 modules/invoiceOut/front/global-invoicing/index.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 1df01c7f0f..3f0a106507 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -119,7 +119,7 @@
                 show-field="code"
                 value-field="id"
                 ng-model="$ctrl.companyFk"
-                on-change="$ctrl.recalcInvoiceDate($ctrl.companyFk)">
+                on-change="$ctrl.getInvoiceDate(value)">
             </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 c6185c5115..f300d44965 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -14,11 +14,11 @@ class Controller extends Section {
         this.$http.get('UserConfigs/getUserConfig')
           .then(res => {
             this.companyFk = res.data.companyFk;
-            this.recalcInvoiceDate(this.companyFk);
+            this.getInvoiceDate(this.companyFk);
           });
       }
 
-      recalcInvoiceDate(companyFk) {
+      getInvoiceDate(companyFk) {
         const params = { companyFk: companyFk };
         this.fetchInvoiceDate(params);
       }

From a50de4e509d11fae67b6d069bd9f7183330be973 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 15 Jun 2023 09:50:46 +0200
Subject: [PATCH 3/4] refs #5842 feat: comprueba que invoiceDate no sea null

---
 modules/invoiceOut/front/global-invoicing/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index f300d44965..965782e5b7 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -42,13 +42,14 @@ class Controller extends Section {
         this.addresses = null;
 
         try {
+            console.log(this.invoiceDate, this.minInvoicingDate);
             if (this.clientsToInvoice == 'one' && !this.clientId)
                 throw new UserError('Choose a valid client');
             if (!this.invoiceDate || !this.maxShipped)
                 throw new UserError('Invoice date and the max date should be filled');
             if (this.invoiceDate < this.maxShipped)
                 throw new UserError('Invoice date can\'t be less than max date');
-            if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+            if (this.minInvoicingDate && this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
                 throw new UserError('Exists an invoice with a previous date');
             if (!this.companyFk)
                 throw new UserError('Choose a valid company');

From 5f2c5c5f9d93ee7416f84309c095e45535433cd8 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Thu, 15 Jun 2023 09:55:32 +0200
Subject: [PATCH 4/4] refs #5842 delete console.log

---
 modules/invoiceOut/front/global-invoicing/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index 965782e5b7..5a078dfbb0 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -42,7 +42,6 @@ class Controller extends Section {
         this.addresses = null;
 
         try {
-            console.log(this.invoiceDate, this.minInvoicingDate);
             if (this.clientsToInvoice == 'one' && !this.clientId)
                 throw new UserError('Choose a valid client');
             if (!this.invoiceDate || !this.maxShipped)