7631_testToMaster_2426 #2634

Merged

alexm merged 147 commits from 7631_testToMaster_2426 into master 2024-06-25 06:36:59 +00:00

Conversation 0 Commits 147 Files Changed 104 +925 -865

alexm commented 2024-06-25 05:31:41 +00:00

Member

Copy Link

No description provided.

alexm added 146 commits 2024-06-25 05:31:41 +00:00

411933a608 feat: refs #6598 acls back

40b2c32a00 feat: refs #6243 show all cmr

f679687701 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection

7d07c513b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection

c6242cc2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

36a96bce7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

31cf5149be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

5abc95af51 feat: refs #6598 back test

0e51fa861c fix: refs #6598 drop variables

97084cb0f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

49fed4e51e refs #6964 feat: hasItemOlder

d1affb1191 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder

0914925a86 refs #6964 feat: hasItemOlder

0e5a15dd4e con addressFk

eb503238d7 feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk

cf5d520692 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

aaea0c95f7 feat: refs #7296 roadmapStopFk

941438efd0 Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop

0b648d09af feat: refs #7296 roadmapStopFk

3bde965f2c Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

7559875aff feat: refs #7296 roadmapStopFk

925c0e0b35 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

7186686548 Merge branch 'dev' into 4560-GastosReparto

fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

ecd34e080d feat: refs #7039 deleteVirtualColumnCountry

340a8c119e refactor: refs #6753 fix saveSign

85d68890b8 refactor: refs #6701 New table clientRate

5ab8e79dde Merge branch 'dev' into 6701-clientRate

d3584691fa refactor: refs #6701 Minor change

4abede62ab Merge branch '6701-clientRate' of https://gitea.verdnatura.es/verdnatura/salix into 6701-clientRate

58053d8286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection

a13581ed97 feat: refs #6243 Add warehouseFk parameter

3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

4230d46fe5 Merge branch 'dev' into 4560-GastosReparto

a997ca0c58 build: add new version

6b9c1b7f54 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

da1b4649bb feat: refs #4560 sin expeditionTruck

81e461d7b1 Merge pull request 'feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk' (!2510) from 7296-expeditionTruckToRoadmapStop into dev ...

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

4089c7deb3 feat: refs #4560 minorChanges

8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto

feaf5f8f5a Merge pull request 'test' (!2545) from test into dev ...

Reviewed-on: #2545

143930bc86 fix: warmFix setDeleted checks ticketRequest not answered

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

130d2b6b47 feat: refs #7203 remove numbres alertLevel

3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ...

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

fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry

5d857696b5 Merge pull request 'feat: refs #7039 deleteVirtualColumnCountry' (!2532) from 7039-deleteVirtualColumnCountry into dev ...

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

a0e79a778d feat: refs #7496 deprecated ticket.isLabeled

e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled

e4e7ae1699 Merge branch 'test' into dev

1fa22e71a9 feat: refs #7203 nombre variables

feda14a21b Merge branch 'test' into dev

71ea1d1467 refs #7536 modify itemShelvingRadar

8458651ce0 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field

a79285cd3d feat: refs #6273 register freelance

8188bdbcb0 fix: refs #6273 use userId

14afd8246a feat: refs #6273 add back test

c2e80060b3 Merge branch 'dev' into 6753-TicketsSaveSign

34fd7cb78d Merge pull request '#6753 fix saveSign' (!2533) from 6753-TicketsSaveSign into dev ...

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

e77bc87a2a Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ...

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

a8f5993c21 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field

cab9058907 Merge pull request 'refs #7536 modify itemShelvingRadar' (!2550) from 7536-TPV_Wrong_abajo_field into dev ...

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

268c0a984c feat isScanned refs #7276

1ca7b75ce3 Merge branch 'dev' into 7496-ticketIsLabeled

f7c2fd824f feat: refs #7496 changesRequested

a89fde0f10 Merge pull request 'feat: refs #7496 deprecated ticket.isLabeled' (!2547) from 7496-ticketIsLabeled into dev ...

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

aff0de23eb Merge branch 'test' into dev

7c0fa6dbb9 feat isScannedExpedition refs #7276

44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev ...

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

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

0c068ed126 Merge branch 'dev' into 4560-GastosReparto

faf450e075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection

96a3a2e69b fix: refs #6243 rollback

521f3f1446 feat: refs #6243 update ACL

ee1678ebb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance

479e4f3f8a feat: refs #6273 required payMethod for internals

f82f452423 Merge branch 'dev' into 7276_expeditionScanned

cac1278c08 feat hsItemOlder refs $6964

4cf5c0775c feat isScannedExpedition refs #7276

391ec435ac Merge pull request '7276_expeditionScanned' (!2559) from 7276_expeditionScanned into dev ...

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

7794f23c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance

2e8d28d795 refactor: refs #7517 Added throw

ca7d67451b refactor: refs #7517 Minor changes

ddb644aded Merge pull request 'refactor: refs #7517 Added throw' (!2562) from 7517-throwBuy_afterUpsert into dev ...

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

b4046de190 Merge branch 'dev' into 4560-GastosReparto

8065b8cf14 Merge pull request '4560-GastosReparto' (!2544) from 4560-GastosReparto into dev ...

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

9d82f0ff7c Merge branch 'test' into dev

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

e081c4504d feat: refs #7548 link a grafana

8e3cc574ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance

59474a9dfb Merge pull request '#6273 register freelance' (!2403) from 6273-registerFreelance into dev ...

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

562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection

d30cd68417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls

6aca0765c0 Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev ...

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

6b04b371f2 Merge branch 'dev' into 6243-generalizeCmrSection

8117b748b3 Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev ...

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

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

76f76b8304 feat: refs #7568 Added freelancer exception

deff65918d Merge pull request 'feat: refs #7568 Added freelancer exception' (!2571) from 7568-ticket_doCmr into dev ...

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

13d1d0a61c feat: refs #7499 add printedStickers

4744f57269 Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ...

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

11a7d890a0 Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ...

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

17fa1e10f6 feat: refs #6701 Added claimRatio_afterInsert

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

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

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

53c732bcb9 Merge branch 'test' into dev

31c4ace76c Merge pull request 'master' (!2584) from master into test ...

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

5714539d78 Merge pull request 'test' (!2585) from test into dev ...

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

615fd3e97b refs #7530 delete trigger deviceProductionConfig_afterUpdate

159b69a04c Merge pull request 'refs #7530 delete trigger deviceProductionConfig_afterUpdate' (!2586) from 7530-Remove_CAU_sending_deviceProductionConfig into dev ...

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

189c67bd2d warmFix change if

e3e9706fb8 fix fixtures

86617ec35a Merge pull request 'warmFix change if' (!2587) from warmFix-vacationsWorkCenter into test ...

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

6c2fd2580d Merge branch 'master' into test

9b80ef73a8 Merge branch 'test' into dev

e7eaecdf6f Merge branch 'master' into test

b4377e36e2 Merge branch 'test' into dev

cfa0b87898 feat: refs #7296 RoutesMonitor

ae8a8ec744 Merge branch 'dev' into 7296-expeditionTruckRoutesMonitor

eaaf83561c fix: refs #5995 Optimized downloadCmrsZip

8ac11722a8 Merge pull request 'feat: refs #7296 RoutesMonitor' (!2594) from 7296-expeditionTruckRoutesMonitor into dev ...

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

39381a4a7c Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev ...

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

9df3e914bd Merge branch 'master' into test

664f4299b3 Merge branch 'test' into dev

9b3f67ff62 Merge branch 'master' into test

a84badff87 Merge branch 'test' into dev

dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder

eedcdb54fa feat hasItemOlder refs#6964

65238e19ca Merge pull request '7596-devToTest_2426' (!2600) from 7596-devToTest_2426 into test ...

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

46cd20a1fd feat hasItemOlder refs#6964

239814e6b4 feat hasItemOlder refs#6964

4d5f3e43ed Merge branch 'master' into test

5694d9a9fe Merge branch 'test' into 6964-hasItemOlder

16d50ca2e5 Merge pull request '6964-hasItemOlder' (!2560) from 6964-hasItemOlder into test ...

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

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

074d4f4755 Merge branch 'master' into test

691413a854 Merge pull request 'master' (!2620) from master into test ...

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

24cf23dddc feat: refs #62add travelKgPercentage table and model

2d38c370a9 Merge pull request '#6238 add travelKgPercentage table and model' (!2626) from 6238-warmfix-addTable into test ...

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

5ef0dffa3e fix: refs #6238 add scheme

87b69e0455 Merge pull request '#6238 add scheme' (!2628) from 6238-warmfix-useDb into test ...

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

8c5f468087 tested proc

5f329fde38 or replace

6244509e3d Merge pull request 'supplierPackaging_ReportSource_hotFix' (!2633) from supplierPackaging_ReportSource_hotFix into test ...

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

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

alexm added the

CR / Tests passed

label 2024-06-25 06:12:55 +00:00

guillermo approved these changes 2024-06-25 06:26:20 +00:00

alexm added 1 commit 2024-06-25 06:35:35 +00:00

3f327866ca Merge branch 'master' into 7631_testToMaster_2426

alexm merged commit ece055ca1e into master 2024-06-25 06:36:59 +00:00

alexm deleted branch 7631_testToMaster_2426 2024-06-25 06:36:59 +00:00

alexm referenced this issue from a commit 2024-06-25 06:37:00 +00:00

Merge pull request '7631_testToMaster_2426' (!2634) from 7631_testToMaster_2426 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#2634

No description provided.