refs #6915 test_master24_8 #2067

Merged

alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00

Conversation 0 Commits 561 Files Changed 306 +21719 -34798

alexm commented 2024-02-21 14:14:45 +00:00

Member

Copy Link

No description provided.

alexm added 561 commits 2024-02-21 14:14:45 +00:00

616a28500a refs #5834 icon added

ed6d286ad9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic

7283945cf2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic

3e522b08b6 refs #6184 Added saveCmr

d9339af87e refs #6184 Insert in ticketCmr

c0089b1fa0 refs #6184 Added cmrFk in ticket model

3e70cb07e0 refs #6184 Changes

c79f706cdc Merge branch 'dev' into 6184-saveCmr

ce9fafdcab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic

2cdebcd69f check bank entity refs 5834

0536486b8c ref #5834 fix locale

0771548ef1 refs #6184 Requested changes

05a7498219 Merge branch 'dev' into 6184-saveCmr

2792efa9cd perf: refs #6184 Requested changes

64ca72b1f4 refactor refs #6184 Changed downloadCmrsZip

4003e161ce Merge branch 'dev' into 6184-saveCmr

a89d1e883a create rectification: refs #4466

567879d64e corrective back created: refs #4466

b087f84629 Merge branch 'dev' into 4466-invoiceInRectificated

4e951263c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

1f77559519 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

3ace078705 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic

fe4c529bfe refs #5834 perf: remove front code

f1b84ee7a0 Merge branch 'dev' into 6184-saveCmr

45fd96cee6 feat: #6184 Modified uploadFile

1a52e58eaa feat: #6184 Created generateCmrPdf

85a0f8b323 feat: #6184 Minor change

a486b7f2d4 feat: #6184 Minor change

23b8703afc refs #6397 emailValidation

ce5a2ada62 feat: #6184 Requested changes

9faf889833 Merge branch 'dev' into 6184-saveCmr

7cb7c7dace refs #6397 back validation

e9c1f125a5 refs #6397 test back

391f418883 refs #6397 fix test back

73e1b52348 refs #6397 refactor

6701f70a33 Merge branch 'dev' into 6184-saveCmr

cf03982d0c refs #6397 trad tback

43bfb3cfde Merge branch 'dev' into 6184-saveCmr

12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING

540c76005e fix: #6742 calcula hasIncoterm a partir de la serie

a676607e29 feat: #6184 Added email cmr

c7be1b57b1 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr

9005975f1c feat: #6184 Modified email cmr

ed77347fe1 fix: #6557 replace procedure

e5d466b697 fix: refs #6703 drop & replace sale refund by clone

53f37bb0eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

5828fa9657 feat: #6184 Refactor saveSign

dec795d902 feat: #6184 Minor changes

d5a145ba1b feat: #6184 Minor changes

e33861a80d fix: refs #6703 filter

25fa154f60 feat: #6184 Minor changes

ab3fdf4fe4 fix: refs #6703 remove console log

567e480e3b feat: #6184 Minor changes

49a08a96da Merge branch 'dev' into 6184-saveCmr

4fc780967f fix: refs #6703 tests

7c80a7bdda fix: #6184 Minor changes

990e8ee249 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr

65756f98ad fix: #6184 Minor changes

eb208edacc feat: refs #6371 pasar vn2008 a vn part1

04f1a03d4d refs #6397 fix back

ed43b6be2d Merge branch 'dev' into 6184-saveCmr

f14c239391 Merge branch 'dev' into 6397-emailValidation

94cc3ad80e Merge branch 'dev' into 6397-emailValidation

9b8c58ba7d refs #6270 makeInvoice

65268487b9 fix: #6184 Now creates only one dms in saveSign

1fe6818a0f fix: #6184 Minor changes

05163bd5a7 feat: refs #6371 table vn2008 to vn

3a9eb100a1 feat: refs #6371 table vn2008 to vn

0f3ffcfa61 fix: refs #6184 Upload sign

13b8964e3d Merge branch 'dev' into 6184-saveCmr

22fa1d4c3f Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

34f7345315 Merge branch 'dev' into 6184-saveCmr

1e56e741e2 fix: #6184 Requested changes

ed0f942a57 refs #6444 create vn.intrastat_estimateNet.sql

d39d54a514 fix: #6184 Requested changes

8f52efd5dd Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr

f0d4ae604b feat: #6567 sale_replaceItem adaptado a code

7cf46fc6cd incluye fecha de ayer

fe48e27cce Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

ae7fb12b53 Merge branch 'dev' into 6184-saveCmr

50c1531083 feat: refs#Eliminar vistas vn2008

4eb5efa2c9 feat: #6567 con varchar

582359f058 feat: #6567 restaura permisos

3d6797d3ba feat: #6567 sin fixtures

edfb90813a Merge branch 'dev' into 6397-emailValidation

1124722b25 nuevo commit de prueba

a6c0bf8766 Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3

c226c3f2e3 Merge branch 'dev' into 6752-edi.ekt_scan-improved

27f6621447 refs #5802 feat:ticket_setState

a46c3c4d95 refs #5802 feat:ticket_setState

da2a2b5f09 refs #6444 Remove vn2008.intrastat_neto function

afa34c6296 feat: refs #6776 makeMulti

bd990cf105 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

7ebdf59d97 Merge branch 'dev' into 5834-billingDataAutoFillBic

7e7ab3e8b6 fix(triggers): refs #4515 fix error

509d5cea14 refs #6270 fix back

5690da0a18 fix: refs #6776 add userId

5d2f3d1a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack

a6ea4ed048 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack

f6607f6533 build: refs #6706 hook test

825ee76797 build: refs #6706 hook test

2222926488 build: refs #6706 hook test

bd1ac5f41e build: refs #6706 hook test

826c8ff682 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

6a29e97fc6 Merge branch 'dev' into 6752-edi.ekt_scan-improved

4bf08ea147 refs #5890 feat:reserves

3d2d406113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4515-addBuyCheck

141c3d6f6e Merge branch 'dev' into 6270-electronicInvoiceBack

9e12bdf4e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

aba0d97106 feat: refs#5167 Update

a5e5a0d45d feat: #6749 se mira la vida para buscar dias en el pasado

d43976192a fix: refs #6703 fix conflicts

c136395d1e fix: refs #6703 fix conflicts

a47276c86a Merge branch 'dev' into 6184-saveCmr

0d438e7f4c Merge branch 'dev' into 5802_setState

18772c04f6 feat: refs #5167 update

e6eac54709 fix: refs #6703 tests & front

6f306ad18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

be3e7bb8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

b4bb9a4849 refs #5834 feat: new validation

57c5c510ff Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

bbf50995c7 Merge branch 'dev' into 6270-electronicInvoiceBack

b8b2e1c507 Merge branch 'dev' into 6752-edi.ekt_scan-improved

65a30224f5 Merge branch 'dev' into 5802_setState

8a978a2539 refs #6669 fix:ticket_isOutClosureZone

e88abe7b7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

7b14763f45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

4b1d6c4762 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

3182bfa46c refs #4515

650f85c737 Merge branch 'dev' into 4515-addBuyCheck

cbdb089562 Merge branch 'dev' into 6397-emailValidation

3a9c5c90d4 Merge branch 'dev' into 6270-electronicInvoiceBack

aa993e7386 refs #6757 fix back, fix upperCase, fix e2e back

07f04acdd8 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

2db7b608ad feat: refs #6371

66d576f48e Merge branch '6371-limpiezaTablasVn2008Part1' of https://gitea.verdnatura.es/verdnatura/salix into 6371-limpiezaTablasVn2008Part1

548526964e Merge branch 'dev' into 6184-saveCmr

467879bdd6 Merge branch 'dev' into 6703-refactorSaleRefund

b045584658 Merge branch 'dev' into 6184-saveCmr

af4af43d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

2c9c2df362 Merge branch '6703-refactorSaleRefund' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

4490dc7bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

805a7f65e7 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

51e33887a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

3e9dd8b3a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

f6f6fc575d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

a2e076e94f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

3fa49a259c Merge branch 'dev' into 6184-saveCmr

cfe7fa0790 refs #6703 try

bb91035b77 refs #6703 try

b091e2467c build: refs #6706 hook test

138cb7627d Merge branch 'dev' into 6780-changeViewDependencesVn2008

2ec7a43292 refactor: refs #6780 Changed dependences from vn2008 to vn

36e8840e6e Merge branch 'dev' into 6757-supplierMayus

a7a9276584 Merge branch 'dev' into 6757-supplierMayus

91c3c8f04d Merge branch 'dev' into 6270-electronicInvoiceBack

e56e5905c2 Merge branch 'dev' into 6757-supplierMayus

6576bab305 Merge branch 'dev' into 6397-emailValidation

ff2328fd25 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

7b1a0e1957 refs #6444 change code according to sql conventions

a9ddc2d954 Merge branch 'dev' into 6706-optimizeHooks

603d8e3d92 build: refs #6706 hook test

39f0e8b431 refs #6783 deploy: init version

0852d21ee6 refs #6783 deploy: init version

9a084d225c Merge branch 'dev' into 6567-cambiar-articulos

d020086255 Merge pull request '6567-cambiar-articulos' (!1966) from 6567-cambiar-articulos into dev ...

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

92169adac7 Merge branch 'dev' into 5802_setState

c56073c123 Merge branch 'dev' into 6397-emailValidation

e59ab6fd97 Merge pull request 'refs #6397 emailValidation' (!1941) from 6397-emailValidation into dev ...

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

837b9e6dea Merge branch 'dev' into 6752-edi.ekt_scan-improved

aba88c812e build: refs #6706 Jenkinsfile globals

056ddbd9ae build: refs #6706 Jenkinsfile test

2180045848 build: refs #6706 Jenkinsfile test

76785b99b1 build: refs #6706 Jenkinsfile test

3356691124 build: refs #6706 Jenkinsfile test

6a27b752e2 build: refs #6706 Jenkinsfile test

eb32b6daa2 build: refs #6706 Jenkinsfile fixes

d7b15d3221 build: refs #6706 Jenkinsfile fixes

c35bbc3c9d build: refs #6706 Jenkinsfile fixes

93982bf160 Merge branch 'dev' into 6706-optimizeHooks

04976bb6ad Merge pull request 'build: refs #6706 hook test' (!1988) from 6706-optimizeHooks into dev ...

Reviewed-on: #1988

6f4c0f655d feat: #6392 migrado de database

fd98348a4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6742-incoterm-error

a20effc42c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

7d01449518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack

5bc67333dc Merge pull request '5802_setState' (!1969) from 5802_setState into dev ...

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

fb0b0450c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

ab9ceaf100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

4eb53614bc build: refs #6706 Migration to pnPM

af536412bf Merge branch '6706-optimizeHooks' of https://gitea.verdnatura.es/verdnatura/salix into 6706-optimizeHooks

855b590918 Merge branch 'dev' into 6270-electronicInvoiceBack

35f047d4b9 Merge branch 'dev' into 6780-changeViewDependencesVn2008

1155c8d309 Merge branch 'dev' into 4515-addBuyCheck

2a29d68677 Merge pull request 'incluye fecha de ayer' (!1965) from 6752-edi.ekt_scan-improved into dev ...

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

c9b28d10bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

11b0d787e5 refactor: refs #6780 Revoke grants

7f73cba89c Merge branch '6780-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6780-changeViewDependencesVn2008

58daf4754b Merge branch 'dev' into 4515-addBuyCheck

7aea165fb7 Merge branch 'dev' into 6780-changeViewDependencesVn2008

1d596b63a0 Merge branch 'dev' into 6184-saveCmr

eec36300ad refactor: refs #6184 Minor changes

770584cdad Merge pull request 'refactor: refs #6780 Changed dependences from vn2008 to vn' (!1987) from 6780-changeViewDependencesVn2008 into dev ...

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

232f46be90 Merge branch 'dev' into 4515-addBuyCheck

986d3532ed Merge pull request '4515-addBuyCheck' (!1974) from 4515-addBuyCheck into dev ...

Reviewed-on: #1974

bca15cc796 fix: refs #5483 Fix version

6f5b03195b Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1

d9b6093738 Merge pull request '6371-limpiezaTablasVn2008Part1' (!1964) from 6371-limpiezaTablasVn2008Part1 into dev ...

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

2fca40b324 fix: refs #6371 Fixed version

42bf3db629 fix: refs #6371 Fixed version x2

743f317b20 fix: refs #4466 test & sql

1ffbb30d77 refs #6689 feat: delete view vn2008

1d0fd0ad4f fix: refs #6706 Jenkinsfile fixes

3c642fb838 Merge branch 'dev' into 6689-deleteViewsVn2008-6

518d057cf3 refs #6686 feat: Delete views vn2008

0b3f77bb37 Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3

9448b40533 refs #6386 feat: add extension when return file

0bd4602568 refs #6445 remove red function and modify precedures

2a6dc0c478 fix: refs #4466 spaces

fde749de57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

c3aeaf4da7 fix: refs #6371 Versions fixed

9b3112df2a Merge branch 'dev' into 6706-optimizeHooks

2994a303b9 ci: refs#6706 Use pnpm in Jenkins & Docker

6e62a9b826 Merge branch 'dev' into 6386_imageWithNoFormat

1c538d58c2 ci: refs#6706 Jenkinsfile refactor

0669a3db28 ci: refs#6706 Jenkinsfile fixes

d78c8aef40 ci: refs#6706 Jenkinsfile tuning

9cda07bc5a ci: refs#6706 Jenkinsfile tuning

766008ce1a ci: refs#6706 Jenkinsfile tuning

f2071d39ec ci: refs#6706 Jenkinsfile tuning & parallel back test (unstable, disabled)

fd7e16522f ci: refs#6706 Jenkinsfile fixes

4b0b4797ad Merge branch 'dev' into 6689-deleteViewsVn2008-6

e704f2eaf7 feat: refs #6689 Deleted view vn2008

3bf4fb3c98 Merge pull request 'refs #6689 feat: delete view vn2008' (!1992) from 6689-deleteViewsVn2008-6 into dev ...

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

22f9d7d7a2 Merge branch 'dev' into 5834-billingDataAutoFillBic

2ff7700088 Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3

f5108a911f Merge pull request 'feat: refs #6686 Eliminar vistas vn2008' (!1967) from 6686-Limpieza-vistas-esquema-vn2008-part3 into dev ...

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

592e5c877f Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined

045dfa2aa1 Merge pull request 'test' (!1995) from test into dev ...

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

f4591aae85 feat: refs #5167 Restaurar zoneEstimatedDelivery

4164fd8250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

ebd51c4d23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

567359ad6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

c16be228e3 Merge branch 'dev' into 6270-electronicInvoiceBack

1a869766b9 refs #6444 change code accord to conventions

fdd4947401 Merge branch 'dev' into 6742-incoterm-error

4a73bd0133 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined

0c356938fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund

810df2ab95 Merge pull request 'refs #6270 makeInvoice' (!1963) from 6270-electronicInvoiceBack into dev ...

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

ef5401aa46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

86d839ad45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch

17680b2cc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

9ee01e2bc2 Merge pull request '#6703 refactor saleRefund' (!1954) from 6703-refactorSaleRefund into dev ...

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

d28cacfbad refactor: refs #6778 Migrated views of vn2008 to vn

80aaaf3fc5 Merge branch 'dev' into 6778-changeViewDependencesVn2008

13021180e1 Merge pull request '#6557 replace getSubordinates for WorkerGetHierach' (!1952) from 6557-useWorkerGetHierarch into dev ...

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

05478b43f2 fix: refs #4466 test back

99fbb95669 fix: refs #6703 test back

cd73e5adfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

b5ad85dbb5 Merge pull request '#6703 fix test back' (!1997) from 6703-fixTestBack into dev ...

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

43c245b45b Merge branch 'dev' into 6706-optimizeHooks

0ae1d6c546 Merge pull request 'build: refs #6706 Migration to pnpm' (!1990) from 6706-optimizeHooks into dev ...

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

cfcfa489b4 ci: refs#6706 Jenkinsfile & deps fixes

a0c5b1fff6 feat: refs # test corrective & clone

7a66abce6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

5c9589ba7b Merge branch 'dev' into 6742-incoterm-error

9247a802bd refs #6665 delete unused views

33c96df0b1 ci: refs#6706 Dockerfile fixes

6fb198f579 refs #6665 revoke permissions

980f2e61b1 Merge branch 'dev' into 6742-incoterm-error

0b12576d2f Merge pull request '#6742-incoterm-error' (!1989) from 6742-incoterm-error into dev ...

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

ea4f4e1636 Merge branch 'dev' into 6778-changeViewDependencesVn2008

d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr

147721642b Merge branch 'dev' into 6749-disponible-sin-dar-vida

990ab82461 Merge branch 'dev' into 6392-balance-produccion-propia

22349eb36b Merge branch 'dev' into 6392-balance-produccion-propia

ebf80a4eb9 Merge pull request 'feat: #6749 se mira la vida para buscar dias en el pasado' (!1978) from 6749-disponible-sin-dar-vida into dev ...

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

b480df069d Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined

f2946e4168 fix: refs #6184 Requested changes

92abc3fb78 Merge branch 'dev' into 6184-saveCmr

9f6807204d feat: refs #5167 changes required

f7a93a7ccb Merge branch 'dev' into 4466-invoiceInRectificated

f67b5fabe6 Merge branch 'test' into dev

a72acbb08f fix: refs# 6642 Bug apply version

438af34d73 refs #6444 cambio vUnits por vStems

fd4b246bd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated

67f29b2d1a Merge pull request '#4466 InvoiceIn Rectification' (!1902) from 4466-invoiceInRectificated into dev ...

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

5729ba90d1 Merge branch 'dev' into 6445-Remove-Vn2008.red-Function

0d0896758c Merge pull request 'refs #6445 remove red function and modify precedures' (!1998) from 6445-Remove-Vn2008.red-Function into dev ...

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

8c13ebc5fc Merge branch 'dev' into 6778-changeViewDependencesVn2008

19ab90a03c Merge branch 'dev' into 6392-balance-produccion-propia

c4eea81723 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined

c3912dd098 Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)

3c140266f4 Merge pull request 'refs #6665 delete unused views' (!1999) from refs-#6665-Clean-Views-vn2008-(1/9) into dev ...

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

7ebb9cb429 feat: refs #5167 change required

6002c6cd7a refs #6757 fix trad

a949c25860 feat refs #5167 changes required

6b5e1ecc01 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined

318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus

edb445b080 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn

863b37384f Merge pull request 'feat: refs#5167 Update' (!1976) from 5167-kk-warehouseAlias-y-warehouseJoined into dev ...

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

b3e658f9aa ci: refs#6706 Jenkinsfile fixes

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

a2fcf2df23 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn

409bf9649f Merge branch 'dev' into 6757-supplierMayus

78232866c9 Merge pull request 'refs #6757 fix back, fix upperCase, fix e2e back' (!1985) from 6757-supplierMayus into dev ...

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

f8155539c6 ci: refs#6706 Jenkinsfile fixes

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

50af5154f4 ci: refs#6706 Jenkinsfile load environemnt

e581247954 ci: refs#6706 Jenkinsfile load properties from config

80314d86cf Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn

4af454edd4 ci: refs#6706 Jenkinsfile debug

55b9155189 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn

28168130ae ci: refs#6706 Jenkinsfile fixes

19080e348a ci: refs#6706 Jenkinsfile print properties

5c48d8c6b9 ci: refs#6706 Jenkinsfile fixes

2cab007f57 fix: refs #6184 Requested changes

f4feb6e8b7 Merge branch 'dev' into 6184-saveCmr

4067108258 ci: refs#6706 Jenkinsfile fixes

4c123247d8 ci: refs#6706 Jenkinsfile fixes

9c2ec2b8dd ci: refs#6706 Jenkinsfile fixes

f909c648a7 ci: refs#6706 Jenkinsfile fixes

c3174c0c38 Merge branch 'dev' into 6778-changeViewDependencesVn2008

1358324f81 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn

4592429b3d Merge pull request '6444-MigrateVn2008.intrastat_netoFunctionToVn' (!1972) from 6444-MigrateVn2008.intrastat_netoFunctionToVn into dev ...

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

6a738627e7 feat: #6392 adaptado a los nuevos nombres

153e002cb8 Merge branch 'dev' into 6392-balance-produccion-propia

4d6e631fca Merge branch 'dev' into 5834-billingDataAutoFillBic

a8a5ddd889 Merge pull request '#5834 - billingDataAutoFillBic' (!1821) from 5834-billingDataAutoFillBic into dev ...

Reviewed-on: #1821

a67a347a9e ci: refs#6706 CI fixes

46dee65e68 ci: refs#6706 Myt updated

c1789433f8 Merge branch 'dev' into 6778-changeViewDependencesVn2008

87864593b2 Merge branch 'dev' into 6184-saveCmr

aff8ee28ea fix: refs #6272 back & create test

ffa9212861 fix: refs #6184 Requested changes

bdfbb8f6f7 build: refs#6706 gulp install fixed, myt updated

eda85eda76 ci: refs#6706 Jenkinsfile fixes

c4907d1a33 ci: refs#6706 Jenkinsfile fixes

21d047c21f Merge branch 'dev' into 6184-saveCmr

06757640a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData

f6c9f799c5 Merge branch 'dev' into 6778-changeViewDependencesVn2008

dee7019824 refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban

3e8fbce34d feat: #6392 testeado

974228eedd refactor: refs #5586 Optimized SQL negativeBases

3dfc85db42 Merge branch 'dev' into 6443-MigrateVn2008.cc_to_ibanToUtil

2b987d2461 Merge pull request 'refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban' (!2006) from 6443-MigrateVn2008.cc_to_ibanToUtil into dev ...

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

2e009b6f25 refactor: refs #6609 sectorType description to code

2676cb840c Merge branch 'dev' into 6609-sectorType

3f400f92e5 refactor: refs #6609 sectorType description to code

a2bb3c476c Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType

6a94a48a9d refactor: refs #6609 sectorType description to code

8e8ee39302 Merge pull request 'refactor: refs #6609 sectorType description to code' (!2008) from 6609-sectorType into dev ...

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

cd613c770c Merge branch 'dev' into 6184-saveCmr

53a367f4b3 feat: refs #6371 cleanTablesFix

18a27e032f Merge branch 'dev' into 6778-changeViewDependencesVn2008

30069ded15 fix: refs #6806 fix date filter

c2360ca154 refs #6559 feat:quit call get_sectors

36683597ec refs #6559 feat:quit call get_sectors

4f9c1b8c95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData

08728d3162 refs #6651 feat:add urlImage

02bf78d00a feat: refs #6830 item_getLack origin

f18191d6e9 refactor: refs#6706 root dir clean, minimist dep removed

26d4dbbe34 fix: refs#6706 docker-compose.yml fixes

8cef56f4f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData

e5f2be9f9c Merge pull request '#6272 updateFiscalData' (!2001) from 6272-updateFiscalData into dev ...

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

3f08cdd51c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter

dcefc9d382 refs #6651 feat:add urlImage

463b3fb6f3 feat: #6392 solveConflicts

0cea80ad46 Merge branch 'dev' into 6501-procMigration

cc863a65f6 refactor: refs #6501 Migrated procs from vn2008 to vn

22e6f547fa refactor: refs #6501 Migrated procs from vn2008 to vn

2d6c56cd26 Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration

dbe63ad11b refactor: refs #6501 Fix grant errors

3e57bf2b34 refs #6791 remake negativeBases

4075375d6e fix: refs #6379 get mail

1597f17230 refs #6791 remove intro

e03e871529 Merge branch 'dev' into 6791-negativeNickname

3ee63e489e Merge pull request 'refs #6791 remake negativeBases' (!2017) from 6791-negativeNickname into dev ...

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

e0de498f65 fix: refs #6379 add Error & locale

e61b6b0c13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail

362d825202 fix: refs #6443 #6444 #6445 ChangeRevokeToGrant

c3b0a8260a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter

9cf5edb26e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail

e96b14ad04 Merge pull request '#6806 fix lastEntriesFilter' (!2013) from 6806-fixEntryFilter into dev ...

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

222335809e Merge branch 'dev' into 6443-6444-6445-fix-permissions

1be1990936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail

a0599403c8 Merge pull request 'fix: refs #6443 #6444 #6445 ChangeRevokeToGrant' (!2019) from 6443-6444-6445-fix-permissions into dev ...

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

1f99450ecb Merge branch 'dev' into 6651_itemShelving_get

278337dc97 Merge pull request 'refs #6651 feat:add urlImage' (!2015) from 6651_itemShelving_get into dev ...

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

b06f80e091 refs #6446 Delete function nz from db

80bae4fdac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail

d60a95feaa fix: refs #6379 await & locale

c818601552 feat: #6392 constraint solved

a18ddc8e9a Merge branch 'dev' into 6392-balance-produccion-propia

d7e51e01a2 Merge pull request '#6379 fixDriverRouteEmail' (!2018) from 6379-fixDriverRouteEmail into dev ...

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

fc5daf119c Merge branch 'dev' into 6501-procMigration

212bf58932 refactor: refs #6501 Minor change

f89ae0aad9 refactor: refs #6501 Minor change

23bf9b2750 refactor: refs #6501 Minor change

4b5802202d refactor: refs #6501 Minor change

fb76381624 refactor: refs #6501 Minor change

8a7441be57 feat: refs #6371

ead206bd92 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix

534b5bb05a fix: refs #6106 where filter

ee67a02bf0 refactor: refs #6501 Minor change

96d6637a3f refactor: refs #6501 Minor change

00109e86af Merge branch 'dev' into 6778-changeViewDependencesVn2008

474c616b86 Merge branch 'dev' into 6446-Delete-function-nz-from-DB

0ed5a0ff16 Merge pull request 'refs #6446 Delete function nz from db' (!2022) from 6446-Delete-function-nz-from-DB into dev ...

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

3c7fda87c8 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix

fb84fe4b97 refactor: refs #6501 Requested changes

c4528a9eac Merge branch 'dev' into 6501-procMigration

97f02187e3 Merge branch 'dev' into 6184-saveCmr

8f4b901818 Merge pull request 'refs #6184 saveCmr' (!1788) from 6184-saveCmr into dev ...

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

a897a05e8b feat: refs#6685RestoreViewCredit

118fbcb94f feat: #5720 vehicle nuevos campos

5b137ad825 Merge pull request 'feat: refs #6685 RestoreViewCredit' (!2028) from 6685-fixRestoreViewCredit into dev ...

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

3b35e4dae8 refs#6685 RestoreViewCredit

4feae72ee3 Merge branch 'dev' into 6685-fixRestoreViewCredit

e08fb3d229 fix: refs #6184 Minor change

41db1c924f refactor: refs #6781 Deleted timeControlDevice

6116ada156 fix: refs #6813 remove inserts

c8e13fa858 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView

744171dd4c fix: refs #6184 Requested changes

995e249495 Merge pull request '#6106 where filter' (!2024) from 6106-fixSignView into dev ...

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

b449da28ef Merge branch 'dev' into 6184-externalCmr

bbb3f3807a Merge pull request 'fix: refs #6184 Minor change' (!2031) from 6184-externalCmr into dev ...

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

4f9b46346f fix: refs#6706 back tests spec timeout reduced

185cc4f17f feat: refs #6693 revisar triggers

51afb87122 feat: #6392 cambia gasto

68034fc404 Merge branch 'dev' into 6685-fixRestoreViewCredit

51b336d9f7 Merge pull request 'refs#6685 RestoreViewCredit' (!2030) from 6685-fixRestoreViewCredit into dev ...

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

b1fa834626 refactor: refs #6775 Deleted proc itemProposal_Add

d3755d6aa2 Merge branch 'dev' into 6775-itemProposalAdd

d7fb31ee60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient

db2919b482 fix: refs #6813 procedure

ed67b1168f refactor: refs #6501 Requested changes

3c6e3a9856 Merge branch 'dev' into 6501-procMigration

579f2abe5b fix: refs #6813 remove quotation marks

bf6d068830 Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev ...

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

76b4f8f46f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient

9bd8c21660 Merge pull request '#6813 fix creditClient' (!2026) from 6813-fixCreditClient into dev ...

Reviewed-on: #2026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>

42de1a7e51 Merge branch 'dev' into 5586-optimizeNegativeBases

bdc6192a7c refactor: refs #5586 Optimized SQL negativeBases

92261ebe0d fix: refs #5586 Tests fix

9f40cbc123 Merge branch 'dev' into 6669_ticketClosure

cf0d7e04a1 rounding stickers down

c9294680a5 Merge branch 'dev' into 6693-revisarTriggersPendientes

add5fedc4e Merge branch 'dev' into 6830-item_getLackOrigin

11bbab6288 Merge pull request 'feat: refs #6830 item_getLack origin' (!2025) from 6830-item_getLackOrigin into dev ...

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

999d9a0f9c fix: refs#6706 E2E show parameter fix

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

27d7a114e6 fix: refs#6706 package.json dbtest script removed

19bbb4a4bf fix: refs#6706 package.json deprecated scripts removed

142c1bf7bd Merge branch 'dev' into 5586-optimizeNegativeBases

9dd5b725e1 Merge branch 'dev' into 6501-procMigration

d83823ed0e Merge branch 'dev' into 6778-changeViewDependencesVn2008

c2dadc09a2 feat: refs #6693 comprobar triggers

6fe6e35607 Merge branch 'dev' into 6693-revisarTriggersPendientes

f765fcca2c Merge pull request 'feat: refs #6693 revisar triggers' (!2033) from 6693-revisarTriggersPendientes into dev ...

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

4cfe4cf96d Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix

3665db359e feat: #63922 actualiza usando las fk

f608eb1859 Merge pull request '#6386 - Download method add file with extension' (!1993) from 6386_imageWithNoFormat into dev ...

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

fb44052a09 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix

874f776498 refactor: refs #6501 Requested changes

cddb8dc216 Merge branch 'dev' into 6501-procMigration

0ee5226dcb Merge pull request 'feat: refs #6371 cleanTablesFix' (!2011) from 6371-limpiezaTablasVn2008Part1Fix into dev ...

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

08db19bf4e Merge branch 'dev' into 6501-procMigration

b64637254b refactor: refs #6501 Requested changes

b815677a1f Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration

b46087b75c refactor: refs #6501 Requested changes

267fd8beb8 Merge pull request 'refactor: refs #6501 Migrated procs from vn2008 to vn' (!2016) from 6501-procMigration into dev ...

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

2c82a64029 Merge branch 'dev' into 6778-changeViewDependencesVn2008

18c10e2dd7 refactor: refs #6778 Requested changes

35fc8930ce fix: refs #6778 Fix and tested

8ee8fe1851 Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008

32f8d13359 fix: refs #6760 back modified & revoke update on ticket.clientFk

a690401b33 Merge pull request 'refactor: refs #6778 Migrated views of vn2008 to vn' (!1996) from 6778-changeViewDependencesVn2008 into dev ...

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

88f508a424 fix: refs #6371 balanceNestTree add constraint

d7efdacab3 Merge branch 'dev' into 5720-poolbancario

e21f8aafe0 Merge pull request 'fix: refs #6371 balanceNestTree add constraint' (!2039) from 6371-fixCreateConstraint into dev ...

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

798bd10303 Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev ...

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

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

05b7c37b94 fix: refs #5586 Rollback

46a1ad35b5 Merge branch 'dev' into 5586-optimizeNegativeBases

10bfb7a7d7 fix: refs #5586 Minor change

8c262df31e Merge branch '5586-optimizeNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix into 5586-optimizeNegativeBases

6691155217 Merge branch 'dev' into 6392-balance-produccion-propia

fa7b94590d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient

5a0ce700b3 fix: refs #5586 Requested changes

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

256aa76e23 Merge branch 'dev' into 5586-optimizeNegativeBases

bec574ff99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti

f63abc1a6e fix: refs #6859 zoneEstimatedDelivery

be7a570314 fix: refs #6776 test

a9ccbfc1d4 Merge branch 'test' into dev

38cfb6e03e build: refs #6859 Merge from test

acc9d05530 build: refs #6859 pnpm-lock.yaml updated

8cb17762f8 refs #6863 deployt: init version 24.10

4b568bc41e Merge branch 'dev' into 6775-itemProposalAdd

98ad133afd Merge pull request 'refactor: refs #6775 Deleted proc itemProposal_Add' (!2034) from 6775-itemProposalAdd into dev ...

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

27627017c5 feat: #6392 fk que faltan

f11aa2605b feat: refs #6776 back & procedure modified

3d25b599ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti

78583751ec refactor: refs #6760 ticketsIds improved

ca438c7c7f Merge branch 'dev' into 6669_ticketClosure

a76872a082 refs #6669 fix:ticket_isOutClosureZone

556a67ecfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient

bf67c2348d refactor proc

f048412ad5 Merge branch 'dev' into 6358-boxPicking_ultimate

a79ddc1c6c Merge pull request '6358-boxPicking_ultimate' (!2044) from 6358-boxPicking_ultimate into dev ...

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

f8ceca3575 Merge branch 'dev' into 6760-modifyTransferClient

3cf61537b3 Merge pull request '#6760 modify transferClient' (!2035) from 6760-modifyTransferClient into dev ...

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

59ea47a8c3 refs #6414 tback

8cecff36ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti

69acebb43c fix: refs #6776 replace name

f4ea220578 Merge branch 'dev' into 6559_getSectors

15de4f0b73 refs #6531 feat:showLastTickets

dff70e57c1 Merge pull request '#6559 _getSectors' (!2014) from 6559_getSectors into dev ...

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

3ef26bfd7d packing

ad1010f3fc Merge branch 'dev' into 6358-boxPicking-BluePinguin

3193d17b5d Merge branch 'dev' into 6669_ticketClosure

5b541aa804 refs #6531 feat:modify name

adeca2bb22 refs #6531 feat:modify name

3a4463d0a4 Merge pull request 'refs #6531 feat:showLastTickets' (!2045) from 6531-showTickets into test ...

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

882c179e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti

fc6e34ddfd fix: refs #6776 replace name

7a0320270a Merge pull request 'test' (!2048) from test into dev ...

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

a656447fdb Merge branch 'dev' into 6669_ticketClosure

7e9d222b35 Merge pull request 'refs #6669 fix:ticket_isOutClosureZone' (!1984) from 6669_ticketClosure into dev ...

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

f0d59f12e6 Merge branch 'dev' into 6358-boxPicking-BluePinguin

84a93cafd2 Merge pull request 'packing' (!2046) from 6358-boxPicking-BluePinguin into dev ...

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

d127354905 Merge branch 'dev' into 6776-makeMulti

6720ef89b9 Merge pull request '#6776 makeMulti & itemShelvin_add refactor' (!1970) from 6776-makeMulti into dev ...

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

8642ddcd7f Merge branch 'dev' into 6392-balance-produccion-propia

2c1172bd88 feat: #6392 sin gastos

c53ff1243f feat: #6392 no es necesario agencyTermConfig

a7c48e9132 feat: #6392 quito de fixtures para que no falle la fk

175f141fbe Merge pull request '6392-balance-produccion-propia' (!2009) from 6392-balance-produccion-propia into dev ...

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

6daa7a03ff Merge branch 'dev' into 5586-optimizeNegativeBases

4d2637764e Merge pull request 'refactor: refs #5586 Optimized SQL negativeBases' (!2007) from 5586-optimizeNegativeBases into dev ...

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

4952e0be20 hotFix(getUrl): fix prop name environment

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

f3511d4a43 refs #6414 tback

b9fe990003 refs #6834 feat:handle Error

be81835474 refs #6834 feat:handle Error

614652c357 refs #6834 feat:handle Error

448763ee72 refs #6834 feat:handle Error

7514348d13 Merge branch 'dev' into 6414-testBackClient

1328a8fa96 Merge pull request 'refs #6834 feat:handle Error' (!2057) from 6834_sectorCollectionSaleGroup_add into dev ...

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

94359ea3db Merge branch 'dev' into 6414-testBackClient

b4a0688bfc Merge pull request 'refs #6414 tback' (!2051) from 6414-testBackClient into dev ...

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

f30a5a7597 refs #6626 invoiceInTax different transactions

84270d29b8 refs #6626 modify invoiceInTax

fba353f8e4 feat: refs #6371 restore Proveedores_cargueras

2ab1cebb31 Merge pull request 'feat: refs #6371 restore Proveedores_cargueras' (!2061) from 6371-restoreProveedoresCargueras into test ...

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

4a8707e327 Merge pull request '6626-Restricción-en-invoiceInTax' (!2060) from 6626-Restricción-en-invoiceInTax into dev ...

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

c4a64b93cc Merge branch 'dev' into test

01f1bd0088 Revert "Merge branch 'dev' into test" ...

This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.

cbe23d8df5 Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test ...

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

60dfe8ec05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8

pablone approved these changes 2024-02-22 07:02:15 +00:00

alexm merged commit 5d195f5d82 into master 2024-02-22 07:31:34 +00:00

alexm deleted branch test_master24_8 2024-02-22 07:31:34 +00:00

alexm referenced this issue from a commit 2024-02-22 07:31:36 +00:00

Merge pull request 'refs #6915 test_master24_8' (!2067) from test_master24_8 into master

Sign in to join this conversation.

Reviewers

No reviewers

pablone

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

No description provided.