55fced363e
Merge branch 'master' into 8169-itemTextureTag
3158644032
fix: refs #7994 commented alter
732dd02a19
Merge pull request '8179-testToMaster' (!3176) from 8179-testToMaster into master
ffe947c73d
Merge pull request 'fix: refs #7404 remove volume from ticket sold on holland' (!3169) from 7404-fix-remove-tickets-volume into test
3d3bc0dbaa
Merge branch 'test' into 7404-fix-remove-tickets-volume
robert
pushed to 7709-supplierPackaging_ReportSource_2 at verdnatura/salix
2024-11-12 06:30:21 +00:00
3f9a48f462
Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2
180b0b5b3f
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
c8d9cfd623
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
eaad989b3a
fix: clean deletes also zoneEvent range records
a79905f7c2
Merge pull request 'feat(Supplier): refs #6828 add companySize' (!3174) from 6828-supplier_companySize into dev
robert
pushed to 7709-supplierPackaging_ReportSource_2 at verdnatura/salix
2024-11-11 07:02:39 +00:00
46e31b2658
Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2
a254cb19cd
feat: refs #4948 Added ticket_selfConsumptionPackaging
dd7c967624
Merge branch 'test' into dev
d95e455ccf
fix: refs #7935 sin modificar autonomy
cab2b7c93c
Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev
143728c995
Merge branch 'dev' into 8077-sumDefaulterFront
c22c8d9f11
Merge pull request 'Improve required attrs for VnInput*' (!886) from improve_isRequired_input into dev
ead326c66b
Merge branch 'improve_isRequired_input' of https://gitea.verdnatura.es/verdnatura/salix-front into improve_isRequired_input
dce57f4638
Merge branch 'dev' into improve_isRequired_input
0c6d6d6925
Merge pull request 'refs: #7782 Cypress features' (!891) from cypress_features into dev
d9575190ee
Merge branch 'dev' into 6822-entryTransfer
dd7c967624
Merge branch 'test' into dev
d95e455ccf
fix: refs #7935 sin modificar autonomy
cab2b7c93c
Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev
3b87cf0c69
Merge pull request 'feat: refs #7266 buyFkForPrint' (!3159) from 7266-ItemShelvingBuy into dev
8525219154
Merge branch 'dev' into 8001-expeditionGrafana
42fbdff5bd
test: fix e2e
9765d2b633
Merge branch 'dev' into 8077-sumDefaulter
5a9d254396
Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev
f699f64caa
Merge branch 'dev' into 8071-travelWeeklyClone
6bf186ca66
Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev
a8cc417fb4
Merge branch 'dev' into 7922-scanOrder
4e71fb97c3
Merge branch 'dev' into 6822-entryTransfer
5a9d254396
Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev
f699f64caa
Merge branch 'dev' into 8071-travelWeeklyClone
6bf186ca66
Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev
a8cc417fb4
Merge branch 'dev' into 7922-scanOrder
6878a79c44
Merge branch 'dev' into 8001-expeditionGrafana
df7f9b47d3
Merge pull request 'refactor: refs #7266 Changed method name' (!884) from 7266-buyLabelSupplier into dev
b8ecf40777
Merge branch 'dev' into 7266-buyLabelSupplier
458c6b0f42
Merge pull request 'feat: refs #7524 add front test' (!881) from 7524-addTests into dev
fecf9fddff
Merge branch 'dev' into 7524-addTests
5a9d254396
Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev
f699f64caa
Merge branch 'dev' into 8071-travelWeeklyClone
8ab6bc39cc
Merge branch 'dev' into 8071-travelWeeklyClone
f05b6a46b0
feat: refs #8071 quitar esquema
994b562823
Merge branch 'dev' into 8071-travelWeeklyClone
feat: refs #8071 travel_weeklyClone
f699f64caa
Merge branch 'dev' into 8071-travelWeeklyClone
6bf186ca66
Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev
a8cc417fb4
Merge branch 'dev' into 7922-scanOrder
11e13fdb20
feat: refs #7922 refs #792 scanOrder
8ab6bc39cc
Merge branch 'dev' into 8071-travelWeeklyClone
2f0fa56040
feat: refs #7266 Version
6afb8fbeb5
Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev
66a5708efb
Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev
bfc446ab79
feat: refs #7266 Requested changes and improvements
994b562823
Merge branch 'dev' into 8071-travelWeeklyClone
b41e703a1b
Merge pull request 'fix: refs #7283 item filters' (!3156) from 7283-fixItemFilters into dev
385279b39d
fix: refs #7283 tback
0180998683
fix: refs #7283 item filters
21ddd3fcd0
Merge pull request '#7193 Added scope in parking model' (!3153) from 7193-ParkingCreateScope into dev
feat: refs #8169 create table itemTextureTag