7489-testToMaster #2515

Merged

alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00

Conversation 0 Commits 329 Files Changed 212 +3049 -1735

alexm commented 2024-05-27 12:46:44 +00:00

Member

Copy Link

No description provided.

alexm added 329 commits 2024-05-27 12:46:45 +00:00

3c58f86c2a refs #5919 locker back y front

c061841cac refs #5919 locker and back

38bf90da66 refs #5919 sql

5a375ebfda refs #5919 front back

fd64cb7e80 refs #5919 front back

c5c314eb43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

aa33c28468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

f35b2a4905 refs #5919 back chooseLocker

6ceee45b13 refs #5919 fix locker

3a429a31da refs #5919 locker

e2eebf96f7 refs #5919 locker insert prod

69739fca9c refs #5919 locker relation

c0c3d913b7 refs #5919 locker

bf796c445d refs #5919 fix section

bafd4456ef feat: conversion art. A1 a A2 refs #4979

de75d811c3 refs #6682 absence

976b18203e feat: refs #7187 check if is freelancer on insert & update

d53f19b47d feat: Turn problems into calculated columns

7bbf113ffa feat: Turn issues into calculated columns refs#7213

c262805d33 feat: Turn issues into calculated columns refs#7213

9ca1b9f104 feat: Turn issues into calculated columns refs#7213

bab2ee78c4 feat: refs #6428 auto-changelog with bash

44f2cd4efc feat: refs #7247 clientSupplier_add

71a9aed1bb fix: refs #7187 check for multiple device on freelancer

fbc1614132 fix: refs #7187 sql creation for deviceProductionUser

7899cf230e feat: refs #7039 country

a27e06e8ff feat: refs #7039 country

ffe56edc9c feat: refs #7039 country

a15970c95f fix: refs #7187 sql for pdaFreelancer

5efe286382 Merge branch 'dev' into 7039-country-country

88ef12032b feat: refs #7187 serialNumber new column

008b6f6f41 fix: refs #7187 unify versions

e8a32d8e13 fix: refs #7187 db version

f2d4283304 fix: refs #7187 number on de code

8153a526ce feat: refs #7039 country-name

2d0d4b5643 Merge branch 'dev' into 7039-country-country

fd7dcf2781 fix: refs #7039 fixpr

d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country

30e927d722 feat: refs #6202 dbWatcher script

8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

9af3c17a1f feat: refs #7291 sale_getProblems

c18c77ab93 Merge branch 'dev' into 7039-country-country

0003779681 fix: refs 5919 apply version

50ea41f99a fix: refs #5919 rollback

7240269f5b fix: refs #5919 rollback

f6e89c9049 fix: refs #5919 rollback

be69b5e2c4 fix: refs #5919 rollback

9802f0066c fix: refs #5919 unique key & unassigned locker

e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop

83e9756692 fear: refs #7296 expeditionTruck

5ea57ce728 Merge branch 'dev' into 7296-expeditionTruck

a67f603990 Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas

63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

27e3ae897a feat: Turn issues into calculated columns refs#7213

e28a5eb478 feat: Turn issues into calculated columns refs#7213

9905d7254d Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas

523735e4fc Merge branch 'dev' into 7296-expeditionTruck

7659a39b42 feat: Turn issues into calculated columns refs#7213

82ee8d2209 Merge branch 'dev' into 7039-country-country

f77cf619db refs #6682 holidays conditional

2659e3b259 feat: Turn issues into calculated columns refs#7213

133b862dc0 fix: refs #7187 move column sim to deviceProductionUser

699684bd65 feat: refs #7187 add sim column to the model and id

e15b8eee30 refs #6842 worker

87e85e4a4e Merge branch 'dev' into 7039-country-country

fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays

bc5f78827c Merge branch 'dev' into 6682-notHolidays

b57be129e3 Merge branch 'dev' into 7039-country-country

1eb75599d8 Merge branch 'dev' into 7296-expeditionTruck

4e78307a8d feat: refs #6739 transferInvoice new functionality

1610b9bd0a Merge branch 'dev' into 7039-country-country

e44568ff4b feat: refs #6585 Added call ticket_afterUpdate

545f90c8b6 deploy: init version 2422

19c729d5fd Merge branch 'dev' into 6842-errorCalendar

d4f734455d refactor: refs #6739 transferInvoice() refactor

5e96049e65 Merge branch 'dev' into 6739-transferInvoiceOut

45f7412b35 Merge branch 'dev' into 7335-modifyCmr

2adf96cb37 refactor: #6585 Deleted transaction ticket_doCmr

832db8901e Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr

0e8d2af741 Merge branch 'test' into dev

5e8e09cbae refs #6877 add attenderFk

6c6ae412bd feat: refs #182001 packaging

f529a7f5b4 feat : refs #182001

f70f2949ec feat: refs #182001

43c742938c feat: refs #179881

e5ba6a8673 Merge pull request 'feat: refs #179881' (!2421) from 179881-deleteProcedureFv_pca into dev ...

Reviewed-on: #2421
Reviewed-by: Juanjo Breso <jbreso@verdnatura.es>

3eba4a1f69 refs #6882 fix sql

371df19194 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays

8e1c84ec4b feat: #7333 ticket with refund

6cde2e8170 fix: refs #6585 Requested changes

8637488fc1 refs #6882 fix pr

9a235838d8 refs #7161 feat:setVisibleDiscard by itemTrash

71f66085f6 Merge branch 'test' into dev

c0b4a931a6 Merge branch 'dev' into 6682-notHolidays

16e7fb9662 Merge branch 'dev' into 7335-modifyCmr

d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

2866f231b8 Merge branch 'dev' into 182001-packaging

393d57f078 fix: #7344 getSupplierDebt agrupa por pago

26ff5e8fa9 feat; refs #5919 WIP acls

c355595384 refs #6882 fix back, tback te2e

269c42e5c9 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays

0709a64dca refs #6882 fix back

8a7d124066 refs #6882 fix traductions

fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev ...

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

7b298c1baf refs #6882 fix tback

cc89100d08 Merge branch 'dev' into 182001-packaging

f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev ...

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

50157c932e Merge branch 'dev' into 7296-expeditionTruck

0d42b32611 Merge branch 'dev' into 7161-deleteItemTrash

82ac54f0b3 Merge branch 'test' into dev

4df13d900a Merge branch 'dev' into 7335-modifyCmr

0d43d9a982 refs #6877 remove restriction

f7e6901ef6 Merge branch 'dev' into 7161-deleteItemTrash

53b58104c7 refactor: refs #6230 Revoke item: `size`, longName, name

f86d1ded72 Merge pull request 'feat: refs #7335 Added call ticket_afterUpdate' (!2415) from 7335-modifyCmr into dev ...

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

a90e83e9e0 Merge branch 'dev' into 6230-revoke

7d92b514c5 refactor: refs #6230 Revoke item: `size`, longName, name

162c78e392 Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke

feb36eb911 Merge pull request 'refactor: refs #6230 Revoke item: `size`, longName, name' (!2428) from 6230-revoke into dev ...

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

9d75ba0bc5 refactor: refs #6739 default params

72da046ead Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut

77c2f61f47 refs #6739 move petitions

0f973baa65 Merge branch 'dev' into 6739-transferInvoiceOut

1a375c0e88 refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk

3a7d93759c Merge branch 'dev' into 7247-monacoVies

c4a66b42bb feat: refs #7247 Minor changes

710841ba4a Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2

d6451a94e3 feat: conversion art. A1 a A2 refs #4979

e02dfc0456 Merge branch 'dev' into 182001-packaging

ec89e93adc Merge pull request 'feat: refs #182001 packaging' (!2420) from 182001-packaging into dev ...

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

833994bd27 Merge branch 'dev' into 7291-sale_getProblems

7ccd219629 Merge pull request 'feat: refs #7291 sale_getProblems' (!2382) from 7291-sale_getProblems into dev ...

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

abd692cbd3 Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev ...

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

58aedf160b refactor: refs #6739 changed translations' keys

620dd3d836 Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut

b9e53df218 Merge branch 'dev' into 6739-transferInvoiceOut

dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers

0f52fe65d3 refs #7360 fix error weekly

faf2d51a43 Merge branch 'test' into dev

42d17aa7f5 done

2203ac478b Merge branch 'dev' into 7362-VIP

74399d5ab6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher

bf0db89286 refactor: refs #6202 remove blanks

2c826ed838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

9d7184ed7b refs #6965 Add Fk vehicleFk firstEditorFk

1450a680ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

035782414f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

03a8dafe47 Merge pull request '#6202 myt watcher' (!2377) from 6202-mytWatcher into dev ...

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

0498b425b3 Merge branch 'dev' into 7039-country-country

fcd1b5e351 Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev ...

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

9c5b46b3e2 Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev ...

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

9d1dc6b483 Merge branch 'dev' into 7161-deleteItemTrash

b060048d5d Merge pull request 'refs #7161 feat:setVisibleDiscard by itemTrash' (!2424) from 7161-deleteItemTrash into dev ...

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

cc941de606 feat: conversion art. A1 a A2 refs #4979

f4229284fa Merge branch 'dev' into 7252-deliveryNoteFarmingFk

7f4965879c fix: refs #5919 get locker by relation

6207d79244 Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev ...

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

c048389412 Merge branch 'dev' into 7362-VIP

b03fe4e6d3 Merge branch 'dev' into 7296-expeditionTruck

4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

35f69b8692 Merge branch 'dev' into 7039-country-country

6b7a529b55 refactor: refs #7345 Renamed column of invoiceInConfig

cb9cacc1ea feat: refs #7363 item_getBalance saleTracking no mostrar duplicados

365c3fe588 Merge pull request 'refactor: refs #7345 Renamed column of invoiceInConfig' (!2437) from 7345-byeIsFarmer into dev ...

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

ba72408e84 refactor: refs #7345 Deprecated isFarmer__

af11bb8663 feat: refs #5919 hook

8876a7ea8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

9163d3db74 feat: refs #7363 changes

e7df3fefc6 feat: refs #7363

32b339ffdf Merge branch 'dev' into 7363-item_getBalance

1996a00af1 feat: refs #5919 drop version

8943bc7115 fix: refs #5919 back tests

473f261cf1 refs #7342 Modify decimal item plastic

dfa2d67642 Merge pull request 'refs #7342 Modify decimal item plastic' (!2440) from 7342-IntToDec-Item-Plastic into dev ...

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

cbb7cb18eb fix: refs #5919 delete locker field

56906963de Merge branch 'dev' into 7363-item_getBalance

c706f1cc2b Merge pull request 'feat: refs #7363 item_getBalance saleTracking no mostrar duplicados' (!2438) from 7363-item_getBalance into dev ...

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

a797fca2dd feat: refs #7187 merge dev

562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

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

29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

6d3f00ec95 feat: Turn issues into calculated columns refs#7213

057121582e feat: Turn issues into calculated columns refs#7213

799108f041 fix: refs #7345 Fixed e2e

ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail

b1af625937 feat: Turn issues into calculated columns refs#7213

5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck

e16e5e3db3 feat: refs #5919 back test

5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker

f89ca786df eat: Turn issues into calculated columns refs#7213

6c325fccef refactor: refs #7373 Deleted proc packageInvoicing

585a0c68a8 Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev ...

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

1f39330041 fix: refs #5919 drop focus

b902a1a7f7 Merge branch 'dev' into 5919-locker

bd6ddd681d Merge pull request 'refactor: refs #7373 Deleted proc packageInvoicing' (!2444) from 7373-packageInvoicing_bye into dev ...

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

3ce43909e2 feat: Turn issues into calculated columns refs#7213

45082f532f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker

b13c7c0db6 Merge pull request '#5919 createLocker' (!2446) from 5919-createLocker into dev ...

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

a8299383b9 refs #6428 remove sh

b0da193b4a feat: refs #7039 añadir colum virtual country

c6f7a0768a Merge branch 'dev' into 7039-country-country

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

ebcf8e2927 refs #6428 change file

eeb36a6810 Merge branch 'dev' into 7039-country-country

53f49531b7 VIP now is Vip

6ae48790f3 Merge pull request 'feat: refs #7039 country' (!2361) from 7039-country-country into dev ...

Reviewed-on: #2361
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

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

4254fac6c2 Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev ...

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

0adf6bfc45 Merge branch 'dev' into 7362-VIP

5fd2ef3cff Merge pull request 'done' (!2432) from 7362-VIP into dev ...

Reviewed-on: #2432
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

0894cbd38c Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev ...

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

e469fb2da4 Merge pull request 'test' (!2456) from test into dev ...

Reviewed-on: #2456

778f368300 Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev ...

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

1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck

23eea27268 Merge pull request 'feat: refs #7296 expeditionTruck to roadmapStop' (!2386) from 7296-expeditionTruck into dev ...

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

9288f08b91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2

9ed90412de refs #6965 Points to user instead of worker

c15f9b13f2 Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk

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

53fa78894c feat: refs #7264 Refactor proc itemShelvingRadar and added columns

ac2a0c5151 Merge branch 'dev' into 7264-itemShelvingRadar

9134e0ff65 feat: refs #7264 Minor change

dfe317e78a Merge branch '7264-itemShelvingRadar' of https://gitea.verdnatura.es/verdnatura/salix into 7264-itemShelvingRadar

c443872d1f Merge pull request 'feat: refs #7264 Refactor proc itemShelvingRadar and added columns' (!2460) from 7264-itemShelvingRadar into dev ...

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

7e3861a02f Merge branch 'test' into dev

9b73cdfa6f refs #4979 feat:getInfoDetails && item_devalueA2

115d1aaf85 Fix version

11a0b98495 feat: refs #7296 roadmapStop

bcb3ea4837 feat: refs #7187 new method available pda

993dd0d8bd refs #6965 Modify firstEditorFk NULL

10d812ae3d Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk

9b5b269fe6 Merge pull request 'refs #6965 Add Fk vehicleFk firstEditorFk' (!2433) from 6965-AddFkRoute-vehicleFk-firstEditorFk into dev ...

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

b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers

1abacdc42b fix: refs #7187 method

4cf5457690 fix: refs #7187 remove focus on spec

b299e842b9 fix: refs #7187 model foreignKey

1372f817bd fix: refs #7187 model

402506467b Merge pull request 'master' (!2464) from master into test ...

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

01d1a2391d refs #7400 feat: book ledger with counters

38c505fb7a refs #7400 feat: book ledger with counters

8d8cfa24de refs #7400 feat: book ledger with counters

dab90633db Merge pull request 'test' (!2466) from test into dev ...

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

08ea0d2693 Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev ...

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

27110c2abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2

bddc9a8386 Deleted insert into util.debug (deletedState)

481ecfa079 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

91784f2253 Merge branch 'master' into test

1154e484e5 Merge branch 'test' into dev

958f91ca93 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

135526e513 refs #4979 feat:getInfoDetails && item_devalueA2

0b5f05cbed refactor: refs #7375 Refactor clientsDisable

c8db0a3aa8 refs #4979 feat:getInfoDetails && item_devalueA2

6a576e69e1 refs #4979 feat:getInfoDetails && item_devalueA2

44c4432c67 Merge pull request 'feat: refs #6428 auto-changelog with bash' (!2338) from 6428-auto-changeLog into dev ...

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

4790ae94d1 Merge branch 'dev' into 7187-addPdaFreelancers

2b0ab1816f Merge pull request '#7187 add pda freelancers' (!2298) from 7187-addPdaFreelancers into dev ...

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

dd7ee27e9b refs #7396 fix worker model

7fb6ecd617 feat: refs #7187 redirect to lilium

05f09d0b87 refs #7187 fix workerPda

c822a64dc7 refs #4979 feat:getInfoDetails && item_devalueA2

df08f7a8de Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2

a24c289f63 Merge pull request 'feat: conversion art. A1 a A2 refs #4979' (!2171) from 4979-Conversión-automática-de-producto-A1-a-A2 into dev ...

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

329299d4d9 Merge branch 'master' into test

18ce388944 Merge branch 'test' into dev

9d98ae4a03 Merge branch 'test' into dev

9a5acedd38 improved proc

cbbd488674 Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev ...

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

e67981b382 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

7f0f1b9547 refactor: refs #7422 Deleted tables

f1ae4d9f29 Merge branch 'dev' into 7420-supplierPackaging_ReportSource

44ce998604 Merge pull request 'improved proc' (!2477) from 7420-supplierPackaging_ReportSource into dev ...

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

abdacb3627 casting values

2291c3ca86 Merge pull request 'master' (!2483) from master into test ...

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

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

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

b203d94b27 feat: refs #6021 add new column

d51c9fc120 fix: refs #6404 fix cancel shipment

143f9cf0bb fix: refs #6404 fix return

62ca4885c4 feat: refs #7296 requested changes

996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop

34f48e46e7 feat: refs #7296 requested changes2

823e8fd7a1 feat: refs #7296 requested changes3

3fa557f90d fix: refs #6404 create shipment

dab8ae92ef Merge pull request 'fix: refs #6404 fix cancel shipment' (!2486) from 6404-mrwIntegrationWebService into dev ...

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

6212974154 Merge pull request 'feat: refs #7296 roadmapStop' (!2461) from 7296-expeditionTruckToRoadmapStop into dev ...

Reviewed-on: #2461
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

38b1e48959 Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev ...

Reviewed-on: #2485
Reviewed-by: Pako Natek <pako@verdnatura.es>

335b9caaa4 fix: refs #7187 got summary before lilium

8563116091 Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev ...

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

82d985ff3a refs #7422 Fix

cc2b5764e9 refs #7422 Fix

93314d67b6 refs #7422 Fix

f947b44da1 Merge branch 'dev' into 7420-supplierPackaging_ReportSource

0496c90d86 Merge pull request 'casting values' (!2479) from 7420-supplierPackaging_ReportSource into dev ...

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

cbf9a4c4e9 refs #7422 Fixed all problems

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

ac2ed0956b refs #7422 Fixed all problems

b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev ...

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

030106f06d refactor: refs #7422 Deprecated column

c4b8cef4f8 refactor: refs #7422 Deleted column of Compres

1fef00789f fix: refs #7187 remove bindings

6438ce3a16 fix: refs #7187 e2e

cb866b4ab7 refs #7431 feat: itemPlacementSupplyStockGetTargetList

8e5d12a6cb Merge branch 'dev' into 7187-redirect

6dad3d8af4 refs #7431 feat: itemPlacementSupplyStockGetTargetList

6f9826421d refactor: refs #7422 Fix e2e

f803f5a57d Merge branch 'dev' into 7431_itemPlacements

e1ab0d3051 Merge pull request 'refs #7431 feat: itemPlacementSupplyStockGetTargetList' (!2488) from 7431_itemPlacements into dev ...

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

35e892a90c refs #7422 Fix

b39f953898 Merge branch 'dev' into 7187-redirect

9a762d2fd4 Merge pull request '7187-redirect' (!2476) from 7187-redirect into dev ...

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

5dd1d1f1b6 Merge pull request '7430_devToTest' (!2490) from 7430_devToTest into test ...

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

6e06891937 Merge branch 'master' into test

365e5a3ba3 fix: refs # 7400 ledger_next

2142b78deb feat: refs #7187 Add support for multiple PDAs per user

bc6af32962 fix: problems in colums ticket and sale refs #7213

86a6211cd8 fix: refs #7187 fix duplicate

a919c71369 Merge pull request 'feat: refs #7187 Add support for multiple PDAs per user' (!2496) from 7187-add-traducctions into test ...

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

8b967ee927 Merge pull request 'fix: problems in colums ticket and sale refs #7213' (!2497) from 7213-Problems-in-colums-ticket-and-sale into test ...

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

14f243f251 Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ...

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

5d83409892 feat: refs #7442 Kubernetes deploy

a18df86abd fix: refs #7442 Fix kubernetes deploy

52e9c66271 fix: refs #7442 Fix kubernetes deploy

ab879df00f fix(Jenkinsfile): refs #7442 Remove unused variable

086c2291d1 Merge branch 'master' into test

d384c5624f refactor: refs #7486 Deleted unused debugAll

df5f4a5a42 feat: refs #7296 fixAPPWarehouse

f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck

1a96b96dd0 Merge pull request 'feat: refs #7296 fixAPPWarehouse' (!2513) from 7296-restoreExpeditionTruck into test ...

Reviewed-on: #2513
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

alexm added the

CR / Tests passed

label 2024-05-27 12:57:05 +00:00

guillermo approved these changes 2024-05-28 05:27:38 +00:00

alexm merged commit 60ac8cf6fc into master 2024-05-28 05:30:19 +00:00

alexm deleted branch 7489-testToMaster 2024-05-28 05:30:19 +00:00

alexm referenced this issue from a commit 2024-05-28 05:30:21 +00:00

Merge pull request '7489-testToMaster' (!2515) from 7489-testToMaster 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#2515

No description provided.