From b93e2f5359718992bad46e924d548c23ab631573 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Wed, 13 Feb 2019 09:49:41 +0100
Subject: [PATCH] #1114 item.regularize

---
 front/salix/components/user-configuration-popover/index.js | 6 +++---
 modules/item/front/descriptor/index.html                   | 2 +-
 modules/item/front/descriptor/index.js                     | 5 +++--
 modules/item/front/descriptor/locale/es.yml                | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/front/salix/components/user-configuration-popover/index.js b/front/salix/components/user-configuration-popover/index.js
index 18a8aae7e..5f8eeb330 100644
--- a/front/salix/components/user-configuration-popover/index.js
+++ b/front/salix/components/user-configuration-popover/index.js
@@ -92,7 +92,7 @@ class Controller {
         this.company = value;
         if (value &&
             (!window.localStorage.localCompanyFk || window.localStorage.localCompanyFk === 'null'))
-            window.localStorage.defaultCompanyFk = value;
+            window.localStorage.setItem('localCompanyFk', value);
         this.setUserConfig('companyFk', value);
     }
 
@@ -118,13 +118,13 @@ class Controller {
                 if (res.data && res.data.warehouseFk) {
                     this.warehouse = res.data.warehouseFk;
                     if (res.data.warehouseFk && !window.localStorage.localWarehouseFk)
-                        window.localStorage.defaultWarehouseFk = res.data.warehouseFk;
+                        window.localStorage.setItem('localWarehouseFk', res.data.warehouseFk);
                 }
 
                 if (res.data && res.data.companyFk) {
                     this.company = res.data.companyFk;
                     if (res.data.companyFk && !window.localStorage.localCompanyFk)
-                        window.localStorage.defaultCompanyFk = res.data.companyFk;
+                        window.localStorage.setItem('defaultCompanyFk', res.data.companyFk);
                 }
             });
     }
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index 56f64c3aa..02e1267dc 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -92,7 +92,7 @@
     <tpl-body>
         <div>
             <h5 style="text-align: center">
-                <span translate>Regularize</span>
+                <span translate>Regularize stock</span>
             </h5>
             <vn-textfield
                 label="Quantity"
diff --git a/modules/item/front/descriptor/index.js b/modules/item/front/descriptor/index.js
index 6f5f56ae5..552ccd85a 100644
--- a/modules/item/front/descriptor/index.js
+++ b/modules/item/front/descriptor/index.js
@@ -9,7 +9,7 @@ class Controller {
         this.vnApp = vnApp;
         this.$translate = $translate;
         this.moreOptions = [
-            {callback: this.showRegularizeDialog, name: 'Regularize'}
+            {callback: this.showRegularizeDialog, name: 'Regularize stock'}
         ];
     }
 
@@ -22,7 +22,8 @@ class Controller {
     }
 
     set warehouseFk(value) {
-        this._warehouseFk = value;
+        if (value)
+            this._warehouseFk = value;
     }
 
     get warehouseFk() {
diff --git a/modules/item/front/descriptor/locale/es.yml b/modules/item/front/descriptor/locale/es.yml
index fca4375f4..22852f6a4 100644
--- a/modules/item/front/descriptor/locale/es.yml
+++ b/modules/item/front/descriptor/locale/es.yml
@@ -1 +1 @@
-Regularize: Regularizar
\ No newline at end of file
+Regularize stock: Regularizar stock
\ No newline at end of file