7299_testToMaster #2411

Merged

alexm merged 342 commits from 7299_testToMaster into master 2024-05-07 05:30:42 +00:00

Conversation 0 Commits 342 Files Changed 216 +2273 -1553

alexm commented 2024-05-06 12:29:57 +00:00

Member

Copy Link

No description provided.

alexm added 342 commits 2024-05-06 12:29:58 +00:00

42df711464 refs #6130

38ee64d8f1 refs #6131

a2f843f4e2 refs #6130

a0eb6d0399 feat(git): add commit lint refs#6130

597c5bd750 feat(git): add commit lint refs #6130

0a40b9e844 fix(claim): remove blank space refs #6130

9c896c835f refactor(printer-notification): refs #6005 refactor de la notificación

c00bbe070c Merge branch 'dev' into 6005-backupLabeler

1e4f778ef9 refactor(main-labeler): refs #6005 refactor de mainLabeler a backupPrinterFk

8dae2919e8 Merge branch 'dev' into 6005-backupLabeler

3788d160a6 Merge branch 'dev' into 6005-backupLabeler

570ce97cc3 Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

1b4ce1a0b5 feat(noSpam): refs #6005 check if exists a previous notification

a35a790155 remove(getVideo.spec.js): refs #6005 created task to review the spec

68dca67442 Merge branch 'dev' into 6005-backupLabeler

754150d17d feat(operator.spec): refs #6005 add spec for delay and fix spec for spam

b261e9987a Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

5714aeedce Merge branch 'dev' into 6005-backupLabeler

c929119797 fix(spec): refs #6005 backupLabeler spec

b713a32fe1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

17501a3c94 feat: refs #6005 mover sql a la ultima carpeta

d5fcfdfd79 fix(yml): refs #6005 backUpLabeler yml fix

d8cf059027 fix: refs #6005 add fixtures for a spec

a58dae6cbe Merge branch 'dev' into 6005-backupLabeler

f68529960e fix(notification): refs #6005 notification changes

4fbb7f05ec Merge branch 'dev' into 6005-backupLabeler

3f44eeb130 Merge branch 'dev' into 6005-backupLabeler

3e2cac5544 Merge branch 'dev' into 6005-backupLabeler

88739542fe move(version): refs #6005 move backupLabeler

c10a79493a Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

01512c7d36 feat: refs #6777 change dependecies vn2008 to vn

e89240a8c7 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

3500886149 feat: refs #6777 tabulacion

00d64b2a57 Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

c598e62d1e feat: refs #6777 change dependencies vn2008 to vn part7

714cd3c2c3 feat: refs #6777

0fc1caeae6 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

9ca00cf324 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

747dabd154 feat: refs #6777

be4403819d feat: refs #6777

ab7eb88913 merge(dev): refs #6005 merge dev

1c40e01fcb refactor: refs #6005 move the logic to the report

59336b8588 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

5e97f820a2 feat(spec): refs #6005 add spec

41d7f4d25e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

311401daba fix: refs #6777 ticketMRW

bf274cffc4 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

624c214178 fix: refs #6777 Fixed version

2215ac497d Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

9aad1dd6e8 feat: refs #6500 procRefactor8

e83b0622cf refs 6500 rateView

9c6db881b8 Merge branch 'dev' into 6500-procRefactor8

2f0c1612c2 feat: refs #6500 delete procedure

276acf04fa Merge branch '6500-procRefactor8' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8

5ee78a6b8c Merge branch 'dev' into 6500-procRefactor8

194947dc9a feat: refs #6500 procRefactor8

a44359762b feat(delay): refs #6005 add new restriction

45bcf8043f feat: permissions to vn.entry.isBooked refs#6724

2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

ae25ba3fb6 feat(notify): refs #6005 add restriction on created notification time

8529bed895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

8815f07850 feat(spec): refs #6005 add spec to backup Notify

421ca8654d fix(changes): refs #6005 remove changes files

35dab518c8 Merge branch 'dev' into 6005-backupLabeler

bce82881f3 Merge branch 'dev' into 6005-backupLabeler

052acdcc08 feat: refs #7029 packaging

1d434da539 Merge branch 'dev' into 6500-procRefactor8

e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler

4c6def5a52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked

562dd4034f feat: #7130 added "served" field to RouteList table(Salix).

e83d8b1464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked

3e1f8b5937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked

a62e189e47 feat: refs #6724 hook added

52457b9642 feat: sin concatenar en el nombre

d71f3e0818 test

642d280386 refs #6497:rdirect

c65ce5fb61 refs #6497:redirect

53015d1c67 refs #6497:redirect

11991ed5a1 refs #6497:redirect

5acef1fcc0 refs #6641 add button my team

1c6d913926 refs #6641 addFilterCollegues

84e6e7f7bf refs #6641 test fixtures

bd661befb6 feat: bloquear facturas recibidas contabilizadas refs #7173

d18721f50d feat: bloquear facturas recibidas contabilizadas refs #7173

4b4aaa9e10 feat: refs #6005 move logic from report to hook

9786c10e98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint

d9a3cc9591 commit

71a333786e commit

a30cc3b660 feat: commit

0004d1da23 test: commit

42e21eb602 feat(githook) add reference

021280c53c fix commit code

11dea43da2 fix:refs #6130 code

70bdb52371 fix: refs #6130 code

1e669e99f8 fix: refs #6130 code:code

29f952308f #code: refs #6130 code@

2084d047b2 fix: refs #6130 code

7acb4ee523 fix: refs #6130 code

5df285d469 feat: refs #6130 test commitLint

6a090eaef3 Merge branch 'dev' into 6130-commitLint

0dcd1518b9 feat: refs #6130 add commit

30db151da7 Merge branch '6130-commitLint' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint

f7170309d2 test: refs #6130 89 add commit

1728ed955b fix: refs #6130 code remove console.log

283d8b1241 feat: refs #4409 Disable old available triggers

2037b17f4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8

dddcacee7a feat: refs #6500

2d18f01a15 feat: refs #6500

d595a7b2fa feat: refs #6500

26c74a3e71 refs #6641 fix test

9da9478daf Merge branch 'dev' into 4409-binlog

45e4e07df0 Merge branch 'dev' into 6497_redirect_firewall

2c0c346a7b feat: refs #6500

1743f7501a Merge branch 'dev' into 6500-procRefactor8

638b715ee5 fix: refs #6005 move logic to hook

7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

c6ece4619f feat: refs #6500

b75af7b192 Merge branch 'dev' into 7161DeleteitemTrash

da037c5235 refactor: refs #6005 delay on productionConfig

aff73a179e remove: refs #6005 remove delay from notification model

90c26959af refs #7161 change longName to name

d151d57613 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

ac9732606c remove(focus): refs #6005 from spec

4a8adf4155 Merge branch 'dev' into 6005-backupLabeler

ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

2a972a03ea Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

df999864d4 Merge branch 'dev' into 6497_redirect_firewall

5602ed8835 Merge branch 'dev' into 6005-backupLabeler

c2a2a86f35 feat: refs #6777 ultima comprobacion

7d0f5cd78a Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

6717267613 refs ~6921 feat:addNoteFromDelivery

0956dbc7b1 refs #6921 feat: addFromDelivery

b46102653b refs #6921 feat: addFromDelivery

9c373d9ef3 refs #6921 feat: getTicketsObservations

0ef7082249 Merge branch 'dev' into 6921_addFromDelivery

7c550f1dbc Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

c581deef66 refactor: refs #6005 refactor spec

11bbb716d3 Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

7d925bac87 refs #6641 fix PR changes

0cf1ced747 remove focus

e2eff4df54 Merge branch 'dev' into 6500-procRefactor8

5044cd454d refactor: refs #7181 vn2008.Deleted risk_vs_client_list

7b3472aa0b refactor: refs #7181 Minor change

7ddc0b087e deploy: refs #7199 init version 2418

b1dc5efc8b refactor: refs #7181 Requested changes

c9b2bb5b5e Merge branch 'dev' into 7181-risk_vs_client_list

bff3aef73b recovering procs

9de4095260 moreProcs

0298f3235c Merge pull request 'recovering procs' (!2288) from 6021-floranet_lostProcs into dev ...

Reviewed-on: #2288
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

5285ff6557 Merge pull request 'moreProcs' (!2289) from 6021-floranet_moreLostProcs into dev ...

Reviewed-on: #2289

04c5a9a004 Merge branch 'dev' into 6500-procRefactor8

f69acf3a05 Merge branch 'dev' into 7181-risk_vs_client_list

ec481b4141 Merge branch 'test' into dev

726b1ddc07 Merge branch 'dev' into 6005-backupLabeler

d86bb6b004 Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev ...

Reviewed-on: #2283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

f545a57c9f feat: refs #6500

f0472b7ace Merge branch 'test' into dev

c0cabc894b refactor: refs #7181 Added grant

b5f3b5ebee Fix version

800fa36d04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8

adadf70f1e feat: refs #6500

e516f90a0b Merge branch 'test' into dev

3547299c70 Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev ...

Reviewed-on: #2276
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

0af4c6ee2b Merge branch 'dev' into 6497_redirect_firewall

6014db75ea Merge pull request '6497_redirect_firewall' (!2239) from 6497_redirect_firewall into dev ...

Reviewed-on: #2239
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

0d03cf76b4 fix(sql): refs #6005 fix fk formation

e43f7d9f28 Merge branch 'dev' into 6005-fixsql

f2fc9d09d5 Merge pull request 'fix(sql): refs #6005 fix fk formation' (!2294) from 6005-fixsql into dev ...

Reviewed-on: #2294
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

68f142e560 Merge branch 'dev' into 6130-commitLint

1a71be38a3 feat: test

fa1e679b48 feat: refs #12 peter

f30f907d8e feat: refs #6500 cambios solicitados

0db4cd7a12 feat: refs #6130 handle branch without task

8887550713 fix: refs #6130 test

4633079255 Merge branch '6130-commitLint' of https://gitea.verdnatura.es/verdnatura/salix into 6130-commitLint

5c4d2dda97 Merge pull request '6130-commitLint' (!1792) from 6130-commitLint into dev ...

Reviewed-on: #1792
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

85e6f30697 test: refs #null commit

bb52b1bae2 test: refs #null test

f0604bedd0 test: refs #null asd

827f152783 fix: husky

cc57fa72fd fix: remove logs

40473d0cc9 Merge pull request 'test: refs #null commit' (!2297) from testHusky_deleteme into dev ...

Reviewed-on: #2297
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

36b3a92ca3 Merge branch 'dev' into 6500-procRefactor8

253465cf13 refs #7190 feat: renewToken for multimedia

25b5c35dc6 refs #6835 fix: issue

6db0eba72c Merge branch 'dev' into 7190_renewTokenMultimedia

50d6c234be feat(binlog): refs #4409 New function for binlog queue monitoring

dc8a6d1274 Merge branch 'dev' into 6641-checkboxMyTeam

e0fca2cf6c Merge pull request 'refs #6641 add button my team' (!2254) from 6641-checkboxMyTeam into dev ...

Reviewed-on: #2254
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

ba9e1d9233 Merge branch 'dev' into 4409-binlogQueueFn

5414aaa1b4 fix(binlog): refs #4409 Fixtures for binlogQueue

31e27f1926 Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn

ba94bcdb19 Merge pull request 'feat(binlog): refs #4409 New function for binlog queue monitoring' (!2299) from 4409-binlogQueueFn into dev ...

Reviewed-on: #2299
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

a68b8431c5 feat: refs #6938 add scope & acls

133d45eecf Merge branch 'dev' into 4409-binlog

0219fa105e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone

200cbd8d74 fix: refs #6938 acls & scope

a41aa46c3a Merge branch 'dev' into 6500-procRefactor8

d7b06fe637 fix: refs #6938 scope

4cb79956a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery

78bd561122 Merge branch 'dev' into 6724-permisos-vn.entry.isBooked

5c524ecc7d rollback: refs #6724 entry.js

0f26fb46b6 feat: refs #6724 Grant changes

339c349ed0 feat: refs #6724 Added admon acl to vn-check

3e1218463c fix: refs #6938 filters & scope

3c9ac9634b fix: refs #6938 front tests

adb2249d2f fix: refs #6938 e2e tests

6e183b7426 refs #7161 change vAddress to vAddressShortage

5bb3dccd19 Merge branch 'dev' into 7161DeleteitemTrash

0c24e67af1 Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn

f0b0f3cee7 Merge branch 'dev' into 7190_renewTokenMultimedia

d24de61213 refs #6921 feat: addFromDelivery

22006ea3fb Merge pull request '#6938 add scope & acls' (!2301) from 6938-hideWorkerPhone into dev ...

Reviewed-on: #2301
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

93abfdd8a1 feat: refs #7173 Added restrictions in invoiceIn structure

91d5f51e73 Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn

d88957d157 Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn

45fac06c6b feat: refs #7173 Added restrictions in invoiceIn structure

4678c0567b Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn

ffd7b3cf50 Merge branch 'dev' into 6500-procRefactor8

7a557be09a feat: refs #6968 Changed groupingMode to enum

56dc0ddb68 Merge branch 'test' into dev

3a7b0df36f Merge branch 'dev' into 7161DeleteitemTrash

aed875743a Merge pull request '7161DeleteitemTrash' (!2273) from 7161DeleteitemTrash into dev ...

Reviewed-on: #2273
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

b39033171e Merge branch 'dev' into 7190_renewTokenMultimedia

b8b70a3de0 Merge pull request '#7190 - Renew tokenMultimedia' (!2272) from 7190_renewTokenMultimedia into dev ...

Reviewed-on: #2272
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f5fd708891 item_get

e4c3704231 Merge branch 'test' into dev

f05b33787f feat: refs #6021 order_put refactor

c1c6204eab Merge branch 'dev' into 6021-fix-orderPut

12f7cc85ed Merge branch 'dev' into 6021-floranet_item_get

145aeb5834 Merge pull request 'item_get' (!2309) from 6021-floranet_item_get into dev ...

Reviewed-on: #2309
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

70836b93b6 fix: refs #6021 catalogue_findById

1d29c77aa7 feat: refs #6021 fix proc

dac562e960 Merge pull request 'feat: refs #6021 order_put refactor' (!2311) from 6021-fix-orderPut into dev ...

Reviewed-on: #2311
Reviewed-by: Pako Natek <pako@verdnatura.es>

2b39d3fa15 Merge branch 'dev' into 6021-fix-item_get

70c9bae710 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get

e15fb8dec6 fix: refs #6021 proc

31b23f4667 Merge branch '6021-fix-item_get' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get

886bd7f105 Merge pull request 'fix: refs #6021 catalogue_findById' (!2312) from 6021-fix-item_get into dev ...

Reviewed-on: #2312
Reviewed-by: Pako Natek <pako@verdnatura.es>

c8e7706652 feat: refs #6968 Requested changes

d92d373db4 Merge branch 'dev' into 6968-groupingModeRefactor

36bf770ed4 Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ...

Reviewed-on: #2258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

bc2b6ff97e feat: refs #7173 Added traduction

ae88a8a281 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery

f1bb2fbcb3 Merge branch 'test' into dev

9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ...

Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

6214da2c42 feat(salix): refs #6930 Undo rollback salix-back

d5cb52cb64 feat(salix): refs #6930 Undo rollback salix-front

cffc1964b6 feat: refs #6968 Transactioned and isTriggerDisabled

ae2468da0e Merge branch 'dev' into 6930_undo_rollback

799427b388 Merge pull request '#6930 - Revert/Undo rollback' (!2313) from 6930_undo_rollback into dev ...

Reviewed-on: #2313
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

8ca278b5a9 feat: refs #6500 cambios solicitados

3e5b6a9ad1 Merge branch 'dev' into 6500-procRefactor8

998466f6eb Merge pull request 'test' (!2316) from test into dev ...

Reviewed-on: #2316
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

e769081a74 feat: refs #6500

ae326e6e2e feat(binlog): refs #4409 Old recalc code removed ...

Queues: orderTotal, ticketTotal and travelEntries

7cda14c424 Merge branch 'dev' into 4409-binlog

a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery

edc6e4a5e3 Merge branch 'dev' into 6500-procRefactor8

c62ec8798b Merge pull request 'feat: refs #6500 procRefactor8' (!2131) from 6500-procRefactor8 into dev ...

Reviewed-on: #2131
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

32e2827287 refs #6921 feat: addFromDelivery

3f291da02c refs #6921 feat: addFromDelivery

eee7062e3f Merge pull request 'test' (!2319) from test into dev ...

Reviewed-on: #2319
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

76fb9bf7a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery

d42aab346f refactor: refs #7139 replace warehouse with ticket

9143447eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

e909d64757 refs #6921 feat: addFromDelivery

958759dc80 Merge branch 'dev' into 6921_addFromDelivery

f7a6d47c04 Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev ...

Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev ...

Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

279c300fbf Merge branch 'dev' into 6921_addFromDelivery

8f9adbb37c Merge branch 'test' into dev

4f7d315719 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

bb8379f8db refactor: refs #6724 Minor change

08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev ...

Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery

c375223ae5 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

067e71e3ce feat: refs #6777 puppeteer

44f36e640b Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

5b5ec11973 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

cc6ad39398 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

322d91d814 feat(salix): refs #6930 Add DEFAULT scope

30d0db163e feat(salix): refs #6930 minor updates

b4503afc47 Merge branch 'dev' into 6930_scope_Default_Multimedia

fb17a54ebd feat: refs #6777 resotre view

d32ba92df0 Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7

e601310d3e feat: refs #6777 restore view

5b027a88fa feat: refs #6777 restore view

ad317cb5e5 refs #7021 Delete rfid schema

a0126748e2 fix(binlog): refs #4409 Fix fixtures cursor name

e7f81e99bc Merge branch 'test' into dev

0615510a9c refs #7021 Modify myt.config.yml

0005d3329d Merge branch 'dev' into 6930_scope_Default_Multimedia

e09b828d88 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

283d27e1c5 Actualizar modules/worker/back/models/worker.json

bc45cafb40 Merge branch 'dev' into 4409-binlog

f6199f8f8e Actualizar modules/worker/back/models/worker.json

739ae82ace fix(binlog): refs #4409 Fix cursor name

6a0a944319 Merge branch 'dev' into 7029-packagingVolumeRestriction

0a5100135f Merge pull request '#6930 - Add DEFAULT scope when is Multimedia scope' (!2333) from 6930_scope_Default_Multimedia into dev ...

Reviewed-on: #2333
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

23fa74a5ad Merge branch 'dev' into 6921_addFromDelivery

7be856118e Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

b88dff0d99 feat: refs #6777

c109f3616e Merge pull request 'master' (!2343) from master into test ...

Reviewed-on: #2343
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

b0289d2e18 Merge pull request 'test' (!2344) from test into dev ...

Reviewed-on: #2344
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

6bb36e0d82 Merge branch 'dev' into 7029-packagingVolumeRestriction

2e1cb6e827 Merge pull request 'feat: refs #7029 packaging' (!2164) from 7029-packagingVolumeRestriction into dev ...

Reviewed-on: #2164
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

debd163b3f Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7

88b71245a5 Merge pull request 'feat: refs #6777 change dependecies vn2008 to vn' (!2000) from 6777-changeDependenciesVn2008toVnPart7 into dev ...

Reviewed-on: #2000
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

0f05fe5d93 Merge branch 'dev' into 6921_addFromDelivery

ccc9251d39 Merge pull request '6921_addFromDelivery' (!2304) from 6921_addFromDelivery into dev ...

Reviewed-on: #2304
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

1ef98ecd8c Merge branch 'dev' into 7021-Delete_rfid_schema

eb9f81c81d feat #7181 Rollback creditInsurance_getRisk

f380e0d1ce Merge branch 'dev' into 7021-Delete_rfid_schema

6a3224dfcd Merge pull request 'refs #7021 Delete rfid schema' (!2340) from 7021-Delete_rfid_schema into dev ...

Reviewed-on: #2340
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

d58607f26e Merge branch 'dev' into 4409-binlog

91608b9053 Merge pull request 'refs #4409 Remove old recalc code' (!2300) from 4409-binlog into dev ...

Reviewed-on: #2300
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

902be9e788 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

e52322f649 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

85491613b0 test: refs #7173 fix fixtures

60d5b9e4aa test: refs #7173 fix sql, adding alias

06e743f5da fix: refs #7253 check booked add new restriction to be tested

fbf1b6e1af Merge pull request '7253-devToTest_2418' (!2350) from 7253-devToTest_2418 into test ...

Reviewed-on: #2350
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

36c8a8db0f Merge branch 'master' into test

f5844ff426 Merge branch 'master' into test

a7f1188975 Merge pull request 'master' (!2358) from master into test ...

Reviewed-on: #2358
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

326c5c97bd Hotfix test farmingDeliveryNote

f25d3c14c6 Hotfix test farmingDeliveryNote

e07655bcf3 Merge pull request 'Hotfix test farmingDeliveryNote' (!2372) from HotFix-test-farmingDeliveryNote into test ...

Reviewed-on: #2372
Reviewed-by: Ivan Mas <ivanm@verdnatura.es>

3440bb1725 hotFix

97142bf976 Merge pull request 'hotFix' (!2379) from hotFix-GET_LOCK-TEST into test ...

Reviewed-on: #2379
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

c987bb6e66 Merge branch 'master' into test

7eb2e8f218 Merge branch 'master' into test

8b11a4a290 fix: refs #6005 time issue

f5352c03a9 Merge pull request 'fix: refs #6005 time issue' (!2399) from 6005-fix-time-error into test ...

Reviewed-on: #2399
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

48bfba71de fix: refs #6005 runtime

0dfb7f2825 Merge branch 'test' into 6005-fix-runtime-error

6152820078 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error

3ae192c761 fix: refs #6005 fix test

bc366c950d Merge branch '6005-fix-runtime-error' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error

52c9015fca Merge pull request 'fix: refs #6005 runtime' (!2401) from 6005-fix-runtime-error into test ...

Reviewed-on: #2401
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

14a1c5cbbb Merge pull request 'master' (!2408) from master into test ...

Reviewed-on: #2408
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

alexm added the

CR / Tests passed

label 2024-05-06 12:43:56 +00:00

alexm requested review from guillermo 2024-05-07 05:26:23 +00:00

guillermo approved these changes 2024-05-07 05:27:11 +00:00

alexm merged commit 878ee9e303 into master 2024-05-07 05:30:42 +00:00

alexm deleted branch 7299_testToMaster 2024-05-07 05:30:42 +00:00

alexm referenced this issue from a commit 2024-05-07 05:30:44 +00:00

Merge pull request '7299_testToMaster' (!2411) from 7299_testToMaster into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#2411

No description provided.