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

modules/invoiceIn/back/models/invoice-in-config.json

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

modules/invoiceIn/front/descriptor/index.html

@@ -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>

modules/invoiceIn/front/descriptor/index.js

@@ -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;
     }
 }