7565-testToMaster #2567

Merged

alexm merged 250 commits from 7565-testToMaster into master 2024-06-11 06:31:18 +00:00

Conversation 0 Commits 250 Files Changed 108 +1611 -683

alexm commented 2024-06-10 12:28:13 +00:00

Member

Copy Link

No description provided.

alexm added 247 commits 2024-06-10 12:28:14 +00:00

8af2cabaea refs #6281 feat:buyFk in itemShelving

8d2ad229d9 Merge branch 'dev' into 6281_buyFk

7bfaf9177e Merge branch 'dev' into 6281_buyFk

d7fd1488ae Merge branch 'dev' into 6281_buyFk

5a11e9ac76 feat: refs #6942 toUnbook

7dca566dca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

607f08b568 feat: refs #6942 xdiario fixtures

f78f8ab6b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

b5e8184489 fix: refs #6942 delete

f79435bd13 feat: refs #6942 set false isBooed & ledger

b0814304aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

b783a9cdfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

13e08ceb51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

3288999f1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

6e9ee64fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

5c2e8c135b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

8b29152c00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

58635b5468 fix: refs #6942 add test & change column name

745253f30b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

c91c12e41c Merge branch 'dev' into 6942-improveInvoiceIn

82b28d70ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

7b56eb0f6e Merge branch '6942-improveInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

0d8ca39d04 Merge branch 'dev' into 6942-improveInvoiceIn

abb122884a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

c3f08fb468 Merge branch '6942-improveInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

b1bf6be44b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

0188b3d1df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

02bee2e07c refs #6111 routeList sql

e0c0c4dbc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList

f34c960f5d refs: #6939 changeREADME

5bbf5887b9 fix(salix): refs #7272 #7272 Bug when acl not loaded

b9d3684db2 feat: refs #6600 add column

ab87929b2d fix(salix): refs #7272 #7272 i18n Error

cf800ae6b4 Merge branch 'dev' into 7272_bug_redirectToLogin

60634fc308 Merge branch 'dev' into 7272_bug_redirectToLogin

596c0f78d0 fix(salix): refs #7272 #7272 Add aclService in routes.js

6277c3da09 fix(salix): refs #7272 #7272 Remove aclService from auth.js

43cedef259 fix(salix): refs #7272 #7272 Call validateToken

b4284889e1 fix(salix): refs #7272 #7272 Front retry calls

be3ee43b06 fix(salix): refs #7272 #7272 Back validateToken endpoint

5b4ed62a36 Merge branch 'dev' into 7272_bug_redirectToLogin

426c5de1b8 Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin

bc4c671587 Merge branch 'dev' into 7272_bug_redirectToLogin

f0f38c199c Merge branch 'dev' into 7272_bug_redirectToLogin

ae91486641 test(salix): refs #7272 #7272 fix renew-token.spec

70c33d9040 Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin

da3c4cb8fc fix(salix): refs #7272 #7272 Errors when Token not exists

6e00b790d2 Merge branch 'dev' into 7272_bug_redirectToLogin

3c0dc48dd0 Actualizar front/salix/components/upload-photo/index.js

6480099527 Merge branch 'dev' into 6939-change-README

968fa9c1dc Merge branch 'dev' into 6939-change-README

599f22a25d catalogue tiene en cuenta apc

bb4f78961f element table

611dea6185 Merge branch 'dev' into 6939-change-README

b2db076c2f refs #7217 create travel_throwAWBError

4bf36f2655 refs #7217 Modify proc name

db28bf335e refs #7217 Modify error message

68425bd41f Merge branch 'dev' into 7217-Unify_errorMessageAWB

47c573a324 fix: refs #6095 filter by refFk null

d9d604b904 Merge branch 'dev' into 6939-change-README

1f1a49d0a5 refactor: refs #6889 use addSale

f36f5fa5df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

8b6844b9f0 Merge branch 'dev' into 7217-Unify_errorMessageAWB

480daea26f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

b71984c53f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk

dd76168bc3 6281 feat:buyFk in itemShekving

20bf2b73b6 6281 feat:buyFk in itemShelving

2b2406ae52 6281 feat:buyFk in itemShelving

598a7eefbc 6281 feat:buyFk in itemShelving

7f1210e712 refs #6820 fix back

741c995c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

623aa8d537 Merge branch 'dev' into 6281_buyFk

40762ba4aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

50dbc5c515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

119102b0b3 refs #6820 acl

c914199415 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

7065cf0b38 feat: refs #6281 change fixtures

0ef93bd98a Merge branch 'dev' into 6281_buyFk

9bd5244f64 refs #7292 hook ueemember

cf630a7213 refs #7292 traduction es

da75bf95c9 deploy: init version

1f370c8814 Merge branch 'test' into dev

dfde2f6846 evita facturacion proveedores

ba478d5358 Merge branch 'dev' into 7420-supplierPackaging_ReportSource

b12fdef703 Merge branch 'dev' into 6281_buyFk

18bb8a4ea5 fix: checking process.env.NODE_ENV

d884192066 fix: checking process.env.NODE_ENV

1f2017c272 fix: simplify

e00ac020cc Merge pull request 'evita facturacion proveedores' (!2491) from 7420-supplierPackaging_ReportSource into dev ...

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

2ffdce3c64 refactor: refs #7398 Refactor and change ekt_scan

ff33c926af fix: move to boot

28279b0782 Merge branch 'dev' into 7421-fix_checking_NODE_ENV

f0d3bfba92 Merge pull request 'fix: checking process.env.NODE_ENV' (!2492) from 7421-fix_checking_NODE_ENV into dev ...

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

0d620c6f33 feat: refs #7398 Change

a52b9b6d2e Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev ...

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

60fa55566c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

4dee90ff57 refs #6820 fix pr

4c5f46eb9b Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev ...

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

83f638323a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember

974e327077 Merge branch 'dev' into 6281_buyFk

a55a6baf6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

1fa5a22bb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList

56aec1c781 refs #7440 Optimized item_comparative

bbd948c654 refs #7440 Minor change

1730276844 Merge pull request 'refactor: refs #7440 itemComparativeOptimization' (!2501) from 7440-itemComparativeOptimization into dev ...

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

49c105ae09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6095-refFk-null-on-search

35a583d6d8 Merge pull request 'test' (!2504) from test into dev ...

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

4219b22553 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

35ce259e5a feat: refs #7438 Added volume to item_valuateInventory

ee010a3bb3 refs #7296 fix pr errors, trad

f45f909995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember

33ba999725 Merge pull request 'refs #6111 routeList sql' (!2257) from 6111-routeList into dev ...

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

2cd3002d06 Merge pull request 'test' (!2506) from test into dev ...

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

3e2abfea2c fix: refs #6942 merge

798b4f9df0 fix: refs #6942 toBook/toUnbook

84582120d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember

cee8fdd784 refs #6832 fix: ToItem

cddc034adf fix: refs #6942 revoke update isBooked

ee17ea4842 feat: refs #6021 add new field

2fe279ed47 feat: refs #7438 Requested changes and little changes

0a1e09be41 Merge branch 'dev' into 6021-add-observations-to-json

31dc85a0d7 Merge pull request 'feat: refs #6021 add new field' (!2508) from 6021-add-observations-to-json into dev ...

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

257de96743 Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta

4c3428da55 refs #7292 add traduction

ed85abf9ef Merge branch 'dev' into 7292-createAddresUEEMember

a5079a5ae0 Merge branch 'dev' into 6095-refFk-null-on-search

5eaadf6044 Merge pull request 'fix: refs #6095 filter by refFk null' (!2468) from 6095-refFk-null-on-search into dev ...

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

a435d88e55 refs #7292 fix tback

9c3700092e Merge branch '7292-createAddresUEEMember' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember

2fc6f6356f Merge branch 'dev' into 7292-createAddresUEEMember

01e2391e0a Merge pull request '#7292 - createAddresUEEMember' (!2489) from 7292-createAddresUEEMember into dev ...

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

c76fd15f07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

7e22e19e62 refs #7217 Reduce error message

4d79dabb69 Merge branch 'dev' into 7217-Unify_errorMessageAWB

2c87730dba Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev ...

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

49a2e6fc84 tickets y email

ab3b58ec3c modificacion recipe y element

a2efe7d7af Merge branch 'dev' into 6939-change-README

1f1d7f1020 Merge pull request 'refs: #6939 changeREADME' (!2369) from 6939-change-README into dev ...

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

ab1797ebec Merge branch 'dev' into 7272_bug_redirectToLogin

b02995918e Merge branch 'dev' into 6281_buyFk

4550d3719c Merge branch 'dev' into 6021-floranet_beta

8296e8cae1 Merge pull request '6021-floranet_beta' (!2509) from 6021-floranet_beta into dev ...

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

846ba9ef66 Merge branch 'dev' into 6281_buyFk

8e4e3ae8b8 Merge pull request 'refs #6281 feat:buyFk in itemShelving' (!2002) from 6281_buyFk into dev ...

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

693356f4cb Merge branch 'dev' into 7272_bug_redirectToLogin

50ef375c6b Merge pull request '#7272 - BUG Redirect To Login when ACL not exists' (!2371) from 7272_bug_redirectToLogin into dev ...

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

f209718383 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

54087096ed Merge branch 'test' into dev

b675bcd6ce fix: refs #7442 Fix kubernetes deploy

dc90ad6595 fix: refs #6942 acls & back

dc26b57f64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

a464b0afd1 fix: en translations

721c31ccce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

0fa6074278 fix: refs #6942 drop quotes

3626941c8c fix traduction & e2e

6222d2657b Merge branch 'dev' into 7217-Unify_errorMessageAWB

c136f2783a refactor: refs #6942 toUnbook & drop buyer acls

745404e761 Merge pull request 'refs #7217 create travel_throwAWBError' (!2465) from 7217-Unify_errorMessageAWB into dev ...

Reviewed-on: #2465
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

992797eb86 Merge pull request 'fix traduction & e2e' (!2512) from 7292fix-teste2e into dev ...

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

1671423d23 fix: refs #6942 add deleteById acl

586dff7f18 Merge branch 'test' into dev

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

1af24e8473 fix : refs #6942 remove grafana update priv

1b4b8668be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

55fd94a12a Merge branch 'test' into dev

9ecba10446 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

c7a324bc27 Merge branch 'test' into dev

b404c7d101 Merge pull request 'test' (!2514) from test into dev ...

Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

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

9ee05860f6 feat: #6408 tests

1bcd7a9665 Merge branch 'dev' into 6408-rocketChat

44e71b303c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn

56407e12a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner

f87ee5cb91 Merge branch 'test' into dev

e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm

03fa06a9fb Merge branch 'dev' into 6021-floranet_beta

d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn

b50b1f2b13 Merge pull request '#6942 toUnbook' (!2135) from 6942-improveInvoiceIn into dev ...

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

9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

fc606f7e36 fix: refs #6889 rollback

a2029f7934 Merge branch 'dev' into 6021-floranet_beta

dccfe4847b Merge pull request 'nuevo enfoque recipe y manejo de errores en order_confirm' (!2523) from 6021-floranet_beta into dev ...

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

d9d7904aaf refs: #7108 weekends

a32db7840e feat: refs #6889 fixtures & models

d866ec6417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

d461b78c7b Merge branch 'test' into dev

4fa2a4d58c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

5e55f2d92d feat: refs # 6408 test ok

05e6e10337 fix: refs #6889 fix back tests

467383d7f4 feat: refs #6477 productionConfig add column

69518ab3e2 Merge pull request 'feat: refs #6477 productionConfig add column' (!2525) from 6477-stickerQr into dev ...

Reviewed-on: #2525
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

5158017edd fix: refs #6889 fix back tests

002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer

8212eb82c7 refactor: refs #6889 improve file loading logic

8a54f7c5c7 refactor: refs #6889 improve file loading logic

db1c352be3 feat: packaging refs #4021

ef4d17c0e6 Merge branch 'dev' into 7108-exchange

d4c76ed20e Merge pull request 'refs: #7108 weekends' (!2524) from 7108-exchange into dev ...

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

eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

1944a4f308 Merge branch 'dev' into 4021_packaging

188137848b Merge pull request 'feat: packaging refs #4021' (!2526) from 4021_packaging into dev ...

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

e5c7bfdb33 Merge branch 'dev' into 7228_croppieUploadPhoto

2b1ebee206 Merge pull request '#7228 - send full size image when croppie it' (!2416) from 7228_croppieUploadPhoto into dev ...

Reviewed-on: #2416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

38bea60776 refactor: refs #6889 script sql

7dc17cd4f6 Merge branch 'test' into dev

6a08a806a9 Merge branch 'dev' into 6408-rocketChat

5339354b92 Merge pull request 'refs #6408 - rocketChat' (!2520) from 6408-rocketChat into dev ...

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

4772509b67 fix: refs #6889 e2e tests

ab9c11ef84 fix: refs #6889 modify fixtures

9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

ee09617b27 fix: refs #6889 e2e tests

836cfcbd07 refactor: refs #6889 sale tests e2e

dc8696b422 feat: refs #6889 add back tests

1941d8f5b3 Merge branch 'dev' into 6832_refactorBackToItem

9299d8f86c Merge pull request 'refs #6832 fix: ToItem' (!2507) from 6832_refactorBackToItem into dev ...

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

68bb282659 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment

790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table

72630d613b fix: refs #6600 rollback

1382b24c1d refactor: refs #6600 add space

0448f7b039 Merge pull request '#6600 add column' (!2378) from 6600-createItemPhotoComment into dev ...

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

ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode

39dcb7d6a8 fix: refs #6889 check if has collection or sectorCollection

705a873d53 Merge pull request '#6889 drop addSaleByCode' (!2470) from 6889-dropAddSaleByCode into dev ...

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

a73c98eebe build(operator): console.log

35ae728e81 build(operator): console.log

9775e808a2 build(operator): remove console.log

c445bcb0ba build(operator): remove console.log

f78585f6ab Merge branch 'master' into test

1ec55c8850 Merge branch 'test' into dev

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

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

f354fe1b1f Merge pull request '7525-devToTest' (!2542) from 7525-devToTest into test ...

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

f903d7cd2a Merge pull request 'master' (!2538) from master into test ...

Reviewed-on: #2538

ceda2718d5 Merge branch 'master' into test

c2fecde1b8 Merge branch 'master' into test

5a6e2a2b31 fix: refs #6942 create invoiceIn acl

b6fb7650cd Merge branch 'master' into test

99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl

2319ab7032 Merge pull request '#6942 create invoiceIn acl' (!2556) from 6942-warmfix-setInsertAcl into test ...

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

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

7579e15fcc refactor: refs #7486 Optimized procs

37fa92aca8 Merge branch 'master' into test

75a529830c Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ...

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

alexm added 1 commit 2024-06-10 13:55:06 +00:00

2061d08bac feat: add changelog

guillermo approved these changes 2024-06-11 06:01:33 +00:00

alexm added 2 commits 2024-06-11 06:04:49 +00:00

bd13ecd464 refactor: refs #7486 engine memory and primary key sales_merge

282cf96336 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster

alexm merged commit 7adf4a373d into master 2024-06-11 06:31:18 +00:00

alexm deleted branch 7565-testToMaster 2024-06-11 06:31:18 +00:00

alexm referenced this issue from a commit 2024-06-11 06:31:21 +00:00

Merge pull request '7565-testToMaster' (!2567) from 7565-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#2567

No description provided.