8144-devToTest_2444 #3137

Merged

alexm merged 90 commits from 8144-devToTest_2444 into test 2024-10-22 06:07:15 +00:00

Conversation 0 Commits 90 Files Changed 43 +529 -293

alexm commented 2024-10-22 05:42:40 +00:00

Member

Copy Link

No description provided.

alexm added 90 commits 2024-10-22 05:42:41 +00:00

4ebda1a06f feat: refs #7010 added filter fields to show packing type field in ticket list

b547858820 perf: refs #7010 showing field correctly

b55db4bdc0 feat: refs #7010 added subquery to avoid using group by in sql

cbc8cc6210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField

b4dc5276dd fix: refs #7986 create fk

39e808bca7 fix: refs #7986 fix model

770c604d6b chore: refs #7919 delete if ticketRefund

4ee6a46bd5 feat: added new filter param

07849ebeb8 fix: myTeam param

68469e2ba8 Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto

32756dabae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund

ccf9dbde8e feat: refs #7919 test

a35208d903 feat: refs #7919 test

6d4c71d465 feat: refs #7919 test

f2d1aa5f16 feat: refs #8098 closureDaysAgo

5e2edad6de Merge branch 'dev' into 8098-closureTransation

4526873bbe feat: refs #8098 without Date

976e50b566 feat: refs #8098 identation

c5f987d04c fix: refs #8098 renew token test fixed

e334152acc refactor: deleted comment

36bf2f89c7 Merge pull request '8098-closureTransation' (!3101) from 8098-closureTransation into dev ...

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

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

85f8b6fd20 build: init version 24.44

c73fd51a9c fix: refs #7986 add acl

5a2058865d Merge branch 'test' into dev

099fe8f950 fix: refs #7986 fix model

4a88ba5078 feat: refs #7744 closeAll Test

6f8a005726 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund

d57f4fc44a chore: refs #7919 refactor, drop relation on back

46e657675b fix: refs #7906 remake method

c6e764b478 feat: refs #7348 hasDailyInvoice from client

aac4dd0a6d feat: refs #7348 minor bug

f78aad0874 Merge branch 'dev' into 7744-closeAllTest

8ca097d4a9 chore: refs #7919 change var name

c5aa7dc44e fix: refs #7906 edit test

8f01e4d110 fix: refs #7353 redirect to lilium

cb7575d821 Merge pull request 'fix: refs #7353 redirect to lilium' (!3111) from 7353-fixRedirect into dev ...

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

a282170016 fix: refs #7906 fix method

3e443ad5ce fix: refs #7230 producer fix

5de4a11e8b fix: refs #7230 fix line

3f3b936255 fix: refs #7906 remove code

37d3ef5f16 Merge branch 'dev' into 7986-workerMoto

681f82a3ae feat: refs #7744 test back ok

a188efb1e3 refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile

28e957fecd refactor: refs #8106 refs #1406 Optimized ticket_getTax

7dc35458e8 refactor: refs #7865 delete client.gestdocFk from TPV

5017b344d4 Merge pull request 'refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile' (!3118) from 7930-healthcheckDockerfile into dev ...

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

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

865da7bba2 refactor: refs #8106 Requested changes

541990efb7 Merge branch 'dev' into 7230-deliveryNoteProducer

b15b2d578d Merge pull request 'fix: refs #7230 producer fix' (!3112) from 7230-deliveryNoteProducer into dev ...

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

93494c3eb0 refactor: refs #7811 Deleted pm2

44dc84be9f Merge branch 'dev' into 7811-byePm2

f4b041c9b1 Merge branch 'dev' into 7865-deleteClientGestdocFkTPV

d7fd1b7ee5 Merge pull request 'refactor: refs #7865 delete client.gestdocFk from TPV' (!3123) from 7865-deleteClientGestdocFkTPV into dev ...

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

02dc952024 fix: refs #7906 add test

f68584b3fa Merge branch 'dev' into Fix-ItemRequest

50a2f6081e Merge branch 'dev' into 7986-workerMoto

8609e85ba1 Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev ...

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

1273e895af fix: refs #7906 fix test back

46993ad103 refactor: refs #7010 deleted distinct

46c7745128 Merge pull request 'refactor: refs #7811 Deleted pm2' (!3127) from 7811-byePm2 into dev ...

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

3139d99130 Merge branch 'dev' into 7010-AddPackingField

5a14aed73a Merge branch 'dev' into 7906-notDeleteZone

35621e9051 Merge pull request '#7010 added filter fields to show packing type field in ticket list' (!3024) from 7010-AddPackingField into dev ...

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

939f083671 Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ...

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

ed69604767 Merge branch 'dev' into 7906-notDeleteZone

a5bbdd7a01 Merge pull request 'fix: refs #7906 remake method' (!3109) from 7906-notDeleteZone into dev ...

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

9e9773578a Merge branch 'dev' into Fix-ItemRequest

b8e782d3a5 fix: refs #6831 filter observation

b88dc1c70f fix: refs #6850 remove notifyPickUp

da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ...

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

19fbb836a6 fix: refs #6850 fix model

be9f711cc1 Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ...

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

eea09a9d4a fix: refs #6850 add code

5d55fb287d Merge branch 'test' into dev

bf0cc687e1 Merge branch 'dev' into 6850-removeChandgeUpdateClaim

158f701f1e Merge branch 'dev' into Fix-ItemRequest

d75a032d75 Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev ...

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

e38c061deb fix: add date format on insert data

92f699aac3 Merge branch 'dev' into fixNightProc

e479873547 fix: restore cursor

1731af13ea Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc

69a34ab0fa Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev ...

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

2f77359892 Merge branch 'dev' into 7919-deleteTicketRefund

b76b1c6d50 Merge pull request '#7919 delete if ticketRefund' (!3091) from 7919-deleteTicketRefund into dev ...

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

c3ffb31348 Merge branch 'dev' into 6831-observationDefaulterEmail

f8c83c8f68 Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev ...

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

aad616ff83 Merge branch 'dev' into 6850-removeChandgeUpdateClaim

56cba385cf Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev ...

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

carlossa approved these changes 2024-10-22 06:05:14 +00:00

alexm merged commit db8573dd40 into test 2024-10-22 06:07:15 +00:00

alexm deleted branch 8144-devToTest_2444 2024-10-22 06:07:15 +00:00

alexm referenced this issue from a commit 2024-10-22 06:07:16 +00:00

Merge pull request '8144-devToTest_2444' (!3137) from 8144-devToTest_2444 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#3137

No description provided.