verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

7806_devToTest_2332 #2801

Merged
alexm merged 126 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:09 +00:00
Conversation 0 Commits 126 Files Changed 120 +432 -4585
alexm commented 2024-07-30 06:04:49 +00:00
Member
Copy Link
No description provided.
alexm added 126 commits 2024-07-30 06:04:49 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
1ea357a5dd feat: refs #7126 Refactor and added columns in bs.waste table & proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
eea04520ad Fix: refs #7126 Fix proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b1e136aa47 Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev This commit looks good Details
13ed86d26d Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev This commit looks good Details
4d1031e031 feat: refs #7126 Added manaClaim calc
gitea/salix/pipeline/pr-dev Build queued... Details
b324b0c0f3 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
52400ab626 refs #7393 Modify night ticket closing report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
624f4707ac feat: refs #7197 filter by correcting
gitea/salix/pipeline/pr-dev This commit looks good Details
dce62245e9 chore: refs #7197 add supplierActivityFk filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
8469b2ac3f feat: refs #7683 productionControl
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2078bf58ff feat: refs #7681 Optimization and refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
042ea84055 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
a725cd2840 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
376adebe9d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
96d2bacb3d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
769ee33ab2 fix: refs #7126 Added addressWaste type
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
c3051ebcfb fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f4e5f0205d fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
bb7002b702 fix: refs #7126 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev This commit looks good Details
d660043df2 feat: refs #7511 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
889982dd82 refactor: refs #7126 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
3de57b776b Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
a2f2ed743d refactor: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
94470915da feat: redirect to lilium page not found
gitea/salix/pipeline/pr-dev This commit looks good Details
a0be2edc41 feat(salix): #7648 remove white line
gitea/salix/pipeline/head This commit looks good Details
3e14d2fd48 Merge pull request '#7648 Add field for endpoint as buyLabel report' (!2738) from 7648_getBuys_fields into dev 
Reviewed-on: #2738
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
aa1db03224 build: init version 24.32
gitea/salix/pipeline/pr-dev This commit looks good Details
99bbb55c37 feat: refs #7297 add new columns
gitea/salix/pipeline/pr-dev This commit looks good Details
bdf9b7810c Merge branch 'dev' into hotFix_liliumRedirection
gitea/salix/pipeline/pr-dev This commit looks good Details
b7e84f43de feat: refs #6403 add delete
gitea/salix/pipeline/pr-dev This commit looks good Details
9e007bfb8a fix: refs #6403 fix mrw cancel shipment return type
gitea/salix/pipeline/pr-dev This commit looks good Details
d2f022ab64 Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix
gitea/salix/pipeline/head This commit looks good Details
a0308d281a Merge pull request 'test-dev' (!2734) from test into dev 
Reviewed-on: #2734
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
1d10e61541 Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
762989557f Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/head This commit looks good Details
0ae1de5c88 Merge pull request 'feat: refs #6403 add delete' (!2743) from 6403-feat-add-mrw-delete-on-salix into dev 
Reviewed-on: #2743
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
019e29f3dd Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/head This commit looks good Details
075f2b7ba4 Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev 
Reviewed-on: #2740
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
e66d138091 feat(defaulter_filter): add department
gitea/salix/pipeline/pr-dev This commit looks good Details
719303b511 Merge branch 'dev' into 7356_TicketMigration_End_Back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
c17214ce05 feat: refs #7683 drop temporary table
gitea/salix/pipeline/pr-dev This commit looks good Details
e878615983 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/head This commit looks good Details
dc9d252a8a Merge pull request '#7356 New parameters for Weekly tickets' (!2757) from 7356_TicketMigration_End_Back into dev 
Reviewed-on: #2757
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
ff8820f18d Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
c30362a266 Merge branch 'dev' into 6943-fixCustomer
gitea/salix/pipeline/head This commit looks good Details
41ed73cb28 Merge pull request '6943-fixCustomer' (!2754) from 6943-fixCustomer into dev 
Reviewed-on: #2754
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
f687994a7f refactor: refs #7681 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
03227d5e51 refs #7393 do the translations
gitea/salix/pipeline/pr-dev This commit looks good Details
6d1663617f Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
b9e9d9aad3 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
3449aeb673 refactor: refs #7511 Minor change
gitea/salix/pipeline/head This commit looks good Details
3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev 
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
f19f107971 feat checkExpeditionPrintOut refs #7751
gitea/salix/pipeline/head This commit looks good Details
69a8b8ef49 fix: refs #7511 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
58ee4f1b75 Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/head This commit looks good Details
f810c9ffa8 Merge pull request 'refs #7393 Modify night ticket closing report' (!2487) from 7393-Night_tcket_closing_report into dev 
Reviewed-on: #2487
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6aab5fa9ef fix: refs #7546 Deleted insert util.binlogQueue
gitea/salix/pipeline/head This commit looks good Details
b72923f160 Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev 
Reviewed-on: #2707
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
05598b3371 fix: refs #7126 Slow update
gitea/salix/pipeline/head This commit looks good Details
fe363fd4db fix: refs #7126 Primary key no unique data
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
5567359d73 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
a2799e1e61 feat: refs #7589 Added display (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
24c85608eb feat: refs #7740 Ticket before update added restriction
gitea/salix/pipeline/head This commit looks good Details
c7b2d6714d Merge pull request 'feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)' (!2765) from 7589-itemValuateInventory into dev 
Reviewed-on: #2765
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b9c57c2f0e Fix
gitea/salix/pipeline/head This commit looks good Details
513b4583b3 fix(deletExpeditions): merge test → dev
gitea/salix/pipeline/head This commit looks good Details
3fc973dcee Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev 
Reviewed-on: #2770
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c777b8dbf1 Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev 
Reviewed-on: #2762
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
2a70df151a Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/head This commit looks good Details
c6b49e2134 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
bc49600e21 Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev This commit looks good Details
a472059043 Merge branch 'dev' into hotFix_liliumRedirection
gitea/salix/pipeline/pr-dev This commit looks good Details
eb18bd2400 fix: without path
gitea/salix/pipeline/pr-dev This commit looks good Details
4f32134001 add prefix
gitea/salix/pipeline/pr-dev This commit looks good Details
1a3ed42bcd fix: defaulter filter correct sql
gitea/salix/pipeline/head This commit looks good Details
1f9cacedad Merge pull request 'fix: defaulter filter correct sql' (!2779) from 6943-fix_defaulter_filter into dev 
Reviewed-on: #2779
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
fdef84f78d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
23732ab20a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
0c51a97a17 refactor: refs #7640 Multipleinventory available
gitea/salix/pipeline/head This commit looks good Details
e214da164a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
e8d4a72315 Merge pull request 'feat: redirect to lilium page not found' (!2731) from hotFix_liliumRedirection into dev 
Reviewed-on: #2731
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA
gitea/salix/pipeline/head This commit looks good Details
ebac416034 remove console.log
gitea/salix/pipeline/head This commit looks good Details
920f1a53b1 Merge pull request 'feat: refs #7728 tabla config dias margen vctos.' (!2784) from 7728-Vctos-DUA into dev 
Reviewed-on: #2784
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/pr-dev This commit looks good Details
983d66a681 feat: refs #7728 Added throw due date
gitea/salix/pipeline/pr-dev This commit looks good Details
cb7d6f25e9 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/head This commit looks good Details
5d11f0cd0a Merge pull request 'feat: refs #7683 productionControl' (!2705) from 7683-productionControlDeadlock into dev 
Reviewed-on: #2705
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
de850e62c9 Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev 
Reviewed-on: #2787
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
70142c43db Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
95b61ae86a Merge branch 'test' into dev
gitea/salix/pipeline/pr-dev This commit looks good Details
cf84ce1337 feat: refs #7401 redirect lilium
gitea/salix/pipeline/head This commit looks good Details
a49c36e179 Merge pull request 'feat: refs #7401 redirect lilium' (!2794) from 7401-routeToLilium into dev 
Reviewed-on: #2794
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c6bcf6f488 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
403252ac39 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
f9c58e63e1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
a95475ef61 Merge pull request '#7197 filter by correcting & supplierActivity' (!2641) from 7197-fixInvoiceIn into dev 
Reviewed-on: #2641
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
carlossa approved these changes 2024-07-30 06:06:22 +00:00
alexm changed title from 7806_devToTest_2330 to 7806_devToTest_2332 2024-07-30 06:10:30 +00:00
alexm merged commit 79c8ef7d11 into test 2024-07-30 06:14:09 +00:00
alexm deleted branch 7806_devToTest_2330 2024-07-30 06:14:09 +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#2801
No description provided.
Delete Branch "7806_devToTest_2330"

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?