d16f4f3154
Merge branch 'dev' into 8001-expeditionGrafana
0537213a58
Merge pull request 'feat: refs #7006 itemTypeLog added' (!825) from 7006-itemTypeLog into dev
d14f2bd638
Merge branch 'dev' into 7006-itemTypeLog
494fc66c06
feat: refs #7006 itemType basic data new inputs
8edba36a74
feat: refs #7006 itemType basic data new inputs
d86eaf5471
Merge branch 'dev' into 6822-entryTransfer
8569bec34a
feat: refs #7266 Minor change
f6d818f58e
Merge pull request 'feat: refs #7266 First commit' (!3129) from 7266-itemLabels into dev
f97f1c2b9a
Merge branch 'dev' into 7266-itemLabels
7ae99fe6a1
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
robert
pushed to 7709-supplierPackaging_ReportSource_2 at verdnatura/salix
2024-10-25 05:08:23 +00:00
b51823f36e
Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2
8569bec34a
feat: refs #7266 Minor change
f6d818f58e
Merge pull request 'feat: refs #7266 First commit' (!3129) from 7266-itemLabels into dev
f97f1c2b9a
Merge branch 'dev' into 7266-itemLabels
7ae99fe6a1
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
feat: refs #8001 ticketExpeditionGrafana
b31010aa2b
Merge branch 'dev' into 8077-sumDefaulterFront
32b4636706
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
f26976b744
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
a0a37a68a0
Merge pull request '#8083 hotfix-insertRecord' (!859) from 8083-hotfix-insertRecord into master
1bfede4a55
fix: refs #8083 drop useless code
80f540a346
Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulter
7ae99fe6a1
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
4660118211
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
ed6a062ca3
Merge pull request 'feat: refs #8083 add field' (!3143) from 8083-hotfix-insertRecord into master
43f8b22593
feat: refs #8083 add field
46e8f23354
Merge branch 'dev' into 8077-sumDefaulterFront
d1e4017869
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
5d4b5ad598
Merge pull request 'fix: refs #8010 footer class' (!857) from 8010-fix_vnTable_footer_class into test
0528474250
chore: refs #8010 kebab-case
e7acdfd4f7
fix: refs #8010 footer class
1a5e473656
Merge branch 'dev' into 7731-clientViesCode
56cba385cf
Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev
aad616ff83
Merge branch 'dev' into 6850-removeChandgeUpdateClaim
f8c83c8f68
Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev
c3ffb31348
Merge branch 'dev' into 6831-observationDefaulterEmail
1def362a8f
Merge branch 'dev' into 7731-clientViesCode
5d55fb287d
Merge branch 'test' into dev
dead904c19
Merge branch 'master' into test
ca81c2c440
Merge pull request 'fix: refs #230926 item_getSimilar' (!3133) from 230926-hotfix into master
bbc17d1ff8
fix: refs #230926 item_getSimilar
6b99039e68
Merge branch '7731-clientViesCode' of https://gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode
6d0e99faa3
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode
6e164cda14
Merge branch 'dev' into 7731-clientViesCode
55f8b78eba
Merge pull request 'fix: refs #7353 load on scroll end' (!841) from 7353-fixLoadOnScroll into dev
2aaba93c3c
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll
0c2d9e6ec6
fix: refs #7353 load on scroll end 80% zoom
5c5393db6d
Merge pull request '#7010 added packing type field' (!762) from 7010-AddPackingField into dev