7199-devToTest_2316 #2287

Merged

alexm merged 169 commits from 7199-devToTest_2316 into test 2024-04-11 06:25:23 +00:00

Conversation 0 Commits 169 Files Changed 105 +1401 -825

alexm commented 2024-04-11 06:19:47 +00:00

Member

Copy Link

No description provided.

alexm added 169 commits 2024-04-11 06:19:48 +00:00

4f6ae220e1 feat: refs #6738 crear las Fk de la tabla flight

1563fe2cea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2

7d39813fd0 Merge branch 'dev' into 6738-cleanTables2008Part2to2

66bb8e8c05 Merge branch 'dev' into 6738-cleanTables2008Part2to2

48310d24c7 refs #6732 change name supplier.isSerious to supplier.isReal

415b6109b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2

9c6c514056 feat: refs #6738

12fbae83c3 Merge branch 'dev' into 6738-cleanTables2008Part2to2

10a89cb790 refs #6827 Check usernames special characters

09923d2509 refs #6964 feat:advice for olderItem

9a0b4ef674 feat: refs #6738 change table vn2008 to vn

0c9e11c0b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2

dc343a7e3b feat: refs #6738 delete vn2008.dock

d668ae9904 refs #6738

1580914567 Merge branch 'dev' into 6738-cleanTables2008Part2to2

5f16a9827c feat: refs #6738 move file version

b353924034 Merge branch 'dev' into 6738-cleanTables2008Part2to2

9624cdce60 Merge branch 'dev' into 6738-cleanTables2008Part2to2

10c2d25cbd feat: refs #6492 create procedures & grant privileges

9e596e6525 fix: refs #6492 file names

def9aaf41a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

a6de9fd370 feat: refs #6738 modificar a nombres propuestos

786eb08779 Merge branch 'dev' into 6738-cleanTables2008Part2to2

ff459ea3be fix: closeTicket idem salix refs #6549

0413707061 feat: refs #6738

2d9a106fab feat: refs #6738 premisos

fad30eb56d feat: refs #6738

6163cad8a5 refs #6738

77d1a38a87 fix: closeTicket idem salix refs #6549

2d7110f05c Merge branch 'dev' into 6738-cleanTables2008Part2to2

7a94ae3551 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

3e458281e6 fix: refs #6492 boxes alias

0f57931b3a Merge branch 'dev' into 6738-cleanTables2008Part2to2

ff130b773d fix: refs #6492 drop useless insert

46b7acb52a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

d7115e40c1 feat: refs #6492 dropping vn2008 procedures

913b261f86 Merge branch 'dev' into 6549-ticket_close

1315a854a9 fix: closeTicket idem salix Refs: #6549

db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters

d8da317339 Merge branch 'dev' into 6964_itemOlder

9795f449b9 Merge branch 'dev' into 6738-cleanTables2008Part2to2

ca0d269ee2 refs #6074 remove isBlocked

027aa86662 refs #6964 feat:advice for olderItem

4dca49360e Merge branch 'dev' into 6964_itemOlder

976c5b7ba8 refs #6964 feat:advice for olderItem

c10e8d6733 Merge branch 'dev' into 6964_itemOlder

61b649fdc5 refs #6964 feat:advice for olderItem

c4fcb2cd12 refs #6964 feat:advice for olderItem

f6ba5224e6 refs #7123 first edit pdf

8e1ba54616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

22f78dbb91 refs #6964 feat:hasItemOlder

a40234ba9b refs #6964 feat:hasItemOlder

1b09c5b4ba Merge branch 'dev' into 6964_itemOlder

2ea9d042e3 Merge branch 'dev' into 6492-refactorProceduresVn2008

8b684442f5 refs #6276 hotFix: setUserError and return

e84805508a Merge branch 'dev' into 6964_itemOlder

1840117b3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

e8ad5b1d17 Merge branch '6964_itemOlder' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

c265896224 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

678eb2928f refs #6964 feat:hasItemOlder

634bfc5091 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

72baf1e80e Merge branch '6492-refactorProceduresVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

94f6d20bb1 feat: refs #6942 add Insert

43b042a616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder

ff8522cfd1 refs #6964 feat:advice for olderItem

5a19c1ebb1 Merge branch 'dev' into 6964_itemOlder

9240732c00 refs #6964 feat:advice for olderItem

97b2500eea refs #6074 fix comment

9667d31441 feat: refs #7150

ed1bc06301 feat: refs #7150

f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked

7634d82d8b refs #6964 feat:hasItemOlder

9f438751d3 Merge branch 'dev' into 6074-KkearisBlocked

76dcf97591 Merge pull request 'refs #6074 remove isBlocked' (!2196) from 6074-KkearisBlocked into dev ...

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

c1310ada91 refs #7152 deploy: init version 24.16

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

b62905c5ef Merge branch 'dev' into 6964_itemOlder

b445d745a5 cambios

1d906c993b portes

d031fef1a0 Merge branch 'dev' into 6358-boxPicking_blueMammut

e851c3b481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

76c04cb260 Restore storage rule

bfb6b25d1a Merge pull request 'Restore storage rule' (!2231) from fix_gitignore into dev ...

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

c942786783 pruebas

df271a242d fix: refs #6492 procedure

0a89cddff9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

9aae9677e6 modificaciones

98b1e933f7 prova

547df47049 delete old proc

df911b9b75 fora comentaris

7c4fc31b50 version productionConfig

a5ff545259 Merge branch 'dev' into 6358-boxPicking_blueMammut

7aeb9e4f32 Merge pull request '6358-boxPicking_blueMammut' (!2230) from 6358-boxPicking_blueMammut into dev ...

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

09e1e4de19 refactor: #7123 change credit document

448b8e6ea3 Merge branch 'dev' into 6738-cleanTables2008Part2to2

de5e954ce2 fix: refs #7145 fix overFlow on driver-route

2a7807a4ab remove: refs #7145 dev code

2cf5e94002 Merge pull request '7145-wordBreak' (!2247) from 7145-wordBreak into dev ...

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

0f8b80d533 refs #6816 remove tittle MicroSip

29eee4e8a7 Merge branch 'test' into dev

9801279370 refs #169673 item_getSimilar

f5943e4445 refs #6324 remove column and dependencies

f9ef45f1d9 refs #6324 remove doc

f44e19cae3 feat: refs #6636 Modified updateClaim, model and tests

fcb4fe92e8 Merge branch 'dev' into 6636-pickup

75a4d6947f fix: closeTicket idem salix Refs: #6549

efcb7a9d50 Merge pull request 'refs #169673 item_getSimilar' (!2252) from 169673-item_getSimilar into dev ...

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

9fcad457a7 fix: closeTicket idem salix Refs: #6549

2ed5237568 Merge branch 'dev' into 6964_itemOlder

cf10ed0f13 Merge pull request '#6964 _ itemOlder' (!2197) from 6964_itemOlder into dev ...

Reviewed-on: #2197
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

fe0afe30bf fix: closeTicket idem salix Refs: #6549

ac658fb6af Merge branch 'dev' into 6636-pickup

23db6a41be feat: refs #6636 Minor change

1656c8db63 Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup

0cd4013f5e Merge branch 'test' into dev

16a6e3d8a6 feat: refs #6636 Requested change

bf3eb51bad Merge pull request '#7123 - creditRequestChange' (!2238) from 7123-creditRequestChange into dev ...

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

6f2b3ea059 Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev ...

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

db618b819c Merge pull request 'refs #6816 remove tittle MicroSip' (!2248) from 6816-removeMicroSip into dev ...

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

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

6c1e44638e feat: refs #6636 Added getEnumValue method

cf5113c5a6 Merge branch 'dev' into 6738-cleanTables2008Part2to2

cedfdbb421 fix: closeTicket idem salix Refs: #6549

9af87f5cf2 Merge pull request 'feat: refs #6738 crear las Fk de la tabla flight' (!2054) from 6738-cleanTables2008Part2to2 into dev ...

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

93000aaecf Merge branch 'dev' into 6549-ticket_close

e27279e20e Merge branch 'dev' into 6636-pickup

5517c29c1c fet: refs #7150 greuge_dif_porte_add

1e8e6a67a3 Merge branch 'dev' into 7150-greuge_dif_porte_add

657150a9a7 feat: refs #7150 greuge_dif_porte_add

0b96471c7d feat: refs #6714 Added businessType zone_getAddresses

d442ed64c4 Merge pull request 'feat: refs #6714 Added businessType zone_getAddresses' (!2263) from 6714-zone_getAddresses into dev ...

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

0c5b9e3544 Merge branch 'dev' into 7150-greuge_dif_porte_add

5558e92b1e Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ...

Reviewed-on: #2163
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

75bed03ab7 Merge pull request 'test' (!2266) from test into dev ...

Reviewed-on: #2266

6ba43a3c6d Merge branch 'dev' into 7150-greuge_dif_porte_add

2eb229adf7 catalogue fixed

9134216332 refactor(workerDms): adapat to lilium

0ecc09fcc4 Merge branch 'dev' into 6551-workerDms_refactor

1c064c7bfc Merge branch 'dev' into 6021-floranet_RedMoon

90b7d2c3d8 Merge pull request 'catalogue fixed' (!2267) from 6021-floranet_RedMoon into dev ...

Reviewed-on: #2267
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

4a31fe29b8 Merge branch 'dev' into 7150-greuge_dif_porte_add

500244dbed fix id

449a06c85c feat: refs #6636 Added tests

c42e00f11e Merge branch 'dev' into 6636-pickup

9ab71318a9 Merge pull request 'feat: refs #6636 Modified updateClaim, model and tests' (!2256) from 6636-pickup into dev ...

Reviewed-on: #2256
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f8be6be7a3 feat: refs #6636 Minor change

c69a4e1c98 Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ...

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

9a28a59d00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

0e2e68488d Merge branch 'test' into dev

521033edd2 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal

f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters

dca75437f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008

a3c1bceb7e refactor: refs #6492 use enum

eedf30a2dd refs #6732 salix dependencies and undo changes Proveedores

3420667ae5 Merge branch 'dev' into 7150-greuge_dif_porte_add

c30c0de92c feat: refs #7150

2c91385e62 Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add

acd422d48f Merge pull request 'feat: refs #7150' (!2224) from 7150-greuge_dif_porte_add into dev ...

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

099fb70582 Merge branch 'dev' into 6492-refactorProceduresVn2008

0f5afc908c Merge pull request '#6492 refactor vn2008 procedures' (!2159) from 6492-refactorProceduresVn2008 into dev ...

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

85301b84bc Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal

bd026af917 Merge pull request 'refs #6732 change name supplier.isSerious to supplier.isReal' (!2063) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ...

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

0b7042d597 refs #6732 change Proveedores isReal

08948ad360 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal

b0b71935da Merge pull request 'refs #6732 change Proveedores isReal' (!2281) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ...

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

83befbd120 Merge branch 'dev' into 6827-check-usernames-special-characters

7ceba23957 Merge pull request 'refs #6827 Check usernames special characters' (!2109) from 6827-check-usernames-special-characters into dev ...

Reviewed-on: #2109
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

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

c27585d6f3 deploy: refs #7199

alexm requested review from guillermo 2024-04-11 06:19:54 +00:00

guillermo approved these changes 2024-04-11 06:22:02 +00:00

alexm merged commit 01425bd95e into test 2024-04-11 06:25:23 +00:00

alexm deleted branch 7199-devToTest_2316 2024-04-11 06:25:23 +00:00

alexm referenced this issue from a commit 2024-04-11 06:25:25 +00:00

Merge pull request '7199-devToTest_2316' (!2287) from 7199-devToTest_2316 into test

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#2287

No description provided.