8267-devToTest #3270

Merged

alexm merged 131 commits from 8267-devToTest into test 2024-12-03 12:18:21 +00:00

Conversation 0 Commits 131 Files Changed 87 +626 -676

alexm commented 2024-12-03 07:37:44 +00:00

Member

Copy Link

No description provided.

alexm added 130 commits 2024-12-03 07:37:45 +00:00

1a01b3e587 refs #7529 back models acls

c0ee82fd4f Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

5da6c09f68 fix: refs #7529 workerPit

355ce46393 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

60375d153f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

0a726a8fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

903d85a243 fix: refs #7529 fix back

fa9451ea38 feat: refs #7821 isBooked with grants

248ae64872 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

a432133c18 Merge branch 'dev' into 7821-entryIsBooked

55a409c680 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

6b10f60933 fix: refs #7529 mod model

ca6d8a67cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

cd3dd854ef feat: refs #7821 eslint newDate

e0e487859f fix: refs #7529 fix models

c5afde3334 Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

fa108e2af0 fix: refs #7529 fix sql

73efb8f1a8 Merge branch 'dev' into 7529-workerPIT

25891e0bad feat: refs #6924 notify absences only to department boss

1e8a7eff60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss

bb7cecdcff Merge branch 'dev' into 6924-NotifyOnlyToBoss

cf102699d5 feat: refs#8087 Redadas en travel

ea45d1da0a Merge branch 'dev' into 7821-entryIsBooked

69d6e4a104 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel

358ed2513d feat: refs#8087 Redadas en travel

b8f2e0b906 feat: refs#8087 Redadas en travel

20bd426704 refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig

870882cdc1 Merge branch 'dev' into 7690-renameConfigTables

0f913d8975 Merge branch 'dev' into 6924-NotifyOnlyToBoss

ea4adbea85 refactor: refs #6924 deleted department check

dcae6dfbb4 Merge branch '6924-NotifyOnlyToBoss' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss

477fb7ded9 feat: refs #8149 Group by CuentaIvaRepercutido

7be1bc385f perf: refs #6924 deleted useless relation

66149a69a7 Merge branch 'dev' into 6924-NotifyOnlyToBoss

6a11416838 refactor: refs #7690 copy acls and remove worker-time-control-params.json

2a1c0ef2af Merge branch 'dev' into 7690-renameConfigTables

72415a4348 Merge branch 'dev' into 7821-entryIsBooked

2790e92741 fix: refs #7529 fix acl

6b0d7762b4 Merge branch '7529-workerPIT' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

a40a5a22ab fix: refs #7821 fixtures without raid

2f93da199a feat: refs #8138 reduce credit on risk

a3f92a284f Merge branch 'dev' into 8138-feat-reduce-credit-on-risk

6a65ab42ce build: change package version

43e121a2f3 refactor: refs #8210 ticket_splitItemPackingType

a7ab8696ac refactor: refs #8210 ticket_splitItemPackingType

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

6a43d3c752 feat: refs#8087 Redadas en travel

f145649fc7 fix: refs #6924 requested change

149524f4fd Merge branch '6924-NotifyOnlyToBoss' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss

492c79de46 Merge branch 'dev' into 6924-NotifyOnlyToBoss

953bc84a58 feat: refs#8087 Redadas en travel

63c0747304 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel

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

a9d45bde4c refactor: refs #7690 modify printQueue_check and rename tables

715cea0670 Merge branch 'dev' into 7690-renameConfigTables

43abb52efc refactor: refs #8210 ticket_splitItemPackingType

ad345a0b91 Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev ...

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

5e52b3b596 Merge branch 'dev' into 8138-feat-reduce-credit-on-risk

42a27f3407 Merge branch 'test' into dev

cde3c8c50a Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev ...

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

df249b05d3 fix: refs #7529 fix acl

7ab1b7d171 Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT

d46683cd31 Merge pull request 'refs #7529 back models acls' (!2563) from 7529-workerPIT into dev ...

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

bbb7815765 fix: refs #7229 set right urls

16111220fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile

69bdf8efb2 Merge branch 'test' into dev

82f4815282 fix: refs #7529 fix acls

830573e229 refactor: refs #7690 remove modifications printQueue_check.sql

0274c01c14 Merge branch 'dev' into 7690-renameConfigTables

940bc8caed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile

e125dee691 refactor: refs #7229 desestructure

031c4398ae refactor: refs #8210 ticket_splitItemPackingType

2098ea7163 Merge branch 'dev' into 7529-worerPitFix

f5b16ca36d Merge pull request 'fix: refs #7529 fix acls' (!3228) from 7529-worerPitFix into dev ...

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

0ac46882be Merge branch 'dev' into 6924-NotifyOnlyToBoss

9cd16981e6 Merge pull request '#6924 Notify absences only to department boss' (!3175) from 6924-NotifyOnlyToBoss into dev ...

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

b3ce3a0cc2 feat: refs #7821 with test

b2fa7e7caf Merge branch 'dev' into 7690-renameConfigTables

fee9bbe387 Merge pull request 'refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig' (!3191) from 7690-renameConfigTables into dev ...

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

762d4b9955 Merge branch 'dev' into 8210-RefactorTicket_splitItemPackingType

510fffb61a Merge branch 'dev' into 7821-entryIsBooked

80851e094d Merge branch 'dev' into 7821-entryIsBooked

dbf71b981e Merge pull request 'refactor: refs #8210 ticket_splitItemPackingType' (!3217) from 8210-RefactorTicket_splitItemPackingType into dev ...

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

770ace0f8e Merge branch 'test' into dev

0ecbef0c9f Merge branch 'dev' into 7821-entryIsBooked

53673f43b8 Merge branch 'dev' into 7821-entryIsBooked

41b3f34158 fix: refs #7821 alias

78d3d01649 Merge pull request 'feat: refs #7821 isBooked with grants' (!3150) from 7821-entryIsBooked into dev ...

Reviewed-on: #3150
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

46c85d44d6 Merge branch 'test' into dev

b97058735c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile

470d9bde64 Merge pull request 'fix: refs #7229 set right urls' (!3226) from 7229-fixDownloadFile into dev ...

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

c440472693 Merge branch 'dev' into 8149-ivaXDiario

00412e3258 refactor: refs #7899 delete unused states

4ab2d7fd09 feat: refs #8149 Group by CuentaIvaRepercutido

1c6f59a0ec Merge branch '8149-ivaXDiario' of https://gitea.verdnatura.es/verdnatura/salix into 8149-ivaXDiario

771aeaa9bd Merge pull request 'test' (!3237) from test into dev ...

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

65ca1b5af3 Merge pull request 'feat: refs #8149 Group by CuentaIvaRepercutido' (!3201) from 8149-ivaXDiario into dev ...

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

ca1ccff10b fix: refs #7229 update env col for consistency

9da5b4ecda fix: refs #7229 update default environment

a68d7e8c0b fix: refs #7229 rollback

584287b211 fix: refs #7229 update default environment

e2d827d937 Merge pull request 'fix: refs #7229 update env col for consistency' (!3240) from 7229-fixEnvironment into dev ...

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

c14484366e Merge branch 'test' into dev

f32d709b9d Merge branch 'dev' into 7899-deleteUnusedStates

f2b74794de Merge pull request 'refactor: refs #7899 delete unused states' (!3238) from 7899-deleteUnusedStates into dev ...

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

f8a79057b2 fix: refs #7899 Version

10fe53b7f2 refactor: refs #8204 Deprecated itemShelvingLog

89d941c115 refactor: refs #8235 Deleted deprecated objects

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

05671be60e Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev ...

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

60a90bb090 fix: add IF NOT EXISTS to isRaid column in travel table

3aaf5be48d Merge pull request 'fix: add IF NOT EXISTS to isRaid column in travel table' (!3253) from fix into dev ...

Reviewed-on: #3253
Reviewed-by: Jon Elias <jon@verdnatura.es>

e62553630c Merge branch 'test' into dev

c3aeba16c1 Merge branch 'test' into dev

15c755087c fix: refs #8221 duaInvoiceIn unique

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

71bc1adcba Merge branch 'test' into dev

699c6553a0 Merge branch 'test' into dev

6d315bf84d refactor: refs #7146 route.created to route.dated

df51b93e5b Merge branch 'dev' into 7146-route.createdToDated

97cdadac78 Merge pull request 'fix: refs #8221 duaInvoiceIn unique' (!3256) from 8221-duaInvoiceInUnique into dev ...

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

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

3453aa0f8c Merge branch 'test' into dev

10fd00df80 Merge branch 'test' into dev

bf0daf90db Merge branch 'dev' into 7146-route.createdToDated

947812e9f1 Merge branch 'test' into dev

1b2987494a Merge branch 'dev' into 7146-route.createdToDated

c1c42de13a Merge pull request 'refactor: refs #7146 route.created to route.dated' (!3260) from 7146-route.createdToDated into dev ...

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

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

14892042bd chore: refs #8267 pullinfo

alexm added 1 commit 2024-12-03 12:11:57 +00:00

fb13a9ff38 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest

carlossa approved these changes 2024-12-03 12:13:30 +00:00

alexm merged commit 87136f1aba into test 2024-12-03 12:18:21 +00:00

alexm deleted branch 8267-devToTest 2024-12-03 12:18:21 +00:00

alexm referenced this issue from a commit 2024-12-03 12:18:22 +00:00

Merge pull request '8267-devToTest' (!3270) from 8267-devToTest into test

Sign in to join this conversation.

Reviewers

No reviewers

carlossa

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#3270

No description provided.