7691-testToMaster #2703

Merged

alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00

Conversation 0 Commits 268 Files Changed 185 +2512 -5075

alexm commented 2024-07-08 12:36:57 +00:00

Member

Copy Link

No description provided.

alexm added 267 commits 2024-07-08 12:36:57 +00:00

7f563f99bb refs #5890 feat:reserves

39d07b3b59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

6ebcb53863 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

844bab3cc8 #refs 5890 feat:add assignCollection

0ad8306dd9 refs#5890 feat: delete trigger and modify getTickets

93de845b67 refs#5890 feat: delete trigger and modify getTickets

fd077ae60f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

8026899ab9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

d48a54e95b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

61de81254a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

bfcfd2245b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

06b33fc59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

c20747434e feat: previas con sitema de reservas refs #6861

d7d47da3e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

f1e8f965b3 refs #5890 itemShelving

f18d61d17d refs #5890 fix: dev

9698c049fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

6db1696094 refs #5890 feat:trigger

c066462c10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

78f5586136 refs #5890 feat:itemShelving_add

b742f8a13c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

2770919db9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

09812c24dd refs #5890 feat: triggers

590bcd9088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

d998b650da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

5967bd545c feat: previas con reserva refs #6861

68fa64a937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

bc1397d916 refs #6861 feat: reservePrevious

b4776727df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado

9a98c872d4 Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas

3a8dcbfd29 refs #6861 feat:reserve previos

13415b1ef0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

19ef199648 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

0f1a086bca refs #6861 feat:reserve previos

17e8b99c5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

b1e8cdfd86 feat: refs #7168 Added vRecords param in proc

1140e6bbd3 feat: refs #7168 Minor change

ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

611f907ef0 refs #6861 feat:reserveWithReservation

3146f4f5b6 refactor: refs #6701 Refactor claim_ratio_routine

883f6f18a3 refactor: refs #6701 Refactor claim_ratio_routine

b0801f428d Merge branch 'dev' into 6701-claimRatioRoutine

f0b814c79b refactor: refs #6701 Refactor claim_ratio_routine

710564bed2 Merge branch '6701-claimRatioRoutine' of https://gitea.verdnatura.es/verdnatura/salix into 6701-claimRatioRoutine

e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

7368561bad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

a3e9c91bdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

5a0882c2ac refs #6861 feat:sectoCollection reserve

679f9a1b9b refs #6861 feat:sectoCollection reserve

094b15fe8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

8656c16165 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

75bb08a0c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

22a6c3695c feat:concurrency issue refs #6861

e902a84d10 refactor: refs #5447 changed models

a1f4c58adf Merge branch 'dev' into 5447-TravelExtraCommunity

ea4f70f460 refs #6861 feat: previas a reservas

723327918b refs #7406 worker formation

d770cd8d48 refs #6861 feat: getLock

64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

2cd7133a8c refs #6861 feat: skipTest

74b71079f2 refs #6861 feat: obsrevation

2d876fa1a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

208409acb2 refs #7406 add relation

e133dec514 refs #6861 feat: trigger

32aafc3545 feat: refs #6861 trigger

578b8a2c71 refs #7406 changes sql, modelconfig model

eb2dd5ba5b refs #7406 acls

b95009899c refs #7406 fix back

e09a8f2eb7 refs #6897 remove code redirection

cf5b8a27a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity

594702121c Merge branch '5447-TravelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity

8ce4b7c2e4 Merge branch 'dev' into 5447-TravelExtraCommunity

4703ebbdf3 refactor: refs #7519 Minor change

fd237b6d35 Merge branch 'dev' into 6701-claimRatioRoutine

8cef8eace7 refactor: refs #7519 Minor change

b8e95c0284 refactor: refs #7519 Minor change

1912fdd45d refactor: refs #6286 replace name

cdc18ed84f refs #6897 fix entry Salix

4508f7bfff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration

310c2383cb fix: refs #6286 replace id for reason

48550bd986 refs #6897 fix remove

23a49fb6b1 Merge branch 'dev' into 6897-entryMigration

9b21cd5eb1 refactor: refs #7490 Deleted update duaInvoiceInBooking

e043badc19 Merge branch 'dev' into 7490-duaInvoiceInBooking

fb4be69cf1 refactor: refs #7490 Added final update

a4f8c0df80 Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking

317f898c2e refactor: refs #7490 Minor changes

62f4561279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get

b38c5cdecc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration

21d2d66013 Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration

5d7a570c3f refs #6897 fix redirection

ed7218c133 feat: previas con sitema de reservas refs #6861

d75e008a23 feat: previas con sitema de reservas refs #6861

3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation

b9d1c3228b feat: previas con sitema de reservas refs #6861

60d4372996 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation

3ca71b81af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation

dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column

671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas

d0b926b2c5 feat: refs #7490 Changes

ba67acb72b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration

b72de3570a refs #6897 fix redirection

30caf79490 feat: previas con sitema de reservas refs #6861

7480f5ecb3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls

2dc7e75aee Merge branch 'dev' into 6897-entryMigration

e093808af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls

3c1544ac9d refs #6897 fix es.yml

2d9092d2a5 Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration

5340729ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

cb056ff789 Merge branch 'dev' into 6701-claimRatioRoutine

cfc5e32715 feat: refs #6701 Fix error

961aba285e Merge branch 'dev' into 6701-claimRatioRoutine

784bd91e04 fix: refs #6286 update WorkerTimeControl permissions

7717c38a45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls

c2e4e187d6 feat itemShelvingSale refs #6861

711fad6b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity

4bb223b626 Merge branch '5447-TravelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity

202884fdce feat: refs #6238 add travelKgPercentage table and model

1d0b89ed52 refs #7519 Requested changes

43df0ef55d Merge branch 'dev' into 6701-claimRatioRoutine

54b6ef491f refs #7409 back

fa8c1b3879 acls, fixtures, models

e8c7b55329 fix(WorkerIncome): refs #7409 fix models

3e25fff90f refs #7409 acl

671290b9a0 refs #7313 delete vn.itemPackaging.workerFk

deb0f8e828 Merge branch 'dev' into 6897-entryMigration

ac8780f47f Merge pull request 'refs #6897 remove code redirection' (!2531) from 6897-entryMigration into dev ...

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

7566ca1acb build: increase version 2428

9fc027a3c6 tickets deleted excluded

3711f26b5f Merge branch 'dev' into 7420-supplierPackaging_ReportSource

52a34c8f2d refs #7409 fix acls

87feddaedb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage

3070d1ef01 refactor: refs #6238 drop useless round

0bf0c6ce8c Merge pull request '#6238 add travelKgPercentage table and model' (!2590) from 6238-addPercentage into dev ...

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

b7fadddbb1 Merge branch 'master' into dev

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

5e1bfc12f2 Merge branch 'test' into dev

66ed958c72 Merge branch 'dev' into 7420-supplierPackaging_ReportSource

49943e4f25 Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk

b8b88cdb92 Merge pull request 'refs #7313 delete vn.itemPackaging.workerFk' (!2599) from 7313-Delete_vn.ticketPackaging.workerFk into dev ...

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

6cf7c58671 fix: refs #6238 use scheme

116ec6bba9 Merge pull request '#6238 use scheme' (!2604) from 6238-fix-useDb into dev ...

Reviewed-on: #2604
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

841f8e9cac Merge branch 'dev' into 7420-supplierPackaging_ReportSource

bf62f40c87 actualizada la rama

cccc87d211 Merge pull request 'tickets deleted excluded' (!2601) from 7420-supplierPackaging_ReportSource into dev ...

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

1fa0a841da TP previous

bb496124ac Merge branch 'dev' into 7420-supplierPackaging_ReportSource

637c6a9035 feat: refs #7216 logUnpaid

c989cebbfc Merge pull request '7420-supplierPackaging_ReportSource' (!2607) from 7420-supplierPackaging_ReportSource into dev ...

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

49e01218e9 Warehouse name

738dcc7060 Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ...

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

b117352e1a Merge branch 'dev' into 7420-supplierPackaging_reportSource_update

6967aa9811 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls

1a8df4d87c feat: refs #7216 triggers

b2ad449809 feat: refs #7027 mailError managed

3ec25bd237 Merge pull request 'feat: refs #7027 mailError managed' (!2612) from 7027-mailError into dev ...

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

018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ...

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

c87f060d51 feat boxPicking refs #7357

c1c01df3c3 feat itemShelving_filterBuyer refs #7023

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

182cd3fa8e feat boxPicking refs #7357

7d3c07aaae Actualizar README.md

b02a4721af Merge branch 'test' into dev

926982d5e0 Merge branch 'dev' into sergiodt-patch-1

59abcaa654 Merge pull request 'Actualizar README.md' (!2616) from sergiodt-patch-1 into dev ...

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

b5cd57e660 Merge pull request 'test' (!2621) from test into dev ...

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

833a7c87db feat boxPicking refs #7357

9b0913e439 Merge branch 'dev' into 7023_itemShelving_filterBuyer

ed49c98c1c fnpmeat: previas con sitema de reservas refs #6861

f7b8bd2df6 Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas

a899ecaab7 Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev ...

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

6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ...

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

13952f60e1 feat boxPicking refs #7357

da40b705c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review

fe154b9ee8 sref

7347c50f8e Merge branch 'dev' into 7420-supplierPackaging_reportSource_update

42b483e27e feat: refs #7555 remove account.password__

a80b0c3b4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation

925e28115c Merge pull request 'feat: refs #7555 remove account.password__' (!2624) from 7555-remove_account_password__ into dev ...

Reviewed-on: #2624

9694c80c09 Merge branch 'dev' into 7420-supplierPackaging_reportSource_update

fc0c03f01a Merge pull request 'Warehouse name' (!2610) from 7420-supplierPackaging_reportSource_update into dev ...

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

424e0c430c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome

ccc0dc2ee3 Merge branch 'dev' into 7357_dipole_review

3fa7eb1d2a feat itemShelving_filterBuyer refs #7023

4131653700 feat itemShelving_filterBuyer refs #7023

1dd0357a34 Merge pull request 'test to dev' (!2629) from test into dev ...

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

429149d4e0 Merge branch 'dev' into 7023_itemShelving_filterBuyer

72ef84d6c2 Merge pull request 'feat itemShelving_filterBuyer refs #7023' (!2622) from 7023_itemShelving_filterBuyer into dev ...

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

6a4b44733f Merge branch 'dev' into 7357_dipole_review

cf79711f6a feat: previas con sitema de reservas refs #6861

2012560d70 Merge pull request '7357_dipole_review' (!2615) from 7357_dipole_review into dev ...

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

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

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

655bbe4967 refs #7406 fix pr

248358fbd7 refs #7409 fix pr

95e1bba58b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome

f5bc0482d2 refs #7409 resolve conflicts

f811e7e96c Merge branch 'dev' into 7406-workerFormation

4bf00bd428 version 240625

85854e0713 warmFix: use vn

dbab56a566 Merge branch 'dev' into 7406-workerFormation

dc628995b3 Merge branch 'dev' into 7409-workerIncome

087a051a4a Merge pull request 'refs #7406 worker formation' (!2511) from 7406-workerFormation into dev ...

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

ff1918ef06 Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ...

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

c551e229fb feat itemShelvingLog refs #7168

acf308fd16 feat itemShelvingLog refs #7168

e55af8d36f feat itemShelvingLog refs #7168

b9278f3b3a Merge branch 'test' into dev

ffff851d1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome

f21fe037f3 Merge branch '7409-workerIncome' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome

d1ed4b4459 refs #7409 fix back

75f8de9277 Merge branch 'dev' into 7168-itemShelvingLog_get

93f2995d39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls

b47637610b Merge pull request 'feat: refs #7168 Added vRecords param in proc' (!2305) from 7168-itemShelvingLog_get into dev ...

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

1f6fd8d6d1 feat: refs #6286 check if is teamBoss

b23ff33e60 Merge branch 'dev' into 6021-floranet240624

8aea57e8f9 Merge pull request 'version 240625' (!2637) from 6021-floranet240624 into dev ...

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

f9a09f3fec Merge branch 'dev' into 7409-workerIncome

90d23fc1a4 Merge pull request '7409-workerIncome' (!2597) from 7409-workerIncome into dev ...

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

ad4dd088a3 Merge branch 'test' into dev

cca62ae902 feat: return sql check error

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

cbc00b90b9 feat front-reservas refs #6861

47a0cb6d4f fix: refs #6238 insert ignore

1b7c7336af fix: refs #6238 delete unused SQL script

4814151b15 Merge pull request '#6238 drop duplicate script' (!2644) from 6238-fix-duplicateRecords into dev ...

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

2b0df02f20 Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls

7af2ae80b7 Merge pull request '#6286 set right workerTimeControl acls' (!2557) from 6286-setRightWorkerTimeControlAcls into dev ...

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

746fa82f2a feat expeditionPalletPrint refs #5210

8246eb51d4 Merge pull request 'feat expeditionPalletPrint refs #5210' (!2647) from 5210_expeditionPalletPrint into dev ...

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

f1f57a388d feat: refs #7296 drop column expeditionTruckFk

ca3750ebac feat: refs #7296

19bf606330 refs #7644 First commit

0917fc318a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity

264d5b4b9a Merge pull request '#5447 warehouse out filter' (!2500) from 5447-TravelExtraCommunity into dev ...

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

df4e5deae6 Merge branch 'test' into dev

d4fba0a95f Merge branch 'dev' into 7296-routesMonitorDropVirtualColumn

85c7336d92 refs #7644 Minor changes

355e426ccf mail-alias-account con mixin

cc3dab1007 Merge pull request '7296-routesMonitorDropVirtualColumn' (!2648) from 7296-routesMonitorDropVirtualColumn into dev ...

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

e33b8893f6 Merge branch 'master' into test

57a879723e Merge branch 'test' into dev

7bf55c6815 refs #7644 Added control source

5c8d8ba280 refs #7644 Added locales and changed name of method

3ad2346504 feat refactor setParking REGEXP refs #7575

ac54994760 Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev ...

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

78a28d0191 Merge branch 'master' into test

cafa7bce44 Merge branch 'test' into dev

1ca22dab92 Merge branch 'dev' into 7575_setParking_regExp

5992d7f53f Merge branch 'dev' into 6861-Reservas-front

97655bf1e3 Merge pull request 'feat front-reservas refs #6861' (!2642) from 6861-Reservas-front into dev ...

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

4650f1f388 Merge branch 'dev' into 7575_setParking_regExp

68b7f5baf6 Merge pull request 'feat refactor setParking REGEXP refs #7575' (!2654) from 7575_setParking_regExp into dev ...

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

958322066b Merge branch 'master' into test

b6b3da0771 Merge branch 'test' into dev

0df6eb5065 Merge pull request '7658-devToTest_2428' (!2663) from 7658-devToTest_2428 into test ...

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

edff15662c Merge branch 'master' into test

1561e15d5e feat roadmap refs #7195

a0065dfc13 Merge pull request 'feat roadmap refs #7195' (!2666) from 7195_roadmap_t into test ...

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

af6422cf05 Merge branch 'master' into test

5a9850939e Merge branch 'master' into test

108a62f738 refs #7486 Fix tests

f3f450463b warmFix getSales refs #6861

40eb5f1a31 Merge pull request 'warmFix getSales refs #6861' (!2686) from 6861_reservas into test ...

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

5712fbd782 Merge branch 'master' into test

5213fd4feb Merge branch 'master' into test

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

alexm added 1 commit 2024-07-08 12:52:06 +00:00

f1276d6f56 changelog

guillermo approved these changes 2024-07-09 05:36:22 +00:00

alexm merged commit 5558e69e64 into master 2024-07-09 05:38:28 +00:00

alexm deleted branch 7691-testToMaster 2024-07-09 05:38:28 +00:00

alexm referenced this issue from a commit 2024-07-09 05:38:28 +00:00

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

No description provided.