2a224e2823
Merge branch 'test' into 6372-ExpenseManual-Error
1d4c48e149
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
775764c2a9
Merge pull request '#6878 hotfix fix add manual entries' (!2074) from 6878-hotfix-addManualTimeEntries into master
f51df43d17
Merge branch 'master' into 6878-hotfix-addManualTimeEntries
6345d1ae42
fix refs #6780 XDiario
6372-ExpenseManual-Error
2b19004783
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
c7dd81e53d
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
ba167d52ef
Merge pull request '6372-ExpenseManual-Error' (!2072) from 6372-ExpenseManual-Error into dev
2bf62dca25
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
20e5eda4d1
fix: refs #6915 broken view vn.doc removed
ba167d52ef
Merge pull request '6372-ExpenseManual-Error' (!2072) from 6372-ExpenseManual-Error into dev
f2b1418419
Merge branch 'dev' into 6372-ExpenseManual-Error
c348900c80
Merge branch 'dev' into 6372-ExpenseManual-Error
d9119f9ab7
Merge branch '6372-ExpenseManual-Error' of https://gitea.verdnatura.es/verdnatura/salix into 6372-ExpenseManual-Error
13249fae08
refs #6372
6372-ExpenseManual-Error
f2b1418419
Merge branch 'dev' into 6372-ExpenseManual-Error
a0593804ab
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
4c7d7f2ab7
Merge pull request 'refs #6922 change order' (!2071) from 6922-invoiceOutOrder into dev
ae58c2219b
Merge branch 'dev' into test
8a2cff5308
Merge branch 'dev' into 6922-invoiceOutOrder
c348900c80
Merge branch 'dev' into 6372-ExpenseManual-Error
3132475d9a
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
03ebac78fc
ci: HOTFIX Jenkinsfile
e833a30eb9
Merge pull request 'refs #6372' (!2070) from 6372-ExpenseManual-Error into dev
6372-ExpenseManual-Error
d9119f9ab7
Merge branch '6372-ExpenseManual-Error' of https://gitea.verdnatura.es/verdnatura/salix into 6372-ExpenseManual-Error
13249fae08
refs #6372
e833a30eb9
Merge pull request 'refs #6372' (!2070) from 6372-ExpenseManual-Error into dev
f4f6eeb6fe
fix(version): refs #6372 add semicolon
d48fd77f48
refs #6372
0384f7d83d
Merge pull request 'refs #6372 DeleteTablesFromVn2008' (!2055) from 6372-Delete-views-from-vn2008 into dev
5110d6e71d
fix error refs #6372
e4d60d20c5
Merge branch 'dev' into 6372-Delete-views-from-vn2008
658c351860
Merge branch 'dev' into 6372-Delete-views-from-vn2008
29accbb23e
Merge branch 'dev' into 6372-Delete-views-from-vn2008