8062-testToMaster_2 #3059

Merged

alexm merged 293 commits from 8062-testToMaster_2 into master 2024-10-03 05:43:41 +00:00

Conversation 0 Commits 293 Files Changed 158 +1769 -1531

alexm commented 2024-10-02 13:26:48 +00:00

Member

Copy Link

No description provided.

alexm added 293 commits 2024-10-02 13:26:49 +00:00

78eba23d12 refs #6156 new field

147ae85a6e Merge branch 'dev' into 6156-advanceTicketsNewField

d1214a998a feat: login refs #6868

379ad6a8e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin

5c3ce40bbd feat login-app refs #6868

52b82603d2 feat login-app refs #6868

60f64ff74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin

9d5d62afaf feat newLogin refs #6868

0ab620b485 feat newLogin refs #6868

c6da9e72e0 feat newLogin refs #6868

4880d1497f feat: refs #6727 Added util logClean

d61e32917a feat: refs #7562 Created deleteDeprecatedObjects

c330e8c715 feat: refs #7562 Minor change

c0668d054f feat: refs #7562 Changes

aedc8071e1 feat: refs #7562 Changes

ac0c3b79b4 feat createLogin refs #6868

ae6963c26d feat handleUser refs #6868

144cf20e71 feat handleUser refs #6868

7870416860 feat handleUser refs #6868

a82df8e2a2 feat handleUser refs #6868

930e2951b7 feat: refs #6727 Added started and finished

3cf5555612 feat: refs #6727 Fixes

1133750629 feat: #6727 Requested changes

c94ca96226 feat: #6727 Minor changes

9466c7e529 Merge branch 'dev' into 6727-logClean

2568ac4e92 feat: refs #6346 new wagon type section

03523afff1 Merge branch 'dev' into 6346-FixWagonModule

9cf5f8759f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

9e844c15b7 Merge branch 'dev' into 6346-FixWagonModule

57f6c6d9a1 chore: refs #7663 WIP setWeight

388ab80f46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

961fafb33e feat: refs #7404 stockBought add and calculate

47543d5760 refactor: refs #7404 remove console.log

6d25cb3c8c fix: refs #7404 fix translation

f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed

0e7272f911 fix: refs #7404 fix error message

323ab638d7 fix: refs #7404 fix fixtures and back test

b636b5429a fix: refs #7404 refactor fixtures

c742f6f79d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

85f064c869 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

52d62710e6 chore: refs #7663 fix logic

6c9676ce9c chore: refs #7663 fix logic

57a1de7f13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

8fad522a3e feat(salix): refs #7677 #7677 return more postcode fields

b594011433 feat(salix): refs #7677 #7677 return more postcode fields

ec4b8b9e4f Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

4a3faebe7d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

2ba391fc85 feat: refs #7562 Deleted deleteDeprecatedObjects objects

f15fd66e48 Merge branch 'dev' into 7562-deleteDeprecatedObjects

b83e548feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

4c5f5c8324 fix: refs #7663 conflicts

e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed

a0ac2be203 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

d330529bf2 feat: refs #7819 Delete obsolete objects

690898630c Merge branch 'dev' into 7819-Delete_obsolete_objects

29b0851741 refactor: refs #6346 hook added in wagon-type-tray model

26876fd0a6 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

a07582faa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

36cf6b1aee feat: refs #6868 refs# 6868 handleUser

9797d5e219 feat: refs #7663 return created invoice ids

544ddb0f15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

df5961a2a2 feat: refs #7663 wip test

998d3865a3 chore: refs #7663 fix test

7486c4a3c6 feat: refs #7562 refs #7532 Requested changes

925002256a Merge branch 'dev' into 7562-deleteDeprecatedObjects

4daea90b1b feat: refs #7562 refs #7759 Requested changes

900e840eec Merge branch 'dev' into 7819-Delete_obsolete_objects

26d47b3f38 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

99ce158632 chore: refs #7663 return correct type

901cdc7117 feat: refs #4074 modify acls

c43c61991d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls

b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

7053f2786a Merge branch 'dev' into 6727-logClean

56eb3e093d feat: refs #6727 Added indexes in creationDate

261bebbc3b feat: refs #6727 Deleted duplicated indexes

71eb44d083 refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey

18ec76d156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls

c93275b62d Merge branch 'dev' into 6346-FixWagonModule

378ee1119f Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField

ae15d51341 Merge branch 'dev' into 7792-twoFactorFk

31b04cba75 feat(salix): refs #6156 #6156 Move to myt version

2fef104954 Merge branch 'dev' into 6156-advanceTicketsNewField

6e511f00c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls

26be5b292b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls

38ee76f7c9 Merge branch 'dev' into 6156-advanceTicketsNewField

f15b33778c feat(salix): refs #5938 #5938 replace variables

89c2d2705c feat(salix): refs #5938 #5938 change value-field

bf1a43a23e refactor: refs #7900 Deleted sectorProdPriority column

a5f6fe95ea feat(salix): refs #5938 #5938 add futureAlertLevel

1aa888b1a3 feat(WorkerDms_filter): refs #7182 split code. fix: filter

773933ca3c feat(salix): refs #6156 #6156 change config sql

f70f475223 feat(salix): refs #6156 #6156 change user definer

f9a25617f0 feat(salix): refs #6156 #6156 add missing values

615f57b2e6 feat(salix): refs #6156 #6156 simplify CONCAT_WS

579ac481f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls

c407dde7a0 feat(salix): refs #6156 #6156 remove redundant condition

45649359be chore: refs #4074 fix test

eadff638f9 chore: refs #4074 drop focus

125c0c9b3b refactor: refs #6346 requested changes

0593ea9a30 Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

9759715609 fix: refs #6346 created test

3fd9b8195b Merge branch 'dev' into 6346-FixWagonModule

1c0e148233 fix: cau #217599

e2ef3472b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

91abf2eefe refactor: refs #7663 accurate error

bb27f0f1f5 build: init version 2440

68063fdc52 Merge branch 'test' into dev

85c50db19e Merge branch 'dev' into 4074-useAcls

ff61a7d88f Merge pull request '#4074 useAcls' (!2827) from 4074-useAcls into dev ...

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

f487aed336 Merge branch 'dev' into 5938_fine_ticketAdvance

8607a60ca7 feat: refs #7404 format date before select

f7f7df55f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin

b492a1e6a8 feat: refs #6868 refs# 6868 handleUser

e7d3062208 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization

56e6a7e6aa feat: refs #7956 parametro daysInForward

6ae15a8e64 feat: refs #7956 definer

ed8cf628a5 feat: refs #7956 tabulaciones

8dc83e2444 feat: refs #7182 optimize workerDms filter

fbfbf21e06 fix: refs #7182 unnesesary file

63866a34da Merge branch 'dev' into 6346-FixWagonModule

0aadb6d70f Merge pull request '#5938 - fine_ticketAdvance' (!2940) from 5938_fine_ticketAdvance into dev ...

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

a65506aebd Merge branch 'dev' into 7663-setWeight

558ab6eba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

249646236a Merge branch '7663-setWeight' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

2ee0c93e24 chore: refs #7663 fix test

d699d9f60c Merge pull request '#7663 setWeight' (!2817) from 7663-setWeight into dev ...

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

92f305b9fd fix: refs #6156 proc and version

842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField

e062088f1e Merge branch 'dev' into 7182-workerDms_optimization

c21da8d258 fix: refs #7182 function name

17fecf6dcb Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization

10f7583587 feat: refs #7956 sin AS

2a41fc6fc4 Merge branch 'dev' into 6727-logClean

ace4e6975d Merge pull request 'refs #6156 new field' (!1718) from 6156-advanceTicketsNewField into dev ...

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

479fc02245 Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev ...

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

6b5f59a09b Merge branch 'test' into dev

d15be5100d refactor: refs #7952 Deprecate creditInsurance.creditClassification

956058c10c Merge branch 'test' into dev

728c40916c refactor: refs #7895 workerDocument to workerDms

0feb44e404 refactor: refs #7923 Delete Logiflora functions

504e2f0ed2 Merge branch 'dev' into 7956-itemGetSimilar

a73bdfe18f Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

0100e03562 Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule

f46b3122a6 Merge pull request 'refactor: refs #7895 workerDocument to workerDms' (!2953) from 7895-workerDms into dev ...

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

d36ce6bf99 Merge branch 'dev' into 6346-FixWagonModule

6075ec6518 feat: refs #7562 Requested changes

f1f10d1367 refactor: refs #7828 wip

9435ce8c5b Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev ...

Reviewed-on: #2946
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

6f81ca08db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls

bb97ccb6bb Merge pull request 'feat: refs #7562 Created deleteDeprecatedObjects' (!2627) from 7562-deleteDeprecatedObjects into dev ...

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

fcfef2a970 Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev ...

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

74fafdf330 fix: refs #7828 filter mail access

b2bc095caa fix: refs #7828 rollback

edccd95fa1 fix: refs #7828 rollback

b6cba2325a feat: refs #7562 myt version increased to 1.6.10

2f6a80a746 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

37900daf9e Merge branch 'dev' into 7923-DeleteLogifloraFunctions

4f9eb865d0 Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification

36d8e88ac3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls

6b6eea78da feat: refs #7562 myt version increased to 1.6.11

e47dfa7f5b Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification

1c1ce485b3 Merge pull request 'refactor: refs #7952 Deprecate creditInsurance.creditClassification' (!2951) from 7952-DeprecateCreditInsurance.creditClassification into dev ...

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

8a1677f4e9 Merge branch 'dev' into 7923-DeleteLogifloraFunctions

1abf6a14f9 fix: workerDms filter workerFk

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

b1027f454b locallyTested

a0bfc20595 revision

bd47420e82 Merge pull request 'locallyTested' (!2956) from 7969-hasPlantTray into dev ...

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

3d598a4ec4 fix: refs #7952 Version

93e7163858 feat: refs #6868 refs# 6868 handleUser

05b6c75a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin

2d4e667009 feat: refs #6868 refs# 6868 handleUser

e80fe1d0dc feat: refs #6868 refs# 6868 handleUser

630e9cec1e Merge pull request 'test' (!2958) from test into dev ...

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

99bd20bc05 Merge branch 'dev' into 6346-FixWagonModule

67b901e573 Merge pull request '#6346 new WagonType section' (!2778) from 6346-FixWagonModule into dev ...

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

ebbc143152 fix: sql wagonTypeTray

bbb3889154 fix: sql wagonTypeTray

2dc55a706c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls

6f18b8a719 Merge branch 'dev' into 7677_vnLocation_perf

0d47d58b71 Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf

d7336b93df Merge branch 'dev' into 7923-DeleteLogifloraFunctions

8fce0d969b Merge pull request 'refactor: refs #7923 Delete Logiflora functions' (!2954) from 7923-DeleteLogifloraFunctions into dev ...

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

f1f0f5920c fix: refs #6346 fixed SQL

4ba8565006 Merge branch 'dev' into Hotfix-WagonSQL

11193bebe6 Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev ...

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

8d050a8e08 Merge branch 'dev' into Hotfix-WagonSQL

dc5691fce7 Merge branch 'dev' into 7819-Delete_obsolete_objects

dc57c68421 Merge pull request 'feat: refs #7819 Delete obsolete objects' (!2911) from 7819-Delete_obsolete_objects into dev ...

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

63dde3dd78 fix: refs #7819 Version

5489a5edbc Merge branch 'test' into dev

8b7beb7247 Merge branch 'dev' into Hotfix-WagonSQL

cc1cd0563f feat: refs #7404 fixtures and translates

d7679fcb50 feat: refs #7977 muestra las facturas sin vencimientos tambien

8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed

be95162d1a Merge pull request 'feat: refs #7977 muestra las facturas sin vencimientos tambien' (!2964) from 7977-supplierStatement into dev ...

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

51cabd06a4 refactor: refs #7562 Deleted deprecated objects

138640f991 fix: refs #7404 update test to match new fixtures for travel by continent

88962b051f Merge branch 'dev' into 7404-stockBuyed

1f1da689d4 fix: refs #7404 remove console log

e62e7fd798 Merge branch '7404-stockBuyed' of https://gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed

0a0701f7c2 Merge branch 'dev' into 7828-makeCorrectCalls

7540526b9b feat: refs #7964 entry_beforeUpdate

f1a8e206b5 Merge pull request '#7828 makeCorrectCalls' (!2955) from 7828-makeCorrectCalls into dev ...

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

bdef639f78 Merge branch 'dev' into 7964-entry_getCommission

5c7a537275 feat: refs #7912 Added new waste types

0d7953a869 Merge branch 'dev' into 7912-wasteChanges

9aff118b6e feat: refs #6346 added script for wagons

a84817f5e3 Merge pull request 'feat: refs #7912 Added new waste types' (!2967) from 7912-wasteChanges into dev ...

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

e361b789f4 Merge branch 'dev' into 7964-entry_getCommission

3aebe88593 Merge branch 'dev' into 6346-WagonToCard

e4a74ba0e9 feat: refs #3505 testBack closure

f43fa32d36 feat: refs #3505 fdescribe

51da7ae063 feat: refs #7893 Created waste_addSalesLauncher

10fcbffd37 feat: refs #7964 entry_beforeUpdate not

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

06efa8be94 Merge branch 'dev' into 3505-closureTests

361d60a8a8 Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev ...

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

e5e14878b8 feat: refs #3505 remove return

88f434435b Merge branch 'test' into dev

d308f185bc Merge branch 'dev' into 7404-stockBuyed

0c259b7a81 fix: refs #7404 remove duplicate translate

1036330471 Merge branch '7404-stockBuyed' of https://gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed

c8315714d4 Merge branch 'dev' into Hotfix-WagonSQL

bd621c7848 Merge pull request 'fix: refs #6346 fixed SQL' (!2959) from Hotfix-WagonSQL into dev ...

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

eb083d6d2b Merge branch 'dev' into 6346-WagonToCard

5ee5da24e1 Merge pull request '#6346 Added script for wagon section' (!2968) from 6346-WagonToCard into dev ...

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

3e5442c40b Merge branch 'dev' into 7677_vnLocation_perf

2e32dfddc4 perf(salix): refs #7677 #7677 restore files

f962b2e38b perf(salix): refs #7677 #7677 restore files because unnecessary change

fa5ace677c refactor: refs #7893 Requested changes

a3022a7379 Merge branch 'dev' into 7893-waste_addSales

ad6fcc0d36 Merge branch 'dev' into 7404-stockBuyed

f6c5f41d44 Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev ...

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

7f6bd55eaa Merge branch 'dev' into 7677_vnLocation_perf

06d06d7b1a Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ...

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

7cd8e535f0 refactor: refs #7934 Delete vn.MIDNIGHT function

96159224a4 Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf

168e2e3e25 Merge branch 'dev' into 7964-entry_getCommission

72feaba2d2 Merge pull request 'feat: refs #7964 entry_beforeUpdate' (!2966) from 7964-entry_getCommission into dev ...

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

7f9cd1e0d9 Merge pull request 'feat: refs #7893 Created waste_addSalesLauncher' (!2972) from 7893-waste_addSales into dev ...

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

829ecba2ef refactor: refs #7792 revert TwoFactorType

c75cc87129 refactor: refs #7792 revert TwoFactorType

3783bddd2c Merge branch 'dev' into 7677_vnLocation_perf

c9db888266 Merge pull request '#7677 - return more postcode fields' (!2865) from 7677_vnLocation_perf into dev ...

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

e523b12536 fix: refs #7792 enable null

51981eda06 Merge branch 'dev' into 7934-DeleteVn.MIDNIGHT

79d79f0c9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk

09dfacd753 Merge pull request 'refactor: refs #7934 Delete vn.MIDNIGHT function' (!2984) from 7934-DeleteVn.MIDNIGHT into dev ...

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

9efc712859 Merge pull request 'refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey' (!2937) from 7792-twoFactorFk into dev ...

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

c30ecd3760 feat: refs #7343 Modify driverRouteEmail.js

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

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

c82c9395a4 feat: refs #7343 Requested changes

24b9dfb9a9 Merge branch 'dev' into 7343-ModifyDiverRouteEmail

5dec25d423 Merge pull request 'feat: refs #7343 Modify driverRouteEmail.js' (!2994) from 7343-ModifyDiverRouteEmail into dev ...

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

8c2e6558a3 Merge branch 'master' into test

28c38d09fd Merge branch 'test' into dev

e8add6e614 feat(TPV): refs #7999 new frmLongTermStorage ...

Parking table foreign key updated
Old proc removed

Refs: #7999

e9b93ff99b Merge branch 'dev' into 7999-longTermStorage

ada3fbe019 Merge pull request 'feat(TPV): refs #7999 new frmLongTermStorage' (!2998) from 7999-longTermStorage into dev ...

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

06f8f8e95e refactor: refs #7725 deprecate worker.isF11Allowed

f4de066d16 Merge pull request 'refactor: refs #7725 deprecate worker.isF11Allowed' (!3002) from 7725-refactorIsF11Allowed into dev ...

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

882f1eb7c2 feat(travelFilter): add daysOnward

76e545d488 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward

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

afbf084535 Merge branch 'test' into 8032-devToTest_2440

7dae387b7f Merge pull request '8032-devToTest_2440' (!3009) from 8032-devToTest_2440 into test ...

Reviewed-on: #3009
Reviewed-by: Jon Elias <jon@verdnatura.es>

9106171b92 Merge branch 'test' into hotFix_travelList_daysOnward

45a016065d Merge pull request 'feat(travelFilter): add daysOnward' (!3008) from hotFix_travelList_daysOnward into test ...

Reviewed-on: #3008
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

8c18bcd776 feat(components): refs #8030 new component bonus ...

With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030

2b6c604fcd feat(components): refs #8030 new component bonus ...

With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030

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

0edae3c144 Merge branch 'test' into 8030-testPriceDelta

52b25f53b1 Merge pull request '8030-testPriceDelta' (!3026) from 8030-testPriceDelta into test ...

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

f858674c8a Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev" ...

This reverts commit f6c5f41d44, reversing
changes made to 5ee5da24e1.

35e4c0e76b Merge branch 'test' into 7404-revert-commit

1f5c644e0f Merge pull request 'Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"' (!3030) from 7404-revert-commit into test ...

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

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

329920389d fix: option Error

b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode

3ccc0c9b32 Merge pull request 'fix: refs #6868 handleUser addIsOnReservationMode' (!3042) from 6868-HandleUser into test ...

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

2b4504c954 Merge branch 'master' into test

f916509b86 fix(StockBought): revert bad merge master to test

fe741fa7e1 fix: getSimilar daysInForward

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

1cf14035d5 feat: existingRefund without ticketRefund

a48843a5cf feat: refs #8030 new field vn.priceDelta.zoneGeoFk

3c89d1e5e0 fix: refs #8030 foreign key zoneGeo

7d3c2a4a1c fix: refs #8030 schema missing in zoneGeo table

d87f940fff Merge branch 'test' into 8030-testPriceDelta

6c31c85d72 Merge pull request '8030-testPriceDelta' (!3048) from 8030-testPriceDelta into test ...

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

e51dd897c3 Merge pull request 'master' (!3055) from master into test ...

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

guillermo approved these changes 2024-10-03 05:42:25 +00:00

alexm merged commit fe10f03459 into master 2024-10-03 05:43:41 +00:00

alexm deleted branch 8062-testToMaster_2 2024-10-03 05:43:41 +00:00

alexm referenced this issue from a commit 2024-10-03 05:43:43 +00:00

Merge pull request '8062-testToMaster_2' (!3059) from 8062-testToMaster_2 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#3059

No description provided.