7837-testToMaster_2432 #2834

Merged

alexm merged 161 commits from 7837-testToMaster_2432 into master 2024-08-06 05:52:05 +00:00

Conversation 0 Commits 161 Files Changed 147 +786 -4822

alexm commented 2024-08-05 12:26:52 +00:00

Member

Copy Link

No description provided.

alexm added 160 commits 2024-08-05 12:26:53 +00:00

1ea357a5dd feat: refs #7126 Refactor and added columns in bs.waste table & proc

eea04520ad Fix: refs #7126 Fix proc

b1e136aa47 Fix: refs #7126 Tests back

13ed86d26d Fix: refs #7126 Tests back

4d1031e031 feat: refs #7126 Added manaClaim calc

b324b0c0f3 Merge branch 'dev' into 7126-improvedWaste

52400ab626 refs #7393 Modify night ticket closing report

b9d04e9557 Merge branch 'dev' into 7126-improvedWaste

624f4707ac feat: refs #7197 filter by correcting

dcfc156209 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

45573fed41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

2383f3cc67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

43c95c86fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

c99042c831 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

dce62245e9 chore: refs #7197 add supplierActivityFk filter

7cbda176ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

9d1ee964c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

b27023cb9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

f5fb596d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

8469b2ac3f feat: refs #7683 productionControl

2078bf58ff feat: refs #7681 Optimization and refactor

042ea84055 feat: refs #7681 Changes

a725cd2840 feat: refs #7681 Changes

376adebe9d feat: refs #7681 Changes

96d2bacb3d feat: refs #7681 Changes

769ee33ab2 fix: refs #7126 Added addressWaste type

c3051ebcfb fix: refs #7126 Fix

f4e5f0205d fix: refs #7126 Fix

bb7002b702 fix: refs #7126 Minor change

1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste

b28ef09f3d Merge branch 'dev' into 7126-improvedWaste

46e8f5b811 feat: refs #7511 Rename to multiConfig tables

d660043df2 feat: refs #7511 Fix tests

889982dd82 refactor: refs #7126 Requested changes

3de57b776b Merge branch 'dev' into 7683-productionControlDeadlock

a2f2ed743d refactor: refs #7681 Changes

94470915da feat: redirect to lilium page not found

8d61cb762b feat: tabla config dias margen vctos. refs #7728

ddd6c799dc feat(salix): #7648 Add field for endpoint as buyLabel report

a0be2edc41 feat(salix): #7648 remove white line

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>

aa1db03224 build: init version 24.32

99bbb55c37 feat: refs #7297 add new columns

b1a401444e Merge branch 'dev' into 7683-productionControlDeadlock

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

bdf9b7810c Merge branch 'dev' into hotFix_liliumRedirection

b7e84f43de feat: refs #6403 add delete

9e007bfb8a fix: refs #6403 fix mrw cancel shipment return type

d2f022ab64 Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix

a0308d281a Merge pull request 'test-dev' (!2734) from test into dev ...

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

38d863aac6 feat: refactor buyUltimate refs #7736

d6a949a9f3 feat: refactor buyUltimate refs #7736

5ca2a432da feat: refactor buyUltimate refs #7736

4ee0bd687f feat: refactor buyUltimate refs #7736

1d10e61541 Merge branch 'dev' into 7393-Night_tcket_closing_report

762989557f Merge branch 'dev' into 7683-productionControlDeadlock

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>

019e29f3dd Merge branch 'dev' into 7393-Night_tcket_closing_report

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>

12316fb44b fix(client_filter): add recovery

e66d138091 feat(defaulter_filter): add department

150b3a276e feat: refs #7356 new parameters in sql for Weekly tickets front

719303b511 Merge branch 'dev' into 7356_TicketMigration_End_Back

c17214ce05 feat: refs #7683 drop temporary table

e878615983 Merge branch 'dev' into 7683-productionControlDeadlock

15adc59ec5 feat: refs #7683 drop temporary table

57efba8601 Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock

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>

ff8820f18d Merge branch 'dev' into 7683-productionControlDeadlock

c30362a266 Merge branch 'dev' into 6943-fixCustomer

41ed73cb28 Merge pull request '6943-fixCustomer' (!2754) from 6943-fixCustomer into dev ...

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

f687994a7f refactor: refs #7681 Requested changes

03227d5e51 refs #7393 do the translations

6d1663617f Merge branch 'dev' into 7393-Night_tcket_closing_report

b9e9d9aad3 Merge branch 'dev' into 7683-productionControlDeadlock

3449aeb673 refactor: refs #7511 Minor change

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>

f19f107971 feat checkExpeditionPrintOut refs #7751

69a8b8ef49 fix: refs #7511 Minor change

58ee4f1b75 Merge branch 'dev' into 7393-Night_tcket_closing_report

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>

b2a8326170 feat: refactor buyUltimate refs #7736

6aab5fa9ef fix: refs #7546 Deleted insert util.binlogQueue

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>

ca48c64163 Merge branch 'dev' into 7126-improvedWaste

05598b3371 fix: refs #7126 Slow update

fe363fd4db fix: refs #7126 Primary key no unique data

55ea761af4 eat: refactor buyUltimate refs #7736

5567359d73 feat: refactor buyUltimate refs #7736

bf0f95f661 Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate

ccc02d57b7 feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)

a2799e1e61 feat: refs #7589 Added display (item_valuateInventory)

d7b9a3ffd0 feat: refactor buyUltimate refs #7736

24c85608eb feat: refs #7740 Ticket before update added restriction

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>

169534568e Merge branch 'test' into dev

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

b9c57c2f0e Fix

513b4583b3 fix(deletExpeditions): merge test → dev

b086cc7658 feat: refactor buyUltimate refs #7736

33a71867bd feat: refactor buyUltimate refs #7736

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>

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>

2a70df151a Merge branch 'dev' into 7683-productionControlDeadlock

c6b49e2134 Merge branch 'test' into dev

bc49600e21 Merge branch 'test' into dev

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

a472059043 Merge branch 'dev' into hotFix_liliumRedirection

eb18bd2400 fix: without path

4f32134001 add prefix

1a3ed42bcd fix: defaulter filter correct sql

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>

fdef84f78d Merge branch 'test' into dev

23732ab20a Merge branch 'test' into dev

0c51a97a17 refactor: refs #7640 Multipleinventory available

e214da164a Merge branch 'test' into dev

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>

c0664fd1af hotFix_liliumRedirection

3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA

ebac416034 remove console.log

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

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

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>

983d66a681 feat: refs #7728 Added throw due date

cb7d6f25e9 Merge branch 'dev' into 7683-productionControlDeadlock

5d11f0cd0a Merge pull request 'feat: refs #7683 productionControl' (!2705) from 7683-productionControlDeadlock into dev ...

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

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>

3e0e43da2f Merge branch 'master' into test

70142c43db Merge branch 'test' into dev

10dbc53acc Merge branch 'master' into test

ff8f340978 Merge branch 'test' into dev

1bc50112fa Merge branch 'master' into test

95b61ae86a Merge branch 'test' into dev

cf84ce1337 feat: refs #7401 redirect lilium

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>

ce8c355757 Merge branch 'master' into test

c6bcf6f488 Merge branch 'test' into dev

5c6df930cf Merge branch 'master' into test

403252ac39 Merge branch 'test' into dev

ffd8e5e282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

b013842750 Merge branch 'master' into test

f9c58e63e1 Merge branch 'test' into dev

4f385f16e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn

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>

9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate

79c8ef7d11 Merge pull request '7806_devToTest_2332' (!2801) from 7806_devToTest_2330 into test ...

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

e2c3539dfc Merge branch 'master' into test

495bb7e36e Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate

4cda233424 Merge pull request '7736-Añadir-parámetro-itemFk-a-buyUltimate' (!2805) from 7736-Añadir-parámetro-itemFk-a-buyUltimate into test ...

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

80ad1f30af fix: refs #7811 Variables pm2

a61f68cbc9 Merge pull request 'master' (!2811) from master into test ...

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

57b87d527a Merge pull request 'master' (!2813) from master into test ...

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

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

09da9129a6 Merge branch 'master' into test

619dd2fbe8 Merge pull request 'master' (!2823) from master into test ...

Reviewed-on: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

01df29b47c Merge branch 'master' into test

4c67daedec Merge branch 'master' into test

f6db62945d Merge branch 'master' into test

d5a8e32b52 Merge branch 'master' into test

d6e09fcfc9 Merge branch 'master' into test

alexm added 1 commit 2024-08-05 12:52:16 +00:00

e95d722a7c add changelog

guillermo approved these changes 2024-08-06 05:50:43 +00:00

alexm merged commit 36dee872d6 into master 2024-08-06 05:52:05 +00:00

alexm deleted branch 7837-testToMaster_2432 2024-08-06 05:52:05 +00:00

alexm referenced this issue from a commit 2024-08-06 05:52:06 +00:00

Merge pull request '7837-testToMaster_2432' (!2834) from 7837-testToMaster_2432 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#2834

No description provided.