7863-devToTest_2434 #2852

Merged

alexm merged 129 commits from 7863-devToTest_2434 into test 2024-08-13 06:50:25 +00:00

Conversation 0 Commits 129 Files Changed 147 +676 -7659

alexm commented 2024-08-13 06:39:48 +00:00

Member

Copy Link

No description provided.

alexm added 129 commits 2024-08-13 06:39:49 +00:00

4bef3e9107 refs #7531 Modify zone_getAddresses

460723bd7a refactor: refs #6453 order_confirmWithUser

b068327352 refactor: refs #6453 order_confirmWithUser

b75bdc07c2 refactor: refs #6453 order_confirmWithUser

a8d0345073 refactor: refs #6453 order_confirmWithUser

0e760ba505 refactor: refs #6453 order_confirmWithUser

a1d3d2f2f8 refactor: refs #6453 Major changes

7e415181c2 refactor: refs #6453 Major changes

15f580508b refactor: refs #6453 Minor changes

6dc464d26b refactor: refs #6453 Minor changes

50e2c03d3e refs #7531 Requested modifications in redmine

350e4b4c53 Merge branch 'dev' into 7531-Modify-zone_getAddresses

a6e6f435f7 refs #7531 No assigned department

c44bf909b2 Merge branch 'dev' into 7531-Modify-zone_getAddresses

5f29384389 feat: #6453 Rollback always split by itemPackingType

578de51f7e feat: #6453 Refactor

15e1f9763a BREACKING CHANGE: claim redirect to lilium

a7f725a194 feat: refs #7774 ticket_cloneWeekly

49888cc3b9 Merge branch 'dev' into 7774-ticket_cloneWeekly

5a9ab84356 feat: refs #7646 delete scannableCodeType

896e76016d Merge branch 'dev' into 7646-deleteColumnsProductionConfig

cf3ee07dd2 feat: refs #7713 Created ACLLog

ffd65d700d Merge branch 'dev' into 7713-AclLog

d0dfb95718 feat: refs #7774

4c602800ea feat: refs #6453 Added new ticket search

e53b12d51b feat: refs #6453 Fixes

6ad3d5a5eb feat: refs #6453 Minor changes

254cced550 chore: refs #6989 add config model

fcd26784bf build: init version 2434

587b34f090 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6989-showClientName

c84f57ab6a Merge pull request 'chore: refs #6989 add config model' (!2798) from 6989-showClientName into dev ...

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

b6abcbe090 feat: refs #6453 Requested changes

857b1e9939 Merge branch 'test' into dev

bcf08db6d6 Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev ...

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

eaa366ff39 feat workerActivity refs #6078

057174ae6a Merge branch 'test' into dev

59df0b3886 feat workerActivity refs #6078

eec7790a02 Merge pull request 'test' (!2815) from test into dev ...

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

3c62046277 feat workerActivity refs #6078

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

1d22dc46f0 Merge branch 'dev' into 7646-deleteColumnsProductionConfig

574529b920 Merge branch 'test' into dev

ed283cac46 feat: deleted worker module code & redirect to Lilium

6620a1d119 Merge branch 'dev' into Worker_Migration

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

b56260af36 feat: refs #6453 Requested changes

879d48eb27 Merge branch 'test' into dev

afb2f8d111 Merge branch 'test' into dev

6acba08a91 Merge branch 'test' into dev

ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev ...

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

abd8bc9639 fix: refs #6453 order_confirmWithUser

bf7cd1530c feat: refs #7283 order by desc date

09783ae576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

21423d3b48 Merge branch 'test' into dev

fa3a7aa931 refactor: refs #7820 Deprecated silexACL

ea65a13cfb Merge branch 'test' into dev

be5859b8cf prototipo

dcdbb0bf93 Merge branch 'dev' into 7836-futureEntries

1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev ...

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

eaea1f3559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

58677dca56 Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev ...

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

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

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

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

b1b7f6639c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

28b848930e Merge branch 'test' into dev

184cbb2800 Merge branch 'test' into dev

fc7c7beef7 Merge branch 'dev' into 7836-futureEntries

fc102eff7b Merge branch 'test' into dev

163faf983e feat workerActivity refs #6078

f9e9181637 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6078_workerAct

849989afa8 feat workerActivity refs #6078

4b8b7e3a18 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

9b2cbcd5cc reviewed

22c3a632e2 feat workerActivity refs #6078

4e831dc1bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium

8241a6c22a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration

a9cdbb1255 Merge branch 'dev' into 7836-futureEntries

c3da3b9bf3 Merge pull request '7836-futureEntries' (!2839) from 7836-futureEntries into dev ...

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

c768fa113e test: fix ticket redirect to lilium

715439ae38 test: fix claim descriptor redirect to lilium

8112797918 Merge branch 'dev' into 6336-claim-redirectToLilium

41942783aa dropOldProc

a01794f9cd Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries

1154e9f55c Merge branch 'dev' into 7836-futureEntries

2c1eb6ee42 Merge branch 'dev' into Worker_Migration

00ba0bbe6d Merge pull request '#7323 redirect woker module to Lilium' (!2825) from Worker_Migration into dev ...

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

4fb82dc944 test: fix ticket sale e2e

f0f4610be5 Merge branch '6336-claim-redirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium

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

09d93caddb Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev ...

Reviewed-on: #2814
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

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

afc5615140 #6900 fix: #6900 rectificative filter

1ccfd8731f #6900 feat: empty commit

b4ea7819f8 #6900 feat: clear empty

4af881a8d9 #6900 feat: clear empty

660ebfbe15 #6900 feat: empty commit

853a57ec63 #6900 fix: empty commit

30e1b7280a Merge branch 'dev' into 6336-claim-redirectToLilium

141e116401 Merge pull request 'BREACKING CHANGE: claim redirect to lilium' (!2843) from 6336-claim-redirectToLilium into dev ...

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

62cee3a07a fix: refs #6130 commit lint

7ca768582f Merge pull request 'fix: refs #6130 commit lint' (!2846) from 6130-fix-husky-lint into dev ...

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

1c75c429cc test: husky

5dfdb458a6 #6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn

98f4cb1de5 dropping proc

cd1eec7e29 Merge branch 'dev' into 7836-futureEntries

d9c0b849ad Merge pull request '7836-futureEntries' (!2844) from 7836-futureEntries into dev ...

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

d60f8a5319 Merge branch 'test' into dev

a4a45274af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn

8ab049be0d chore: refs #6900 beautify code

a512fe75ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

d6bea43731 Merge pull request '#6900 rectificative filter' (!2845) from 6900-fineTunningInvoiceIn into dev ...

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

4a76a7554e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

af65ef2536 fix(orders_filter): add sourceApp accepts

64fb097086 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

5339dcbf19 Merge branch 'test' into dev

9ece46ee46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

00845c0534 refactor: refs #7646 #7646 Deleted scannable* variables productionConfig

8655ca0a21 Merge branch 'dev' into 7646-deleteColumnsProductionConfig

f0a273395d Merge pull request 'feat: refs #7646 delete scannableCodeType' (!2782) from 7646-deleteColumnsProductionConfig into dev ...

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

5b2200a134 Merge branch 'dev' into 7774-ticket_cloneWeekly

c4e8202261 feat: refs #7774 #7774 Changes ticket_cloneWeekly

3cf2cec946 feat: refs #7774 #7774 Changes ticket_cloneWeekly

931c13d8ab feat: refs #7774 #7774 Changes ticket_cloneWeekly

6f26dc4990 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration

1602c12200 fix: refs #7283 sql

ece8bee45c Merge pull request 'feat: refs #7774 ticket_cloneWeekly' (!2781) from 7774-ticket_cloneWeekly into dev ...

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

82da7bff9b Merge branch 'dev' into 7283-itemSectionsMigration

462f9a95b7 Merge pull request '#7283 item subsections migration' (!2830) from 7283-itemSectionsMigration into dev ...

Reviewed-on: #2830
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

guillermo approved these changes 2024-08-13 06:48:24 +00:00

alexm merged commit 25b3e36b18 into test 2024-08-13 06:50:25 +00:00

alexm deleted branch 7863-devToTest_2434 2024-08-13 06:50:25 +00:00

alexm referenced this issue from a commit 2024-08-13 06:50:25 +00:00

Merge pull request '7863-devToTest_2434' (!2852) from 7863-devToTest_2434 into test

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

No description provided.