3f82205206
Merge branch 'dev' into 7709-supplierPackaging_ReportSource
48e4c68561
Merge pull request '#7874 clientObservationType' (!2960) from 7874-createObservationType into dev
0549e22720
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
d02e942dd2
Merge pull request 'feat: refs #7323 show right error' (!3096) from 7323-showRightError into dev
cedb1b570d
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-showRightError
46a089cf8e
Merge branch 'dev' into 7709-supplierPackaging_ReportSource
d8e0c1debe
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
9a7aa315e5
Merge pull request 'feat: refs #7207 show queue in worker summary' (!3007) from 7207-showPbx into dev
f5a43962fd
Merge branch 'dev' into 7207-showPbx
209e65180e
Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3089) from 8075-test-itemShelvingMoving into test
feat: refs #8064 itemTagState
8f7fe4dc12
Merge pull request 'feat: refs #8064 itemTagState' (!3043) from 8064-itemTagState into master
7a6f1eae94
Merge branch 'master' into 8064-itemTagState
d1c08e68d3
Merge branch 'master' into 8064-itemTagState
79adce30b6
Merge branch 'master' into 8064-itemTagState
0a0b2f9ba0
Merge branch 'master' into 8064-itemTagState
7a6f1eae94
Merge branch 'master' into 8064-itemTagState
9a27498bc5
Merge pull request 'build: refs #8062 dump db' (!3062) from 8062-dump into master
34c4715f6e
build: refs #8062 dump db and import ticketCanAdvanceConfig
e870d16cb9
build: refs #8062 dump db
d1c08e68d3
Merge branch 'master' into 8064-itemTagState
fe10f03459
Merge pull request '8062-testToMaster_2' (!3059) from 8062-testToMaster_2 into master
e51dd897c3
Merge pull request 'master' (!3055) from master into test
6c31c85d72
Merge pull request '8030-testPriceDelta' (!3048) from 8030-testPriceDelta into test
d87f940fff
Merge branch 'test' into 8030-testPriceDelta
feat: refs #8071 travel_weeklyClone
47ed9a8f4e
Merge pull request 'test' (!3056) from test into dev
e51dd897c3
Merge pull request 'master' (!3055) from master into test
617c44a178
Merge pull request '#8012 -packagingIsActive' (!3049) from 8012-packagingIsActive into master
c3c386046d
Merge branch 'master' into 8012-packagingIsActive
4ad070ab66
feat: refs #8012 cubos
e51dd897c3
Merge pull request 'master' (!3055) from master into test
617c44a178
Merge pull request '#8012 -packagingIsActive' (!3049) from 8012-packagingIsActive into master
c3c386046d
Merge branch 'master' into 8012-packagingIsActive
4ad070ab66
feat: refs #8012 cubos
34f1a43f1e
Merge pull request 'feat: refs #8030 new field vn.priceDelta.zoneGeoFk' (!3050) from 8030-master-HotFix-PriceDelta into master