verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 73 Releases Wiki Activity

7596-devToTest_2426 #2600

Merged
alexm merged 115 commits from 7596-devToTest_2426 into test 2024-06-18 06:19:51 +00:00
Conversation 0 Commits 115 Files Changed 90 +708 -742
alexm commented 2024-06-18 05:55:06 +00:00
Member
Copy Link
No description provided.
alexm added 115 commits 2024-06-18 05:55:06 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
411933a608 feat: refs #6598 acls back
gitea/salix/pipeline/pr-dev This commit looks good Details
40b2c32a00 feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good Details
5abc95af51 feat: refs #6598 back test
gitea/salix/pipeline/pr-dev This commit looks good Details
0e51fa861c fix: refs #6598 drop variables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
cf5d520692 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
0b648d09af feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
3bde965f2c Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
7559875aff feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
925c0e0b35 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
ecd34e080d feat: refs #7039 deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
340a8c119e refactor: refs #6753 fix saveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
85d68890b8 refactor: refs #6701 New table clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
5ab8e79dde Merge branch 'dev' into 6701-clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
a13581ed97 feat: refs #6243 Add warehouseFk parameter
gitea/salix/pipeline/pr-dev This commit looks good Details
3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/head This commit looks good Details
a997ca0c58 build: add new version
gitea/salix/pipeline/pr-dev This commit looks good Details
6b9c1b7f54 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/head There was a failure building this commit Details
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>
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
4089c7deb3 feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev This commit looks good Details
8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/head This commit looks good Details
feaf5f8f5a Merge pull request 'test' (!2545) from test into dev 
Reviewed-on: #2545
gitea/salix/pipeline/pr-dev This commit looks good Details
130d2b6b47 feat: refs #7203 remove numbres alertLevel
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
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>
gitea/salix/pipeline/pr-dev This commit looks good Details
fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/pr-dev Build queued... Details
e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/head This commit looks good Details
e4e7ae1699 Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
1fa22e71a9 feat: refs #7203 nombre variables
gitea/salix/pipeline/head This commit looks good Details
feda14a21b Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev This commit looks good Details
71ea1d1467 refs #7536 modify itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
8458651ce0 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
a79285cd3d feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good Details
8188bdbcb0 fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good Details
14afd8246a feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good Details
c2e80060b3 Merge branch 'dev' into 6753-TicketsSaveSign
gitea/salix/pipeline/head This commit looks good Details
34fd7cb78d Merge pull request '#6753 fix saveSign' (!2533) from 6753-TicketsSaveSign into dev 
Reviewed-on: #2533
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/pr-dev This commit looks good Details
a8f5993c21 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/pr-dev This commit looks good Details
1ca7b75ce3 Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev This commit looks good Details
f7c2fd824f feat: refs #7496 changesRequested
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
aff0de23eb Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
7c0fa6dbb9 feat isScannedExpedition refs #7276
gitea/salix/pipeline/head This commit looks good Details
44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev 
Reviewed-on: #2558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
0c068ed126 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
96a3a2e69b fix: refs #6243 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
521f3f1446 feat: refs #6243 update ACL
gitea/salix/pipeline/pr-dev This commit looks good Details
479e4f3f8a feat: refs #6273 required payMethod for internals
gitea/salix/pipeline/pr-dev This commit looks good Details
f82f452423 Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good Details
4cf5c0775c feat isScannedExpedition refs #7276
gitea/salix/pipeline/head This commit looks good Details
391ec435ac Merge pull request '7276_expeditionScanned' (!2559) from 7276_expeditionScanned into dev 
Reviewed-on: #2559
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
2e8d28d795 refactor: refs #7517 Added throw
gitea/salix/pipeline/pr-dev This commit looks good Details
ca7d67451b refactor: refs #7517 Minor changes
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/pr-dev This commit looks good Details
b4046de190 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/head This commit looks good Details
8065b8cf14 Merge pull request '4560-GastosReparto' (!2544) from 4560-GastosReparto into dev 
Reviewed-on: #2544
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9d82f0ff7c Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev This commit looks good Details
e081c4504d feat: refs #7548 link a grafana
gitea/salix/pipeline/head This commit looks good Details
59474a9dfb Merge pull request '#6273 register freelance' (!2403) from 6273-registerFreelance into dev 
Reviewed-on: #2403
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6aca0765c0 Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev 
Reviewed-on: #2400
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
6b04b371f2 Merge branch 'dev' into 6243-generalizeCmrSection
gitea/salix/pipeline/head This commit looks good Details
8117b748b3 Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev 
Reviewed-on: #2406
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
76f76b8304 feat: refs #7568 Added freelancer exception
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/pr-dev This commit looks good Details
13d1d0a61c feat: refs #7499 add printedStickers
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
17fa1e10f6 feat: refs #6701 Added claimRatio_afterInsert
gitea/salix/pipeline/head This commit looks good Details
53c732bcb9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
5714539d78 Merge pull request 'test' (!2585) from test into dev 
Reviewed-on: #2585
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
9b80ef73a8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
b4377e36e2 Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev This commit looks good Details
cfa0b87898 feat: refs #7296 RoutesMonitor
gitea/salix/pipeline/pr-dev This commit looks good Details
ae8a8ec744 Merge branch 'dev' into 7296-expeditionTruckRoutesMonitor
gitea/salix/pipeline/pr-dev This commit looks good Details
eaaf83561c fix: refs #5995 Optimized downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
8ac11722a8 Merge pull request 'feat: refs #7296 RoutesMonitor' (!2594) from 7296-expeditionTruckRoutesMonitor into dev 
Reviewed-on: #2594
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
664f4299b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
a84badff87 Merge branch 'test' into dev
carlossa approved these changes 2024-06-18 06:14:04 +00:00
alexm merged commit 65238e19ca into test 2024-06-18 06:19:51 +00:00
alexm deleted branch 7596-devToTest_2426 2024-06-18 06:19:51 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlossa
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
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#2600
No description provided.
Delete Branch "7596-devToTest_2426"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?