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

Merge dev - test #1881

Merged
jsegarra merged 71 commits from dev into test 2023-12-07 08:28:25 +00:00
Conversation 0 Commits 71 Files Changed 83 +492 -369
jsegarra commented 2023-12-07 07:13:56 +00:00
Member
Copy Link
No description provided.
jsegarra added 71 commits 2023-12-07 07:13:57 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
d1df8009a6 refs #6023 Fix change rol bug
gitea/salix/pipeline/head This commit looks good Details
9f6d034f9c refs #6023 Minor changes
gitea/salix/pipeline/head This commit looks good Details
0dbb77fc64 refs #6023 Transactioned sync
gitea/salix/pipeline/head This commit looks good Details
cab3548c9b Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
f6d46396b5 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
9668468f94 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
9f92bc4b4c fix: refs #6023 Rollback privileges.js
gitea/salix/pipeline/head This commit looks good Details
eb98de71b1 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2847b993d3 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit Details
707173d618 refs #5890 fix: getTickets
gitea/salix/pipeline/head This commit looks good Details
a27bb53089 refs #5835 getTotals fixed
gitea/salix/pipeline/head There was a failure building this commit Details
e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
800d12e0f2 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head This commit looks good Details
217aa1ac77 refs #6491 deploy(2350) init version
gitea/salix/pipeline/head There was a failure building this commit Details
1277bec801 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2e67ef4f5d refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head This commit looks good Details
db15285858 refs #5811 test updated
gitea/salix/pipeline/head This commit looks good Details
5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
6b2c1e09de refs #5835 refactor
gitea/salix/pipeline/head Build queued... Details
756e55f5c2 Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev 
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f4a1d09ef8 Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
eeef279483 refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good Details
4a62588464 Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev 
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head This commit looks good Details
74dd64126a Merge pull request '#5835 getTotals fixed' (!1854) from 5835-fixGetTotals into dev 
Reviewed-on: #1854
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
d075cb97ad Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev 
Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
aefff68c29 refactor: refs #3222 Requested changes
gitea/salix/pipeline/head This commit looks good Details
3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
8ee8d90eec Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev 
Reviewed-on: #1860
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c7291e3367 Merge pull request 'test' (!1863) from test into dev 
Reviewed-on: #1863
gitea/salix/pipeline/head This commit looks good Details
2fa56cce4b fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good Details
1a5cc67312 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit Details
f2673c3818 refs #5835 rate added
gitea/salix/pipeline/head This commit looks good Details
2e22984e77 refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good Details
5e9a62eac2 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
b3cc020ea7 Merge pull request 'refs #6023 Fix change rol bug' (!1727) from 6023-changeRol into dev 
Reviewed-on: #1727
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good Details
69e555e7b4 Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev 
Reviewed-on: #1870
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
611b45bae0 Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
0b1bbbaaa6 Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev 
Reviewed-on: #1865
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
af07a531ed refs #6318 quantity
gitea/salix/pipeline/head This commit looks good Details
7ff8ec93ff Merge pull request 'test' (!1879) from test into dev 
Reviewed-on: #1879
gitea/salix/pipeline/head This commit looks good Details
acfa0fd857 Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head There was a failure building this commit Details
c75ee22345 Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev 
Reviewed-on: #1875
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
jsegarra requested review from juan 2023-12-07 07:15:09 +00:00
jsegarra requested review from jgallego 2023-12-07 07:15:09 +00:00
jgallego approved these changes 2023-12-07 07:15:27 +00:00
jgallego removed review request for juan 2023-12-07 08:28:02 +00:00
jgallego approved these changes 2023-12-07 08:28:10 +00:00
jsegarra merged commit d37083b3a4 into test 2023-12-07 08:28:25 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
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#1881
No description provided.
Delete Branch "dev"

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?