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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

This commit is contained in:
Jorge Penadés 2024-05-13 13:20:32 +02:00
parent e16e5e3db3 799108f041
commit 5d5f1ef7c5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/invoiceIn/back/models/invoice-in-config.json
View File

@ -26,7 +26,7 @@
"sageWithholding": { "sageWithholding": {
"type": "belongsTo", "type": "belongsTo",
"model": "SageWithholding", "model": "SageWithholding",
"foreignKey": "sageWithholdingFk" "foreignKey": "sageFarmerWithholdingFk"
} }
}, },
"acls": [{ "acls": [{

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

@ -1,7 +1,7 @@
<vn-crud-model <vn-crud-model
url="InvoiceInConfigs" url="InvoiceInConfigs"
data="$ctrl.config" data="$ctrl.config"
filter="{fields: ['sageWithholdingFk']}" filter="{fields: ['sageFarmerWithholdingFk']}"
id-value="1" id-value="1"
auto-load="true"> auto-load="true">
</vn-crud-model> </vn-crud-model>

2
modules/invoiceIn/front/descriptor/index.js
View File

@ -112,7 +112,7 @@ class Controller extends Descriptor {
} }
isAgricultural() { isAgricultural() {
return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageWithholdingFk; return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageFarmerWithholdingFk;
} }
} }