verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

#1114 item.regularize

This commit is contained in:
Gerard 2019-02-13 09:49:41 +01:00
parent bfaf9b1ed4
commit b93e2f5359
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/salix/components/user-configuration-popover/index.js
View File

@ -92,7 +92,7 @@ class Controller {
this.company = value; this.company = value;
if (value && if (value &&
(!window.localStorage.localCompanyFk || window.localStorage.localCompanyFk === 'null')) (!window.localStorage.localCompanyFk || window.localStorage.localCompanyFk === 'null'))
window.localStorage.defaultCompanyFk = value; window.localStorage.setItem('localCompanyFk', value);
this.setUserConfig('companyFk', value); this.setUserConfig('companyFk', value);
} }
@ -118,13 +118,13 @@ class Controller {
if (res.data && res.data.warehouseFk) { if (res.data && res.data.warehouseFk) {
this.warehouse = res.data.warehouseFk; this.warehouse = res.data.warehouseFk;
if (res.data.warehouseFk && !window.localStorage.localWarehouseFk) 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) { if (res.data && res.data.companyFk) {
this.company = res.data.companyFk; this.company = res.data.companyFk;
if (res.data.companyFk && !window.localStorage.localCompanyFk) if (res.data.companyFk && !window.localStorage.localCompanyFk)
window.localStorage.defaultCompanyFk = res.data.companyFk; window.localStorage.setItem('defaultCompanyFk', res.data.companyFk);
} }
}); });
} }

2
modules/item/front/descriptor/index.html
View File

@ -92,7 +92,7 @@
<tpl-body> <tpl-body>
<div> <div>
<h5 style="text-align: center"> <h5 style="text-align: center">
<span translate>Regularize</span> <span translate>Regularize stock</span>
</h5> </h5>
<vn-textfield <vn-textfield
label="Quantity" label="Quantity"

3
modules/item/front/descriptor/index.js
View File

@ -9,7 +9,7 @@ class Controller {
this.vnApp = vnApp; this.vnApp = vnApp;
this.$translate = $translate; this.$translate = $translate;
this.moreOptions = [ this.moreOptions = [
{callback: this.showRegularizeDialog, name: 'Regularize'} {callback: this.showRegularizeDialog, name: 'Regularize stock'}
]; ];
} }
@ -22,6 +22,7 @@ class Controller {
} }
set warehouseFk(value) { set warehouseFk(value) {
if (value)
this._warehouseFk = value; this._warehouseFk = value;
} }

2
modules/item/front/descriptor/locale/es.yml
View File

@ -1 +1 @@
Regularize: Regularizar Regularize stock: Regularizar stock