#7897 - Merge master into test #2869

Merged

jorgep merged 6 commits from master into test 2024-09-04 14:28:44 +00:00

Conversation 0 Commits 6 Files Changed 3 +6 -28

jsegarra commented 2024-08-20 07:23:08 +00:00

Member

Copy Link

Reviewed-on: #2867
Reviewed-by: Javi Gallego jgallego@verdnatura.es

Reviewed-on: https://gitea.verdnatura.es/verdnatura/salix/pulls/2867 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

jsegarra added 1 commit 2024-08-20 07:23:09 +00:00

2a5588f013 Merge pull request '#7864 - 7864_testToMaster_2434' (!2867) from 7864_testToMaster_2434 into master ...

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

jsegarra closed this pull request 2024-08-20 07:24:57 +00:00

jsegarra reopened this pull request 2024-08-20 07:52:28 +00:00

guillermo added 1 commit 2024-08-20 07:57:38 +00:00

0d8d5d8b3d build: dump 2434

guillermo added 2 commits 2024-08-20 08:22:38 +00:00

09f1637064 fix: refs #212295 ticket 212295 Fixed claim link

5b964aec1e Merge pull request 'fix: refs #212295 ticket 212295 Fixed claim link' (!2870) from 212295-liliumUrl into master ...

Reviewed-on: #2870
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

jsegarra requested review from jgallego 2024-08-21 07:30:26 +00:00

jgallego approved these changes 2024-08-21 11:16:35 +00:00

guillermo added 2 commits 2024-08-26 10:12:06 +00:00

b6c0ff01bf fix: refs #7811 Renew token crash

1fac261682 Merge pull request 'fix: refs #7811 Renew token crash' (!2881) from 7811-renewTokenFix into master ...

Reviewed-on: #2881
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

guillermo added 1 commit 2024-08-27 05:24:23 +00:00

83f3a05721 fix: refs #7811 Tests

guillermo added 1 commit 2024-08-27 08:07:15 +00:00

2dc095e828 fix: refs #7811 Renew token crash

pako added 2 commits 2024-08-27 11:03:09 +00:00

a4cc36eed1 version

4a3f884173 Merge pull request 'version' (!2889) from saleGroup_State into master ...

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

carlosap added 4 commits 2024-08-28 14:41:51 +00:00

9a2351b958 Hotfix: refs #7213 ticket_isTooLittle group by addressFk

1ec9e5bf09 Hotfix: refs #7213 ticket_isTooLittle group by addressFk

423ba8c218 Hotfix: refs #7213 ticket_isTooLittle group by addressFk

88246174dc Merge pull request 'fix: refs #7213 Hotfix-ticket_isTooLittle-group-by-addressFk' (!2895) from Hotfix-ticket_isTooLittle-group-by-addressFk into master ...

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

carlosap added 5 commits 2024-09-02 15:48:30 +00:00

3da6a700ae fix: refs #7213 problem rounding

beb54aedf8 fix: refs #7213 problem rounding

4ed5811042 fix: refs #7213 problem rounding

c88b069ac3 fix: refs #7213 problem rounding

41f0c8dc7f Merge pull request 'fix: refs #7213 problem rounding' (!2903) from 7213-Sale_setProblemRoundingByBuy into master ...

Reviewed-on: #2903
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

jsegarra changed title from #7864 - Merge master into test to #7897 - Merge master into test 2024-09-02 17:22:49 +00:00

jsegarra added 4 commits 2024-09-03 06:37:56 +00:00

5e26eccd53 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36

7d5cb45b3a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36

e0a0b987b2 feat(salix): refs #7897 #7897 update changelog.md

adf6708682 Merge pull request '#7897 - masterTest_24_36' (!2909) from 7897_masterTest_24_36 into master ...

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

guillermo added 1 commit 2024-09-03 07:23:03 +00:00

7632f33322 fix: refs #7712 sizeLimit

guillermo added 1 commit 2024-09-03 07:57:24 +00:00

6f97d1b83a fix: refs #7844 salesFilter and isTooLittle condition

guillermo added 1 commit 2024-09-03 10:06:36 +00:00

0c3349dc03 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems

guillermo added 2 commits 2024-09-03 11:29:07 +00:00

790a44c62a fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems

bd06bed570 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

guillermo added 1 commit 2024-09-03 13:03:14 +00:00

3cc19549e4 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems

guillermo added 1 commit 2024-09-04 07:02:44 +00:00

a8cc3f496f build: refs #7897 dump 24.36

jsegarra added 2 commits 2024-09-04 08:55:50 +00:00

32815bad51 revert(salix): rollback limit query

5f714df73b Merge pull request 'revert(salix): rollback limit query' (!2913) from undo_rollback_limit into master ...

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

jorgep added 2 commits 2024-09-04 10:54:17 +00:00

8311795fd8 refactor: refs #7524 dynamic fetch

93796ef18d Merge pull request 'refactor: refs #7524 dynamic fetch' (!2914) from 7524-hotfix-addLimit into master ...

Reviewed-on: #2914
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

carlossa added 3 commits 2024-09-04 11:45:58 +00:00

cb24ca9f82 fix: hotfix

461b8d1f81 Merge branch 'master' into hotfix-fixSepaCore

9503e5134d Merge pull request 'fix: hotfix' (!2918) from hotfix-fixSepaCore into master ...

Reviewed-on: #2918
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

pako added 3 commits 2024-09-04 11:53:50 +00:00

e574f0060a hotfix

ad123e61ca Merge branch 'master' into hotFix-Miriam

9294927931 Merge pull request 'hotfix' (!2919) from hotFix-Miriam into master ...

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

guillermo added 2 commits 2024-09-04 12:10:35 +00:00

212e8d1a03 fix: refs #7346 invoiceSerial

80839100c7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

jorgep added 6 commits 2024-09-04 13:57:28 +00:00

cdaf8a7a67 fix: refs #6900 fine tunning

4ea1177d38 chore: refs #6900 fix test

623794c3dd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning

ec63bf35c2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning

ac5ff9e807 Merge branch 'master' into 6900-hotfix-fineTunning

2ef289bf3a Merge pull request 'fix: refs #6900 fine tunning' (!2905) from 6900-hotfix-fineTunning into master ...

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

jorgep merged commit 4ec1c8301e into test 2024-09-04 14:28:44 +00:00

jorgep referenced this issue from a commit 2024-09-04 14:28:45 +00:00

Merge pull request '#7897 - Merge master into test' (!2869) from master into test

Sign in to join this conversation.

Reviewers

No reviewers

jgallego

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

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

No description provided.