04c5a9a004
Merge branch 'dev' into 6500-procRefactor8
5285ff6557
Merge pull request 'moreProcs' (!2289) from 6021-floranet_moreLostProcs into dev
0298f3235c
Merge pull request 'recovering procs' (!2288) from 6021-floranet_lostProcs into dev
9de4095260
moreProcs
bff3aef73b
recovering procs
f59ecbf94e
Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon
7f2d8ee1e5
feat: refs #6679 add icon
e2eff4df54
Merge branch 'dev' into 6500-procRefactor8
bd026af917
Merge pull request 'refs #6732 change name supplier.isSerious to supplier.isReal' (!2063) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev
85301b84bc
Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
0f5afc908c
Merge pull request '#6492 refactor vn2008 procedures' (!2159) from 6492-refactorProceduresVn2008 into dev
099fb70582
Merge branch 'dev' into 6492-refactorProceduresVn2008
a350de9119
Merge branch 'dev' into 6679-addCreateIcon
81d0e397f0
Merge pull request '#7186 - tabIndexVATExpenses' (!277) from 7186-tabIndexVATExpenses into dev
e3e6c74afa
Merge branch 'dev' into 7186-tabIndexVATExpenses
09ceefb7c5
style: refs #7186 fixed style
a153146f82
Merge pull request '#6992 add URL params' (!273) from 6992-addQueryParamsUrl into dev
robert
pushed to 6777-changeDependenciesVn2008toVnPart7 at verdnatura/salix
2024-04-10 11:06:34 +00:00
7c550f1dbc
Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
0f5afc908c
Merge pull request '#6492 refactor vn2008 procedures' (!2159) from 6492-refactorProceduresVn2008 into dev
099fb70582
Merge branch 'dev' into 6492-refactorProceduresVn2008
a3c1bceb7e
refactor: refs #6492 use enum
dca75437f1
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
robert
pushed to 6777-changeDependenciesVn2008toVnPart7 at verdnatura/salix
2024-04-10 07:44:04 +00:00
7d0f5cd78a
Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
acd422d48f
Merge pull request 'feat: refs #7150' (!2224) from 7150-greuge_dif_porte_add into dev
2c91385e62
Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add
c30c0de92c
feat: refs #7150
3420667ae5
Merge branch 'dev' into 7150-greuge_dif_porte_add
robert
pushed to 6777-changeDependenciesVn2008toVnPart7 at verdnatura/salix
2024-04-10 07:42:29 +00:00
c2a2a86f35
feat: refs #6777 ultima comprobacion
acd422d48f
Merge pull request 'feat: refs #7150' (!2224) from 7150-greuge_dif_porte_add into dev
2c91385e62
Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add
c30c0de92c
feat: refs #7150
3420667ae5
Merge branch 'dev' into 7150-greuge_dif_porte_add
4a31fe29b8
Merge branch 'dev' into 7150-greuge_dif_porte_add
2c91385e62
Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add
c30c0de92c
feat: refs #7150
3420667ae5
Merge branch 'dev' into 7150-greuge_dif_porte_add
0e2e68488d
Merge branch 'test' into dev
43111f8192
Merge branch 'master' into test
743dc2144e
hotfix: refs #6276 Fix send chat msg getSales
c69a4e1c98
Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
robert
pushed to 6777-changeDependenciesVn2008toVnPart7 at verdnatura/salix
2024-04-09 12:25:30 +00:00
d151d57613
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7
0e2e68488d
Merge branch 'test' into dev
43111f8192
Merge branch 'master' into test
743dc2144e
hotfix: refs #6276 Fix send chat msg getSales
c69a4e1c98
Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
WIP: feat: refs #6679 add icon