7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit 5d5f1ef7c5 - Show all commits

View File

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

View File

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

View File

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