Merge pull request '#5447 warehouse out filter' (!2500) from 5447-TravelExtraCommunity into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
264d5b4b9a
|
@ -25,6 +25,9 @@
|
|||
},
|
||||
"isSocialNameUnique": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"continentFk": {
|
||||
"type": "number"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
|
@ -32,6 +35,11 @@
|
|||
"type": "belongsTo",
|
||||
"model": "Currency",
|
||||
"foreignKey": "currencyFk"
|
||||
},
|
||||
"continent": {
|
||||
"type": "belongsTo",
|
||||
"model": "Continent",
|
||||
"foreignKey": "continentFk"
|
||||
}
|
||||
},
|
||||
"acls": [
|
||||
|
|
|
@ -24,6 +24,16 @@
|
|||
},
|
||||
"isManaged":{
|
||||
"type": "boolean"
|
||||
},
|
||||
"countryFk": {
|
||||
"type": "number"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
"country": {
|
||||
"type": "belongsTo",
|
||||
"model": "Country",
|
||||
"foreignKey": "countryFk"
|
||||
}
|
||||
},
|
||||
"acls": [
|
||||
|
|
|
@ -234,4 +234,4 @@
|
|||
"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
|
||||
"Cannot add holidays on this day": "Cannot add holidays on this day",
|
||||
"Cannot send mail": "Cannot send mail"
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue