refs #4614 fear(ticket): add 'set weight' funcionality #1487

Merged

alexm merged 7 commits from 4614-ticket_weight into dev 2023-07-10 07:22:12 +00:00

Conversation 0 Commits 7 Files Changed 12 +164 -92

alexm commented 2023-04-26 11:50:02 +00:00

Member

Copy Link

No description provided.

alexm added 1 commit 2023-04-26 11:50:03 +00:00

c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality

jgallego approved these changes 2023-06-07 13:16:13 +00:00

alexm requested review from jgallego 2023-06-07 13:19:53 +00:00

jgallego refused to review 2023-06-07 13:19:58 +00:00

alexm added 948 commits 2023-07-05 10:53:05 +00:00

759a140e61 feat(print): create entry-update-comission template ...

refs #4586

31d23f7dd1 feat(print): create entry-update-comission template ...

refs #5112

d5daa172d5 refs #5112 feat(print): create entry-update-comission template

8679aefb48 refs #4713 procs deprecated, originalQuantity deleted

dfb4701a18 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking

ed6edfed45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking

106f96b9a6 refs #4713 fixed front test

0579c563b9 refs #5327 ordernar por columnas

34126119e2 fix errors

5b80951e3e refs #5517 vnLog: View improved

12074bd0f4 refs #5517 vnLog: watchers fixes

7f18366ece refs #5517 Relative dates, style fixes

ae22c58ecb refs #5517 JSON value component code clean, max str len increased

3cc6191696 refs #5517 Show abr month name in relative date

f7191f0f7f refs #5517 log relativeDate function fixes

faab024e24 test

9f4d027014 refs #5316 sql

d7d4b9515e refs #5517 json value and date format fixes

cc9ce65678 test

cd6a6f65b3 Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas

d21ab7a5a7 refs #5316 primer kkeo

1ce2705869 refs #5316 last kkentry

117849f093 refs #5540 supplier js

60103fa80a refs #5540 validacion nif

747efc4342 refs #5540 sql mod

2a2d03e05a refs #5517 añadidas traducciones de algunos modelos

9594bd68b5 refs #4795

ad267c933c refs #5540 country.code

3790e3457f refs #5517 añadidas más traducciones

2ada64e1bf refs #5517 eliminadas traducciones duplicadas

0bfdbcb750 refs #4617 use temporary instead of vn

60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes

d399cda050 refs #5316 quitar comment

0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice

db19f153fb refs #5488 removes 'role =='

bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

61d41fb687 refs #5507

c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole

39333a9119 refs #5488 replace hasRole for checkAccessAcl

d6e6dab03b Merge branch 'dev'

088f2f9181 Merge branch 'dev' into 5540-validarSupplierIsVies

6f1744baff Merge branch 'dev' into 5517-improveLogs+translations

9694a35343 refs #5517 Added: Tests, filter panel, model and props titles

d8b5659a5d refs #5540 client vies

10def65a3f Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies

397d8f658e refs #5540 error trad

294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

faee5ccd7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono

9f04581862 refs #5542 "importar reclamacion" crea un registro en ticketRefund

2b74ab43ae refactor front

e24366707b refactor: añadido focus a la seccion usuarios

bf558761a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor

cd4f66e292 refs #5540 arreglar e2e

67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies

9b432bac85 refs #5542 fix: test

4983aa1632 refs #5542 fix backTest

081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations

8502b74dee feat(): replace hasRole to checkAccessAcl

a053764122 refs #5517 E2E fixes

49368a837b refs #5517 Filter improved

4cb231759f feat(State/Supplier): replace hasRole to acls

11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor

618100b68a refs #5542 eliminados procesos que no se usan

a6653c5622 refs #5542 fix e2e

0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl

28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

e8ce8e42fd refs #5153

af0523a155 refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior

d6ff61b768 refs #5468 corregidas condiciones de autorización

af875dd67e Merge

b25071f52b refs #5316 solve e2e

2e5a43af68 refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser

a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes

74d543884e refs #5468 añadido scope al modelo VnUser

1219cfcc5c refs #5255 fixed condition

c580be2790 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required

37a7d02006 quitado scope

8a9e4ccefb refs #5468 fix e2e

c69e038a56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor

480784ee18 refs #084200 cambio nombre

878f232fda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking

f793dd2a82 Merge pull request '5542-refund_refactor' (!1480) from 5542-refund_refactor into dev ...

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

09c1d7e393 refs #084200 add table

15df9518ab Merge branch 'dev' into 084200-arreglarChanges

5844da4474 refs #4713 updated sql

09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados

636154e4fa Merge pull request '084200-arreglarChanges' (!1488) from 084200-arreglarChanges into dev ...

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

8bb8b8cfba refs #5594 fix backTest

22b223038a delete focus

2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice

990bfc63a8 Merge branch 'dev' into 4795-client_getDebt

9b13e3fd2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

34bb216f17 deploy(231601): dev to test

099ed2578c Merge pull request 'deploy(231601): dev to test' (!1490) from 231601_dev_to_test into dev ...

Reviewed-on: #1490
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

dd4d0bca84 refs #5540 delete tinIsValid, solve test back, e2e

f8f4e14351 Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies

3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing

7f8f65567f Merge pull request 'fixes #5255 Revisar ticket/boxing' (!1486) from 5255-revisar-ticketBoxing into dev ...

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

07148f6c29 refs #5540 mon message

d15a671359 refs #5540 traduccion

08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies

e1864fec09 arreglo json

51624882e8 Merge branch 'dev' into 4795-client_getDebt

66986d3c21 Merge branch 'dev' into 5316-kkeoEntryNotes

7189f7dc79 Merge pull request 'refs #4795 clientGetDebt → client_getDebt' (!1442) from 4795-client_getDebt into dev ...

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

1597f7ab69 refs #5468 permitir acceso al módulo 'Usuarios'

87ffd2668e refs #5468 scope para VnUser

42fc0b62d8 refs #5472 feat(user): add passExpired

6e3e2cf798 refs #5517 Filter RC

2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations

b8f7f7bd69 refs #5540 create validateIban

42e3c8f29d refs #5488 fix(): use hasWriteRole

cdbbec9d36 refs #5540 validate

8651898a1f Merge branch 'dev' into 5153-worker-sin-tr

4982fb254c refs #5517 Final style fixes, production ready

14170286d7 Merge pull request '5517-improveLogs+translations' (!1439) from 5517-improveLogs+translations into dev ...

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

e70b0b22f3 refs #5517 Code clean

c3038a4d61 fix(imageCollection):

e00edf0266 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

38142c121d refs #5540 mods client

c0deb745d6 refs #5540 arreglo en supplier

ac55dc4cc7 refs #5297 feat(worker_new): add payMethod

a89f400f10 use iban

0e0db960af refs #5540 supplier

fb59371d54 refs #5540 quit logs

06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies

eb2c2b386a refs #5517 Duplicated pagination removed

ddec9fe406 refs #5517 Set tests timezone

ed6b2cf25b refs #5615

659d76f022 Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master ...

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

d9aae670f7 Merge branch 'dev' into 5540-validarSupplierIsVies

8156c17c7d refs #5540 del jasmine

5436eec63e Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies

4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice

48be8b9fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

ea73e7697d solve

754c5488bf Merge pull request '5540-validarSupplierIsVies' (!1438) from 5540-validarSupplierIsVies into dev ...

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

306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice

ca2ab8d7b2 Merge branch 'dev' into fdescribe03-fiscal-data

88b4abc2d2 Merge pull request 'solve' (!1495) from fdescribe03-fiscal-data into dev ...

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

17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes

79e7e7c604 refs #5472 feat: add change-password section

a5c11a0154 refs #5517 Hide worker image on error

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

a029071c4e refs #5517 User image fixes

3f9d711f90 Merge branch 'dev' into 5316-kkeoEntryNotes

34a9b3768c Merge pull request '5316-kkeoEntryNotes' (!1449) from 5316-kkeoEntryNotes into dev ...

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

2467534d1f refs #5090 mod golabel

bf3aac70f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice

bbd2137e57 refs #5517 Avatar componetized

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

eaf425fb51 refs #5328 mod funcion createTicketRefund

3b2e1ca8d5 ref #5328 refundTicket.id

566f03c497 refs #5328 commit prueba

3ac1ce403c refs #5328 myOptions

5aaef31562 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket

dbd0e5138b refs #5328 fix

ad3c6dcee2 wip #5595

a712c0a303 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice

b2027fddf3 fix(client): use account setPassword

5eca583c62 refs #5472 feat(vnUser): override setPassword

b64f6d8489 Merge pull request 'refs #4617 use temporary instead of vn' (!1451) from 4617-use_tmp_in_ticketToInvoice into dev ...

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

a2d3b79246 Merge branch 'dev' into 4713-saleTracking

2e020b5ebb fix(): correct version

e93b1cba63 Merge pull request 'fixes #4713 ENC - Modificar como se generan los avisos de cambios de cantidades al encajar' (!1374) from 4713-saleTracking into dev ...

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

1fa5926c17 Merge branch 'dev' into client_use_account_setPassword

9030aea17c Merge pull request 'fix(client): use account setPassword' (!1500) from client_use_account_setPassword into dev ...

Reviewed-on: #1500
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

b3100d2653 refs #5595 remove OkPackets from logIn and logOut

54eb0fc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs

677764f302 refs #5517 Fix e2e

49233eefcd refs #5580 add button, yml

cfc02cd669 Merge branch 'dev' into 5090-modGolLabel

8578e3ca49 Merge pull request 'refs #5090 mod golabel' (!1496) from 5090-modGolLabel into dev ...

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

a22a8a6bd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

8ae5a0de0f refs #5513 adding backs and models

5cdec35ed4 refs #5513 addFromPackaging.spec.js

404acdab6f refs #5638 fix: solucionado problema con el limit

2da4289695 refs #5472 feat(vn-user): override change-password & set-password

a48e197e46 refs #5517 E2E fixes

4a84961c19 refs #5517 Removed focus from test

805e678ca7 Merge branch 'dev' into 5517-e2eFix

c5dcc39375 refs #5517 test(e2e): fix ticket future and advance

ea3110dc2e refs #5517 test(e2e): fix ticket future and advance

0f08ea1852 Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix

030cedbb3c amend

ea5b032b40 refs #5517 Travel create E2E fixes

bfae4940f5 Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix

6f5c5963d0 refs #5517 fdescribe removed

97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method

6b4b8565f9 Merge branch 'dev' into 5488-use_checkAccessAcl

456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

8423968013 Merge branch '5488-use_checkAccessAcl' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

728ef965c4 refs #5472 feat(out_login): change-password

a51481c00e Merge pull request 'refs #5517 Fix e2e' (!1502) from 5517-e2eFix into dev ...

Reviewed-on: #1502

7e63bc0004 refs #5297 quit fdescribe

d21b949ffb refs #5513 fix getItemsPackaging

372b9a2ce2 refs #5513 test getItemsPackaging

a2055d35fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes

2c6f71b4c4 Merge branch 'dev'

96b5749e1e refs #5297 cambio actual

73fb940c63 refs #5472 try change-password

7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl

68b1b6c5bd refs #5517 E2E fixes

ebbc860ba3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

ad3c34bd35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test

90465c275a correct folder

dde62f8971 Merge pull request '231801_dev_to_test' (!1501) from 231801_dev_to_test into test ...

Reviewed-on: #1501
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

e019ab4160 deploy(232001): add changes folder, package and changelog

3f414e28cc Merge pull request '231801_test_to_dev' (!1507) from 231801_test_to_dev into dev ...

Reviewed-on: #1507
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

9f02fc66c8 refs #5517 Show spinner when loading

0b2c91466e refs #5648 create vn-confirm

3b8d670c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

2aaded4ed4 refs #5517 Fix: Show spinner when loading

a2e71b57a2 refs #5517 Front test fix

35a888a968 refs #5517 Pagination spinner fixes

7a668adf18 refs #5517 pagination fixes

461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice

313c641cd7 move chages sql

ca8373d7f7 feat(acl): add specifics acls to ticket, claim, state and worker

eb3003e0f5 Merge branch 'dev' into 5580-buttonLink

a8bb0aa196 Merge pull request 'refs #5580 add button, yml' (!1503) from 5580-buttonLink into dev ...

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

8c0deb6cfa test(e2e_order): fiter optimized

3b8cafc783 fix(ticketConfigSql): correct folder

706c62f624 typo

df1803a2e3 refs #5517 Front test fix

e97d063832 Merge branch 'test' into fix_orders_e2e

61d6f47162 refs #5599 remove returns

9ab850b34d Merge pull request 'test(e2e_order): fiter optimized' (!1510) from fix_orders_e2e into test ...

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

f4be69c85c refs #5599 select state.classColor

62dd64eb89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

49e2c38ddd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev

1654cc410a Merge pull request 'test_to_dev' (!1513) from test_to_dev into dev ...

Reviewed-on: #1513
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

ded8e0e141 refs #5137 added trigger, template and test

3166a9e420 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora

29e0562c8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

f72c162ca7 Merge branch 'dev' into 5137-aviso-impresora

74ea0ce9fd refs #5468 actualizados acls

3b0ce7d2c1 Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora

c59915f951 refs #5599 procedure

a345265a89 refs #5488 specifics acls

9a813c075c refs #5599 procedure y colorClass

e258e779b3 refs #5599 ticketFuture

2111ca0993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors

43a91194fd refs #5599 remove e2e

7704256079 master to test

4818e985ff Merge pull request 'master to test' (!1515) from 231801_master_to_test into test ...

Reviewed-on: #1515
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

7bcb00c127 refs #5655 removed relation

8ed17d99c3 refs #5327 permite filtrar por columnas (desde el front)

f00643505d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas

a7fcd8a1bf changes

59f4b63db7 borrado espacio

90b844062d refs #5327 add frontTest

2ed99426ef eliminado focus

43ab07d954 refs move reports views

d0c8be5697 refs #5517, #5667 Fix crudModel status, log fixes

8a843b37bd refs #5160 Back test timeout workaround

35b6642095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors

5924a557e9 Merge branch 'test' into footnotesSolve

f53eef0455 Merge pull request 'refs move reports views' (!1518) from footnotesSolve into test ...

Reviewed-on: #1518
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

30e71a9d5e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 231801_test_to_master

1d6a541b02 test into master

b10f90fbe1 refs #5468 a la seccion privileges se le pasa el parametro user

fd85cd2d98 refs #5599 replace

0dea1dfd9e Merge branch 'dev'

65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr

598fe7ac0d Merge pull request '231801_test_to_master' (!1519) from 231801_test_to_master into master ...

Reviewed-on: #1519
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

9760e50212 refs #5513 minor fixes

3f26072787 refs #5468 eliminados getters a VnUser

b9ec6b93b6 Merge branch 'dev' into 5655-afinar-login

f6e1ffa849 refs #5517 Log loader fix

943e8b09c1 refs #5599 DELIMITER

9cbf3006a0 refs #5599 futureState

4abc8521d3 refs #5517 Style fixes

ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket

8419c76b12 refs #5153 worker sin tr

ea6837e33a refs #5579 export structure and data

248caf8519 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

0aa12a5efb hotFix(worker_new): use postcode not postalCode

7d589d5101 Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master ...

Reviewed-on: #1520
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

d5f5115980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice

9ce3e79e00 refs #5594 eliminado archivo ducplicado

08fcbebbaf refs #5488 polish specifics acls

6300ee4be4 refs #5600 foto de los trabajadores cuadrada

3e33030b1d refs #5579 update mariadb version to 10.7.6

a1a3f910d3 hotFix(reset-passowrd): use model vnUser

504791fd6d typo

1dcce0f3ee Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master ...

Reviewed-on: #1523
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

9f0d5097fe refs #5160 increase jasmine timeout

799045314f Merge pull request 'refs #5160 increase jasmine timeout' (!1524) from 5160-increase_jasmine_timeout into dev ...

Reviewed-on: #1524
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

3d05b79748 Merge branch 'dev' into 5153-worker-sin-tr

addd53feca Merge pull request 'refs #5153' (!1483) from 5153-worker-sin-tr into dev ...

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

62d0af25d3 refs #5642 uncommented tests

191fb72331 test jenkins

7f881409fc refs #5579 fix mockTime

30d6f56c39 refs #5667 Style fixes, model translations

d8eeacb371 refs #5667 Translation improved

dd9699e120 refs #5667 Translation fix

c9af22780b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export

cc23fd1337 refs #5579 fix mockTimes and remove userLog_add

eaaa860e97 Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice

c7da71d8c0 Merge pull request '5594-sendPdf_whenMakeInvoice' (!1489) from 5594-sendPdf_whenMakeInvoice into dev ...

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

fa40bd9811 refs #5667 Style & translation fixes

f55e5f9f74 refs #5667 Business translations

058f828b92 refs #4548 fix(invoiceIn): report use invoiceIn.issued

c8c7f52408 Merge branch 'master' into hotFix_invoiceIn_issued

f9fdf80350 refs #5667 Item translations added

0d980334b8 refs #5634 conditional merge

0d51987d47 refs #5667 Client sample translations

60bfb1b079 refs #5689 fix pixels

e7f9984b4b refs #5667 Fix decimal places

cd34ccad8f refs #5579 use variable

b1bbc22afc Merge branch 'dev' into 5579-db-export

c31eee4906 refs #5696 landed

6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl

69a25d8d03 refs #5696 horas a 00

02451818ef typo

1933341220 Merge pull request '5696-ReclamacionesFueraDePlazoLanded' (!1532) from 5696-ReclamacionesFueraDePlazoLanded into master ...

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

e8e04423f0 refs #5667 Atrs ordered by name

14d353f44e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

48da4b13ff refs #5667 Ticket translation fixes

ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev

665a933a0f Merge pull request '232001_test_to_dev' (!1535) from 232001_test_to_dev into dev ...

Reviewed-on: #1535
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states

da5e6a43f6 set changes in changelog

e17b9a32b9 add schema

36205e75be feat(232201): new version

3af2b8c3ae Merge pull request '232001_dev_to_test' (!1536) from 232001_dev_to_test into test ...

Reviewed-on: #1536
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

7c76521b02 Merge pull request 'feat(232201): new version' (!1537) from 232201_dev_version into dev ...

Reviewed-on: #1537
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

2ef922e80c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

b66362d313 refs #5638 fix: cambiado nombre de variable

c76b84d3cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states

9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'

463d209d77 refs #5638 refactor: eliminado if innecesario

d33a84c39f refs #5638 feat: updated backTest

703ab3439a refs #5638 fix: intermittent e2e

4bcb461d36 refs #3628 added check & date-picker

2591d2d115 refs #3628 added check & date-picker

cbbb571638 refs #3628 changelog

814568f2a9 refs #5297 errors solve, trad

d389860704 refs #5609 eliminadas peticiones duplicadas

ec02972efb refs #5609 mostrar filtro por defecto

15a1965a53 refs #5094 add scopes

e8376c00a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora

f54d9180b1 fix front test

ca9d76db77 refs #5137 moved sql

d70a31bfbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes

37b2920157 refs #5513 moved sql

2b1e951692 refs #5635 smart-table

bbc34f04ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

2402b27632 Merge branch 'dev' into 5600-workerPhoto_incorrectSize

8cf988b7d2 refs #5638 refactor: code

975154c929 Merge branch 'master' into hotFix_invoiceIn_issued

8b0d7eb26c Merge pull request 'refs #4548 hotFix(invoiceIn): report use invoiceIn.issued' (!1527) from hotFix_invoiceIn_issued into master ...

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

5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha

6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI

c7febc9699 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

29610e52cc refs #5667 No detail label fix

a190f2152b refs #5667 Fixes: Translations, help

8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa

f81e9ec23e Merge pull request '5638-ticket.summary_states' (!1538) from 5638-ticket.summary_states into dev ...

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

20b3c4f5b8 refs #5667 Style improved

c1e222db83 refs #5667 Style fixes

718002d5aa refs #5667 Style fixes

c6c15d7c69 refs #5472 feat: changePassword with passExpired

1160cbc279 refs #5667 Fixes: Style, translations, icons

35331e355f refs #5667 Fixes: Colors, translation

08e0bf7ddd refs #5667 Color fixes

a4beb84e66 refs #5667 Translations fixes

69b892f2fd refs #5667 Translations

e08f848812 refs #5667 Model id html fix

32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

23287e5ebf refs #5648 setTimeout

e9222dbcb7 Merge branch 'dev' into 5689-fixedPricesSize

a731cbf0cd Merge pull request 'refs #5689 fix pixels' (!1530) from 5689-fixedPricesSize into dev ...

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

ddab59a10c refs #5472 refactor(changePassword): convert in async

1b19035d8d refs #5648 vn-confirm

03d69f81c5 Merge pull request 'refs #5094 add scopes' (!1540) from 5094-test_docuware_autoSend into test ...

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

9bc20493fe #refs #5648 e2e fix

6093cb4794 Merge branch 'dev' into 5648-sureClaim

e589e70e06 Merge branch 'dev' into 5655-afinar-login

c15e77f5c1 Merge pull request 'fixes #5655 Afinar login' (!1516) from 5655-afinar-login into dev ...

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

6d147e7af7 refs #5648 fix spaces

5e651d7b8c Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

fb4697e8fa Merge branch 'dev' into 5648-sureClaim

c42400a637 Merge branch 'dev' into 5579-db-export

3189799b4c correct type

380287b819 Merge pull request 'correct type' (!1545) from 5094-fix_id_type into test ...

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

a7c59f51b9 Merge branch 'dev' into 5599-ticketColors

3994e65040 refs #5648 spaces fix2

71ba45c580 Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim

f030ecd2a7 Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev ...

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

26c2ab867d Merge pull request 'master into test' (!1546) from master into test ...

Reviewed-on: #1546

da0aa57539 Merge branch 'test' into dev

b65ebc6af3 refs #5468 feat: cambiados acls

0045edb698 refs #5094 fix get email

0e11bfab0b refs #5581 ticketId != id

6f0c3eeb29 Merge pull request 'refs #5094 fix get email' (!1548) from 5094-fix_email into test ...

Reviewed-on: #1548
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas

8ee581eb67 Merge branch 'dev' into 5648-sureClaim

6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

ee8685329f Merge branch 'dev' into 5599-ticketColors

dc244b5567 refs #5488 remove State_seeFilteredEditableStates

3b7b31deb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

bf8d82f3c6 refs #5581 refresh model

aea39dd0b7 refs #5468 feat: modificalos acl de VnUser

ec1a203430 Merge pull request 'refs #5648 create vn-confirm' (!1508) from 5648-sureClaim into dev ...

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

0c673e43bc refs #5639 smart-tabla defaulter

9426ff204f refs #5468 fix: testFront

d7d94796d6 Merge branch 'dev' into 5599-ticketColors

53e55de605 refs #5579 fix(route_index): order

9500e99b86 Merge branch 'dev' into 5579-fix-order

73c2ae9fdc refs #5581 changelog

64fbd5d2c7 Merge pull request 'refs #5579 fix(route_index): order' (!1551) from 5579-fix-order into dev ...

Reviewed-on: #1551

84abba5566 Merge branch 'dev' into 5599-ticketColors

4bed88faf5 refs #5468 fix: e2e test

6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto

766d809523 Merge pull request 'refs #5599 remove returns' (!1511) from 5599-ticketColors into dev ...

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

96163cb07f refs #5468 feat: update acls

7fd2927ec9 refs #5639 smart-table country

db7d3b6868 refs #5639 payMethodFk

940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'

e2bea16e68 refs #5639 select country, paymethod

191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'

db55c3e81b refs #5468 fix: fornt test

b7e3e9fa71 refs #5468 feat: add testBack

0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

4f5bd95d21 refs #5639 order

9a5511f083 REFACTOR(node_version)! update to v20

f0b3177e21 Merge branch 'dev' into salix-node20

2d06f42493 refs #5639 defaulterView

91207c5a3c refs #5468 fix: test e2e

c9b4c68b0c refs #5468 refactor: actualizada vista

0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter

af1f92613f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

fe8ad91514 fix node 20

eba945c297 Merge branch 'salix-node20' of https://gitea.verdnatura.es/verdnatura/salix into salix-node20

31b22b759d refs #5639 fix e2e selectors

0dda7791f6 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén

3119ae4471 refs #5609 delete: console.log

c35e2e155f refs #5472 test(changePassword): back

97653d9b8f Merge branch 'dev' into 5581-transferir-lineas

b2f4c02b95 Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev ...

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

68c33efd9a refs #5609 fix: front test

6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl

1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter

3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas

a1bd051112 Merge branch 'dev' into salix-node20

e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required

e43e0a8f9f Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev ...

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

6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)

0f66e56390 Merge pull request 'refs #5639 smart-tabla defaulter' (!1550) from 5639-seccionesFormaPagoYPais(MOROSOS) into dev ...

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

6294fc0435 refs #5297 back&e2e fix changes

a99b7cd4f1 Merge branch 'dev' into 5297-newWorker_iban_not_required

1bd54765f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition

9b363bc7a4 refs #5635 remove vn, smart-table

30c896c975 refs #5678 feat(sale_canEdit): handle exist sale

05fb0a7203 refs #5677 tickets without state fixed

856dcf18cb refs #5677 locations

133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign

49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto

d6d72ed289 refs #5635 smart-table, counter, filter

6b66eb3bb2 refs #5679 typo

d6a0db3fb8 Merge pull request '5297-newWorker_iban_not_required' (!1492) from 5297-newWorker_iban_not_required into dev ...

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

087fa137fd Merge branch 'dev' into 5677-fallo-saveSign

12aa9dee41 Merge pull request 'fixes #5677 Fallo portainer Ticket/SaveSign' (!1556) from 5677-fallo-saveSign into dev ...

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

292d9e038d typo

74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto

de313b6418 refs #3628 Show what's before the inventory

eab329b230 refs #554 feat: actualizar el token automáticamente

834a3aa959 refs #5554 fix: eliminada transacción en el back 'renewToken'

2e69e4eea7 a

03e2b98485 hotFix(closeAll): fix where

4869d81d11 refs #5635 fix back & e2e

0d223bb443 Merge pull request 'fixes #3628 item historical absoluto' (!1539) from 3628-item-historical-absoluto into dev ...

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

43538a8e36 Merge pull request 'hotFix(closeAll): fix where' (!1557) from hotFix_fix_closeAll into master ...

Reviewed-on: #1557
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

42a39b6778 refs #5706 master to test

fdd22ca2d8 refs #5554 codigo eliminado de vnLayout

e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale

0e6501f306 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master

e44fd294ae Merge pull request 'refs #5706 master to test' (!1558) from 232001_master_to_test into test ...

Reviewed-on: #1558
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

1f24314ab2 refs #5635 fix back

02c331ddd6 refs # fix(SQL): wagon

a052c363fa Merge pull request '232001_test_to_master' (!1559) from 232001_test_to_master into master ...

Reviewed-on: #1559
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

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

c5a9eeed44 Merge pull request '232201_test_to_dev' (!1560) from 232201_test_to_dev into dev ...

Reviewed-on: #1560
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

33928aa406 refs #5730 correct folder

310536120e Merge pull request '232201_dev_to_test' (!1561) from 232201_dev_to_test into test ...

Reviewed-on: #1561
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

256f30987f refs #5730 new version 232401

a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale

6010bc1253 refs #5554 movido codigo al vnLayout y parar el evento periódico

1a4ae400c7 Merge pull request 'refs #5678 feat(sale_canEdit): handle exist sale' (!1555) from 5678-sale-canEdit-notSale into dev ...

Reviewed-on: #1555
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

99f87aaf38 Merge branch 'dev' into 232401_dev_init

f471d62d41 refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken

886c4a15b5 refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía

d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket

37a5e6e6c6 Merge branch 'dev' into 5507-loadConfigAtStart

79897d8917 Merge pull request 'refs #5730 new version 232401' (!1562) from 232401_dev_init into dev ...

Reviewed-on: #1562
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

a7363ce2a4 refs #5507 added service

b95ee6cbfa refs #5554 feat: add front test

dfac44a87b hotfix 3rd parameter to null

dd83b25bb2 Merge branch 'master' into hotfix-item_getBalance

fa8fd8d5bc refs #5398 update from oldbranch

91700e096e refs #5554 fix: cambiada extensión de archivos de test, y solucionado test

06d1de5a63 refs #5554 feat: add back test

32badef787 delete console.log

cd508e970d changed structure like prod

ee8ce8f0de Merge branch 'hotfix-item_getBalance' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-item_getBalance

ce211b436d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2

7e5fcc73ad modified fixed structure

a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos

96feb24f12 refs #5252 fix: back test

c46e6cd862 Merge pull request 'hotfix item_getBalance' (!1563) from hotfix-item_getBalance into master ...

Reviewed-on: #1563

375fdf2a21 fix item_getBalance

71d8a355bd refs #5252 fix: te2e

2e0721b101 refs #5667 Fixes: Id filter, translations

27d4d10472 refs #5667 Expedition translation fixes

8d3ee18172 Merge pull request 'fixes #5634 Adelantar el mismo ticket origen a múltiples tickets destino' (!1529) from 5634-ticketAdvance-mismoOrigen-multiplesDestinos into dev ...

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

b9cb812e0d Merge pull request 'fix item_getBalance' (!1569) from master_to_test2 into test ...

Reviewed-on: #1569
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

8adc104cf4 refs #5735 fix currency

be06a65a45 refs #5507 fixed e2e

9e8efff016 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2

3ecfbe2052 refs #5252 refactor: creadas varaibles

527116f1ec refs #5252 fix: te2e

4e3f8f6975 Merge branch 'dev' into 5600-workerPhoto_incorrectSize

f37d93b469 refs #5488 correct folder

60e694423d Merge pull request '5600-workerPhoto_incorrectSize' (!1522) from 5600-workerPhoto_incorrectSize into dev ...

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

95c438b73a refs #5648 move claimSure

ffbc39ca56 Merge branch 'dev' into 5488-use_checkAccessAcl

a22ae3809e Merge pull request '5488-use_checkAccessAcl' (!1482) from 5488-use_checkAccessAcl into dev ...

Reviewed-on: #1482
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

aca6e11983 Merge branch 'dev' into salix-node20

1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData

138d158f4f #refs 5684 remove and mod selectors

e3300d2287 Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance

d313517e14 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas

a232e9ecea refs #5153

fad28dc711 Merge pull request 'refs #5398 update from oldbranch' (!1564) from 5398-Agencys&WarehousesData into dev ...

Reviewed-on: #1564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

1ed8000be9 refs #5642 e2es refactored

1550716b1a Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance

b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX

41b1b2fb3f fix >

d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas

059467a383 refs #5137 sql moved to template

1bb5033729 Merge branch 'dev' into 5137-aviso-impresora

ba850415be refs #5137 moved sql

0d394ec3aa Merge pull request 'refs #5648 move claimSure' (!1571) from 5648-sureClaimFIX into dev ...

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

90cb4e224c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5507-loadConfigAtStart

27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas

94e7e8e321 Merge pull request '5327-ticket.sale_ordenarPorColumnas' (!1517) from 5327-ticket.sale_ordenarPorColumnas into dev ...

Reviewed-on: #1517
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta

3872078507 Merge branch 'dev' into 5328-abonarTodoTicket

ec5a5be9e6 refs #5328 remove spaces

cb664ecec4 Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket

6ff4c4f51d Merge pull request 'refs #5328 mod funcion createTicketRefund' (!1498) from 5328-abonarTodoTicket into dev ...

Reviewed-on: #1498
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

153542d2be refs #5595 taking active connection

81a8f383aa refs #5468 feat: no depender del modulo worker

7d59c6ec0c refs #5468 feat: eliminado acl nativo y añadido a salix.ACL

21448a84dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

20cb1ea821 refs #5468 fix: te2e

e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs

632662c440 refs #5595 added userId in makeInvoice

382bc06075 refs #5153

32bdaa640e Merge branch 'dev' into 5137-aviso-impresora

138f03d891 refs #5137 fix back test

060b2fdf50 Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora

30816f7947 Merge branch 'dev' into 5513-backs-embalajes

4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar

2b34dd19e8 refs #554 delete: test back que falla

46b6625527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

1fd51c191f refs #5513 minor fixes

c0c522c619 Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes

576a5f050e refs #5513 fix back test

2c3869d961 refs #5398 capital letters

d6c588d7eb Merge branch 'dev' into 5398-fixErrorWarehouses

38c0dc2e01 Merge pull request 'refs #5398 capital letters' (!1575) from 5398-fixErrorWarehouses into dev ...

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

a4d7988591 refs #5517 Translations fixes

6d23ef5d1e Merge branch 'master' into 5153---business-type-worker-descriptor

38823f8481 Merge pull request 'refs #5153 client descriptor business type' (!1573) from 5153---business-type-worker-descriptor into master ...

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

eeadd72cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs

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

23c52cc9b5 Merge pull request '5752-master_to_test' (!1578) from 5752-master_to_test into test ...

Reviewed-on: #1578
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

967e07933d refs #5398 fix

d5aae8f824 refs #5688 refactor: muestra un mensaje de error controlado

0263d76021 refs #5701 update to mariadb 10.7.7

4f3b6c3035 typo

d02ee2fd12 deploy(232201)

de91e016e9 update changelLg

0ee8811c15 refs #5398 fix agencies, warehouses

fb330cdbfa Merge pull request '232201_test_to_master' (!1582) from 232201_test_to_master into master ...

Reviewed-on: #1582
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

f9528b922c refs #5595 added userId in options

ffba5b2d7e Merge pull request 'refs #5398 fix' (!1579) from 5398-fixAgenciesWarehouses into dev ...

Reviewed-on: #1579
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

69bf26433d fix(workerLog): acl to hr

8d0ae30610 Merge pull request 'fix(workerLog): acl to hr' (!1584) from fix_workerLog_acl into master ...

Reviewed-on: #1584
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

a26ab80e88 Merge branch 'dev' into salix-node20

9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync

5b0a1d10bb refs #5684 edi/updateData fix

cefe8e3e17 Merge pull request 'REFACTOR(node_version)! update to v20' (!1553) from salix-node20 into dev ...

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

20e574aef4 Merge pull request 'refs #5684 edi/updateData fix' (!1585) from 5684-ediUpdateData into master ...

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

df21ca2d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

95715763a1 refs #5667 Worker translations added/fixed

37bbc66ca4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes

c05d6bb9a1 refs #5563 WorkerDocument translation fixes

186ec2ea41 fix sendMail: sustituido modelo Journey por BusinessSchedule

01175a4c6c quitado vn

1408e5f5ad Merge pull request 'hotfix_sendMail' (!1587) from hotfix_sendMail into master ...

Reviewed-on: #1587
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

35cf48314a refs #4090 back memory limit increased because of pupeteer

86cd5f5237 refs #5472 fix sync

5be79bbdef refs #5667 VnUser translations added

45eba4533a refs #5667 VnUser translation added

47c6ad6a71 refs #5667 Translation fix

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

91b0e3013a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

fe32a2af05 refs #5667 RoleInherit & Sms: Translations added

15b5f10a93 refs #5513 addFromBuy back added

64abf4bf14 refs #5472 fix req.data.error.code

9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes

5d6eaca6b8 refs #5472 test(changePassword): e2e

36b0216640 refs #5513 changed tests description

a477bb32ad Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1504) from 5513-backs-embalajes into dev ...

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

6ef7055bc9 refs #5563 Display show values in logs

6f3704c365 hotfix colors ticket advance ticket future

05111c9268 hotfix test front

ab66ffa64a Merge branch 'master' into hotfixTicketColors

47fe77efde Merge pull request 'master' (!1592) from master into test ...

Reviewed-on: #1592

98af8ee10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

b144948dcf conflictos resueltos

4ae6b7c739 Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master ...

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

9521548953 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5507-loadConfigAtStart

2203f6cfef Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance

bda1ed41ae refs #5507 vnConfig moved to core

7311e79273 fix(vn-model): rewriteMethod

cb50c617ee refs #5489 deprecate account.user.password

ac0e7ae32b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

fd1e6122e8 Merge branch 'dev' into 5507-loadConfigAtStart

16ad082967 back fixed

3805812aba fix: backTest

d09075d490 Merge branch 'dev' into 5635-contadotTicketExpedition

92a8e5f689 Merge pull request 'fix addFromBuy backTest' (!1593) from fix-addFromBuy-backTest into dev ...

Reviewed-on: #1593
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

b036b1f7df Merge branch 'dev' into 5507-loadConfigAtStart

46a3faea51 Merge pull request 'fixes #5507 this.vnConfig no tiene datos cargados al inicio de la aplicación' (!1565) from 5507-loadConfigAtStart into dev ...

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

bfd421c188 Merge branch 'dev' into 5137-aviso-impresora

abf454496d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

b14a8d9fec Merge pull request 'fixes #5137 Avisos impresoras cuando hayan seleccionado una que no es principal' (!1514) from 5137-aviso-impresora into dev ...

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

c9f8555194 Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance

0bc4570706 Merge pull request 'fixes #5642 Arreglar e2e ticket Advance y ticket Future' (!1525) from 5642-arreglar-e2e-ticketFuture-ticketAdvance into dev ...

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

7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs

7cf85eeef8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

4e08f51848 Merge branch 'dev' into 5635-contadotTicketExpedition

3fdb546d86 refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created

edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover

1240a6b71a Merge branch 'dev' into 5472-user_passExpired

60024f8454 typo

e3562f9c32 Merge branch '5472-user_passExpired' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

bd4eee6606 refs #5252 eliminado warehouseFk = 1 por defecto #5252

e2c7a38e82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2

0dbd3abd65 refs #5808 fix: corregido el condicional

2b70bfb3c2 Merge pull request 'master' (!1595) from master into test ...

Reviewed-on: #1595

980ea67c24 Merge pull request 'test' (!1596) from test into dev ...

Reviewed-on: #1596

9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models

a88166cdb5 Merge branch 'dev' into 5252-canRefund_withOutWarehouse2

8b92b35e29 Merge pull request '5252-canRefund_withOutWarehouse2' (!1567) from 5252-canRefund_withOutWarehouse2 into dev ...

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

cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono

5ba8a15316 refs #5809 deploy 232401 dev in test

0afc26e20c refs #5728 remove add, quit e2e

9cdaf2e519 refs #5728 fix e2e buy

dd72ac9107 refs #5809 version 232601 init

3e39564695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

32a0955c1d refs #5667 Zone translations fixed

7ea7816800 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy

653c37f048 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

0ab23477d1 refs #5468 move sql changes

929b29e7e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

dfdf948c42 move sql changes

96d88cdf4b refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking

bdffc0401f refs #5760 update getChanges, traduccion

9c007504ea refs #5667 UI improved, filter by record

ac67a2606f Merge branch 'dev' into 5735-creditFormat

ec9dfa90fd refs #5760 fixtures

c66feb53f0 refs #5760 fix fixtures

f797cc1761 refs #5489 refactor e2e

d083ba795d Merge pull request 'refs #5667 UI improved, filter by record' (!1600) from test into dev ...

Reviewed-on: #1600

50ced36338 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7

81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs

9aadd71356 Merge branch 'dev' into 5735-creditFormat

a06cd1929f Merge branch 'dev' into 5760-changesSMS

74c300fd53 Merge branch 'test' into use_invoiceIn_booking

b81b6c7020 Merge pull request 'refs #5735 fix currency' (!1570) from 5735-creditFormat into dev ...

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

9b4c4496b6 Merge branch 'dev' into 5760-changesSMS

edb06a894a Merge pull request '5760-changesSMS' (!1601) from 5760-changesSMS into dev ...

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

fdb9d2ed7f refs #5701 fix dockerFile and sh's

0fb114b06d refs #5667 Search & entity filters moved to top

decc5e471f refs #5667 Changes added to changelog

94ebf50279 Merge pull request 'test' (!1603) from test into dev ...

Reviewed-on: #1603

d735f142a1 Merge branch 'dev' into 5472-user_passExpired

48ee29568d Merge branch 'dev' into 5595-modify-loggable-tables-in-procs

a8215e38f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7

33f2d556fd refs #5701 fix(db/dockerFile): fix docker-temp-stop

167c3f8f8a Merge pull request 'fixes #5595 Al modificar tablas dentro de procedimientos los logs creados no añaden el usuario loggeado' (!1499) from 5595-modify-loggable-tables-in-procs into dev ...

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

1a58424531 refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType

2c0c0f24b0 reactive

473dc0e48b Merge branch 'dev' into 5701-update_to_mariadb10.7.7

77c7e58f80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5112-entryUpdateComission

703c224e91 refs #5513 modified-entry email

f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

bbdc0d3e7f Merge pull request '5701-update_to_mariadb10.7.7' (!1581) from 5701-update_to_mariadb10.7.7 into dev ...

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

5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired

22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

1c39ad873c resolve dev conflicts

c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition

0718a486e7 Merge pull request 'refs #5635 smart-table' (!1542) from 5635-contadotTicketExpedition into dev ...

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

24b3697ac6 Merge branch 'dev' into 5472-user_passExpired

80f6c72fee Merge pull request '5472-user_passExpired' (!1594) from 5472-user_passExpired into dev ...

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

ff6a2daf37 Merge branch 'test' into use_invoiceIn_booking

e6c486b19c Merge pull request 'refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking' (!1599) from use_invoiceIn_booking into test ...

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

f113bfbc95 Merge branch 'dev' into test

983081a08e Merge pull request 'test' (!1606) from test into dev ...

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

d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote

59642ab3ca refs #5325 defaultSearch

3386af9b17 refs #5667 MailAliasAccount translations added

cc788d7e06 refs #5667 Account translations added

7127c5a3a8 refs #5325 e2e 1 smart Table

b7c8b03a65 refs #5325 e2e 2

d8b041c734 refs #5472 correcto version folder

a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware

6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto

0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

fa9719de78 refs #5691 feat: cambiado url por data en los crudModel

72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro

ddd23a9842 refs #5554 refactor: sustiuido window.localStorage por this

5d3ecfa00e refs #5554 fix: test front

92953b9aa8 refs #5094 test(docuware): adapt tests

dd4b62d0a5 description

61ce25c1e1 refs #5325 all e2e fix smartTable

3cef6d642d refs #5325 smartTable e2e fix

66c5eda6f2 refs #5325 remove defaultSearch

961941ecb3 refs #5667 TicketRequest translations added/fixed

5288f96836 Merge pull request '5094-ticket_index_docuware' (!1612) from 5094-ticket_index_docuware into dev ...

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

aa2d3be451 typo

c62e6fa0eb refs #5651 packingSiteAdvanced

e62a3ce166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys

65108943ab refs #5528 feat: back test

9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar

9b692e00d4 Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev ...

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

98b270b885 refs #5528 feat: add back test

927c0fddc6 refs #5651

e8b98a2daf Merge branch 'dev' into 5651-packingSiteAdvanced

d086c676a2 Merge branch '5651-packingSiteAdvanced' of https://gitea.verdnatura.es/verdnatura/salix into 5651-packingSiteAdvanced

7fa4eabf86 refs #5842 fix: recalcula invoiceDate cuando se cambia la company

9cdc914a25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable

1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

14ebcf96c0 refs #5842 refactor: change names

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

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

3862e3084e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

a50de4e509 refs #5842 feat: comprueba que invoiceDate no sea null

5f2c5c5f9d refs #5842 delete console.log

d9c7d3b8f0 Merge pull request '5842-hotfix_recalcularFechaFactura' (!1617) from 5842-hotfix_recalcularFechaFactura into master ...

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

99ad9d3afa refs #5753 fix(change-password)

71651b96a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

2a34abac61 refs #5513 minor fixes

5825d5e16a Merge branch '5513-back-embalaje' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

8b832c68b3 refs #5325 fix back

1c666cd48e refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm

a43792be26 Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev ...

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

192f4c7864 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter

b7b6f413ba refs #5688 feat: no mostrar datos si no tiene workerCenterFk

55990869e2 refs #5688 ya no muestra mensaje de error

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

e8d28ddb02 v232601

4157e30d4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable

7bff915a7f refs #5325 back fix correct

238a6406c5 Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev ...

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

73133778fc Merge branch 'dev' into 5513-back-embalaje

a866b92b8c Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1605) from 5513-back-embalaje into dev ...

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

50fe53fbb6 Merge branch 'test' into warnFix_ticket_sale_orderBy

ef0ae335e8 fix: muestra las observaciones de los tickets

75bb0f8160 refs #5860 fix hash smbhash

72c413dccb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix_ticketObservation

4d957b7593 Merge pull request 'hotfix_ticketObservation' (!1620) from hotfix_ticketObservation into master ...

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

081cf43ece refs #5667 SupplierAccount translation added

b1b9bf106a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

70413fe0d6 Merge pull request 'refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType' (!1604) from warnFix_ticket_sale_orderBy into test ...

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

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

068eca80ab Merge branch 'dev' into 5112-entryUpdateComission

b6c8ca20ee refs #5339 data

63888e2d64 refs #5595 console.log(orderFk, userId) for rawSQL logs

9fa6e2df71 refs #5595 VnModel.rawSql() bugfix

8a2cab0e62 Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys

503054fe05 refs #5112 modificaciones entry_updateComission

ffbaa45320 refs #5112 changelog

dcfb991f94 hotFix(getLeaves): remoteMethodCtx correct defined

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

6c00e704cc refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente

a7d9bbc582 refs #5537 change cl c

cea6fae649 fix: eliminada variable que no estaba definida

e99627c0b2 codigo innecesario

62818a9414 Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev ...

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

a4d3e8efd0 Merge pull request 'hotfix_errorEliminarTicket' (!1626) from hotfix_errorEliminarTicket into master ...

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

2649db852f refs #5772 Invoice PDF size reduced

e83396de11 Merge branch 'dev' into 5112-entryUpdateComission

f6cb1cb130 Merge branch 'dev' into 5554-renovar_token

004bfdbe1e Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev ...

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

556bdb52ce Merge branch 'dev' into 5554-renovar_token

3462e49d23 Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev ...

Reviewed-on: #1566
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f37974c835 Merge branch 'dev' into 5468-account_privileges

56917fbfc4 Merge pull request '5468-account_privileges' (!1552) from 5468-account_privileges into dev ...

Reviewed-on: #1552
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

e741904250 refs #5347

38de19f044 Merge branch 'dev' into 5728-bugEntry/buy

6f9fd9bb72 refs #5772 mensajes de error

44192c0606 refs #5667 Client translations added

dfdd3a1733 Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize

9ef12d129b Merge branch 'dev' into 5537-refactorFootnotes

bb10b831ef Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev ...

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

d9afdccd9c fix: acl renewToken

ddaed3318d Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev ...

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

aea32492e3 Merge branch 'master' into 5339_instance_vs_data

10a25ff590 refs #5772

473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter

a173cb47f0 Merge branch 'dev' into 5728-bugEntry/buy

807596f735 refs #5772

18a8106461 refs #5339 fix after save

5f4b62f133 refs #5688 fix: test front

d8fe284bcd Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys

207dcacf0f Merge pull request 'refs #5339 data' (!1623) from 5339_instance_vs_data into master ...

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

9d1a181b73 refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial

7f9d8da7a7 refs #5836 defaulter

591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back

2d21da1faa Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev ...

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

b7cd32f4ce refs #5772 eliminar tags en report invoice

12aa9c6b4b Merge branch 'dev'

d26778e94e refs #5688 fix: e2e

389b53ceff refs #5772 fix: back test

d4dceac74c Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev ...

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

344ba298f8 refs #5832 232801 init

757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy

d272121258 refs 5688 fix: e2e

cce837686d Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev ...

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

27946c0062 Refs #5347

d9b1f4b8a1 refs #5688 fix: test e2e

f6cc59eafb refs #5347

f0fec2cdd6 refs #5347

203e80afa8 refs #5347

16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create

47a4a9950f refs #5772 Parallelism added to PDF generation

8c0e8e9e12 refs #5772 Fixes fetching parallelism from front

2fec5bf2aa Merge pull request 'refs #5772 test into dev' (!1633) from test into dev ...

Reviewed-on: #1633

c9f11830a2 refs #5772 smtp.send() error throw flow fix

665339c8d2 refs #5772 Fix for unhandled ENOENT error

7660d76850 refs #5772 Test environment fix

f70df714df refs #5772, #5900 InvoiceOut back test removed, logs improved

98301f8e70 refs #5900 Small fixes & code clean

21988fba8c refs #5900 Hide PIT button on insert actions

df049201f1 refs #5900 Optimization: remove unnecessary watcher

57277ceb2e refs #5900 Show user every 6 changes, model info margin fix

d31d1e5a13 refs #5900 User avatar margin fix

fd69d69ff0 refs #5900 Style: margin adjustments

631c0e3121 refs #5900 Log grouping fix

c15d9a4753 refs #5900 Log order fix

efe0966069 refs #5900 Removed code to split user changes based on date

e32a29fc09 refs #5900 Remove duplicated logs

d69cbe0ad4 refs #5900 Origin separator style fix

544445c4ae refs #5800 Origin separator style more clear

630ce40ef7 Merge branch 'test' into 5900-removeDuplicatedLogs

cc5021a75f refs #5684 Removed xxxLog.create and dependences

e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs

c42b38c5cc refs #5900 Code clean, refactor & accurated

88e845b511 change applyFilters

e980717d14 refs #5900, #5772 Changelog updated

ef8e1c4169 refs #5531 refs #5753 fix travelConfig sql

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

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

7d2076ff90 Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev ...

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

15c45bb544 Merge branch 'test' into hotfix-filterScopeDays

de62dd9ffd refs # e2e fix

878e9c4fe9 Merge branch 'hotfix-filterScopeDays' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-filterScopeDays

15e39b5fec Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test ...

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

24ea18aeb0 refs #5836 isworker back

e43e52b561 refs #5753 db export and fix fixtures

46ffd8d95a refs #5554 console.log

1cf5ff9a62 refs #5554 new Date()

5216f12001 refs #5836 check fix

87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management

8e5a6dbab3 fix warn

7e542f93a1 Merge branch 'test' into warnFix_travel_summary_entry

f0b238b62a refs #5836 fix e2e

fe53abb24f Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test ...

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

f8a972c2f2 refs #5094 fix translation

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

a67cd5ba64 refs #5900 User avatar with sticky position

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

da50ea1dd0 Merge branch 'dev' into 5688-worker.calendar_workCenter

6894da7e22 refs #5688 fix: front test

65e5c95c07 Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev ...

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

3128601027 Merge branch 'dev' into 5808-client.credit-management

6e52b3b968 refs #5347

54e75dc850 Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

8723cf2958 refs #5753 fix legacy bugs

e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa

a6fba97b7d Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev ...

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

c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa

33e1d9e3f2 Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev ...

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

12481b5f3d refs #5900 CSS fix

d200a1a695 refs #5900 CSS fixes

840a88bdc1 refs #5833 remove console.logs

bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create

c9c20711b9 refs #5347

89b63f47fc Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

1d993c74e5 refs #5590 fix total invoiceOut

be1c145d9a refs #5347

3bd890c343 refs #5554 fix: solo llama al back cuando se tiene q renovar

79823605f6 refs #5554 fix: no te tira al hacer F5

1093d29fb6 Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test ...

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

273c06a210 refs #5833 deploy: test to master 232601

af91630852 refs #5836 e2e fix

bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs

82e762ac09 Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test ...

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

7eb8460ba0 refs #5816 remove unforeseen dev

fc39b8f692 refs #5816 comment e2e

02aafbc7f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

e651ddc4a0 refs #5816 unfocus e2e

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

ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump

6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor

e6ed834bf0 refs #5836 remove case

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

d1fb2859be Merge branch 'dev' into 5753_232401_db_dump

7fe8698b6f refs #5753 fix ticketToInvoice

c3ef642017 refs #5836 fix fk

4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker

3b346d673b Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev ...

Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker

5612c56aed Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev ...

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

8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor

9fe7024d17 refs #5347

4d0ed75090 Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor

6b557d5d8a refs #5347

2ccf8d5197 refs #5347

089f1e48ac Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev ...

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

59ad603de6 refs #5816 set version

040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight

alexm added 1 commit 2023-07-05 13:21:02 +00:00

6530e87508 refs #4614 feat(ticket): prevent invoice without weight

alexm added 131 commits 2023-07-06 13:17:26 +00:00

0d6b248f76 feat(2fa): email 2fa ...

Refs #5475

902709d61b Added authCode table

641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2e0325e567 Validate code

b9e48f2102 Added translations & enable through departments

087e91e898 Updated unit tests

b0f1bae33e Added unit test

4807fcb394 Removed focus

b5f2cf3711 Added unit test & translation fixes

f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

9aaea7e8ed Changed to new SQL version

ef87dcc0f5 require authentication on every login

cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

c2af40edb5 changes

c3443ecc7c Updated e2e

8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

7021e52705 correct folder

87e1caa4eb refs #5334 department seccion

598067f757 refs #5334 routes

071849065a refs #5334 fix main

443821b5c2 refs #5334 ?q

fd4d04756a refs #5334 routes index fix

612d0a2dfb refs #5334 fix index

3dcdbe0223 refs #5334 summary basic data

d09889b08a refs #5334 fix summary route

9f9963af56 refs #5334 descriptor

5c9ee21cfc refs #5334 department.card

f63dd0f9a3 refs #5334 datos

adafd7444b refs #5334 worker-department

10e085ca1b refs #5334 link department

027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2b06c62876 refs #5334 left-menu

0789804352 refs #5334 fix basic-data

f74c370446 refs #5334 checks vertical

07e176ae4f refs #5334 fix checks basic-data

ceaaece007 refs #5334 label-value

3aa5ce6208 refs #5334 fix hasToSendMail

2a78a912eb refs #5334 worker.department

f4e877dada refs #5334 refactor summary

2d6f0bb2ce refs #5334 front fix

9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d9a64211de refs #5334 fix descriptor, basic-data, summary

107d8d1edd refs #5334 model y vista

2778858705 refs #5334 search-panel

cf632040e7 refs #5334 workFk, clientFk

e26eedb51c refs #5334 descriptor wprkerFk clientFk

e7d25a6cf3 refs #5334 filter

45085cccc8 refs #5334 fix search-panel

8860c77147 refs #5334 fix descriptor

26187898e1 refs #5334 popover

1dcaba1fdc refs #5334 department workers list

0fd7f4183e refs #5334 fk

0774a94d8b refs #5334 params

e38bf4f1b3 refs #5334 button delete, btn popover

489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d1a61b3e0d refs #5334 dinamic

eb6953a2b6 refs #5334 department

4c7c7f5c96 refs #5334 mod search-panel

f37c66304f refs #5334 change info

bb5247c49b refs #5334 tree

04780e211d refs #5334 test front & 1/2 back

5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

1095a59954 refs #5334 rest back, e2e summary, less e2e basic

5798b28c5e refs #5334 baicData e2e

9ef51f5600 remove fdescribe puppeter

c1cda1a3ff refs #5334 basicData e2e

d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2545a40087 Merge branch 'dev' into 5334-editDepartment

8afd149954 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d6cde764d7 refs #5334 changelog

051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired

b96f0f22b5 refs #5475 feat(account_changePassword)

cf01c8d46e refs #5475 feat(account_changePassword)

dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

ee1b901dea refs #5475 feat(account_changePassword): accessScope

d4cc9cf82a change log remove

98125f8974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

3701acd26e refs #5334 error getLeaves solve

168e7f1929 changelog

092471f74e refs #5475 feat(account_changePassword): accessScope and backTest

7f20973650 refs #5334 merge

4537344790 merge

a155f846c2 refs #5334 fix ctx

c63df30e5c refs #5334 fix back

f0f8b112cd Merge branch 'dev' into 5334-editDepartment

a8fafacb82 refs #5475 send email force

d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment

168d05a830 refs #5334 fix errors

6ab431f8ef refs #5475 tests

4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

137e01e60c refs #5334 fix acl, filter

beb173f6ce refs #5334 quit e2e no necesario

798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

4b8b7a9d82 refs #5475 fix accessScope

06437c9e80 refs #5334 remove other

162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

89c25c07b6 refs #5475 fix e2e and back test

f02019d64d refs #5334 fix words

9dc52b6011 refs #5334 fix labels trad

bb4951bbc8 Merge branch 'dev' into 5334-editDepartment

c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

b062cec747 refs #5475 fix setPassword options/cb

0441bc29b7 refs #5475 correct SQL folder

6b4501146d refs #5334 fix errors

83b096c206 refs #5334 fix errors

3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

dc36c6fd9d refs #5334 basicData solve e2e

dc10c20fe3 refs #5334 email validate

5e68363312 refs #5334 onsearch postlink

461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev

ff6d9e427b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

983d028d06 refs #5334 popover y basic data

f1502139ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

5000e05e05 refs #5334 merge + e2e solve

3d9f0e1497 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

83467c3b6c refs #5334 quit es

9c9b53917a refs #5334 fix error

a7ad947168 Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev ...

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

63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

48951cc5a1 Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev ...

Reviewed-on: #1429
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

ea71e980cc refs #5970 add changelog

a665b6c060 refs #5970 fix sql

d9d4441d59 refs #5970 deploy: 233001 init

be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight

8fe9b387ce refs #4614 test: front and correct folder

alexm added 1 commit 2023-07-10 05:20:23 +00:00

8922d27f20 refs #4614 fix e2e

alexm changed title from WIP: refs #4614 fear(ticket): add 'set weight' funcionality to refs #4614 fear(ticket): add 'set weight' funcionality 2023-07-10 05:24:51 +00:00

alexm requested review from jgallego 2023-07-10 05:24:57 +00:00

alexm added 2 commits 2023-07-10 06:53:20 +00:00

d9a5868ce4 refs #5930 fix(claim_updateClaim) options

5e6d941f36 Merge branch 'dev' into 4614-ticket_weight

jgallego approved these changes 2023-07-10 06:56:15 +00:00

alexm merged commit 60f70ac2b4 into dev 2023-07-10 07:22:12 +00:00

alexm deleted branch 4614-ticket_weight 2023-07-10 07:22:12 +00:00

alexm referenced this issue from a commit 2023-07-10 07:22:12 +00:00

Merge pull request 'refs #4614 fear(ticket): add 'set weight' funcionality' (!1487) from 4614-ticket_weight into dev

Sign in to join this conversation.

Reviewers

No reviewers

jgallego

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

No description provided.