231801_dev_to_test #1501

Merged

alexm merged 330 commits from 231801_dev_to_test into test 2023-05-08 10:29:08 +00:00

Conversation 0 Commits 330 Files Changed 543 +32421 -3997

alexm commented 2023-05-04 07:06:21 +00:00

Member

Copy Link

No description provided.

alexm added 301 commits 2023-05-04 07:06:22 +00:00

ee1ce21bb9 refactor(account): account model refactor

89eb065f6d Updated models

3076123c04 Updated models relation

0208b31f44 Naming rollback

3456438485 Model fix

f0b44a2992 Updated back unit tests

70cc83b8bf Enable vanity user URLs

388af5110f Updated unit test

12cf79ab39 Updated e2e

0a0cca0585 Set client bcrypt password

9bf4cd5cff Merge branch 'dev' into 4480-vnUser

e34d64361b Account refactor

644d98ec1c syncUser() and setPassword() changes

7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

d773837740 Removed user model

bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data

f496242fcb fix description

e231b0e12b refs #5237 Added greuge notify

37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim

8499ae5243 Merge branch 'dev' into 5284-fueraPlazo

b1c8f51e35 refs: #084200 mod del footer y readapatacion heade

73ca811fc0 Merge branch 'dev' into 084200-footerAlbaranReport

a48c67aab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

fd67ec00d1 Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

9e8150dde3 refs #084200 footnotes dinamico

da4cbe1148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

08bda1b05b refs #084200 ultimos cambios footnotes

b5394d3925 refs #084200 footer finalizado, web personalizado

36e18ff28c Merge branch 'dev' into 084200-footerAlbaranReport

4209efd7e1 Merge branch 'dev' into 5284-fueraPlazo

d05ddef5fa refs #084200 primer commit companyI18n

ceee1ec79b Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

e1f7ba1343 refs #5456 feat: actualizada traduccion en castellano y añadida en portugues

0c8fe855ac refs #5418 lateral search panel added, missing e2e

1302665d98 refs #5436 showSucces

188e592d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

1603cddb96 refs #5418 e2e implemented and fixed

aad8fb0a66 refs #084200 i18n

14f8f98fe9 refs #084200 findOne

2c01ebf681 Merge branch 'dev' into 5075-client_balance

71220c58f7 refs #084200 inserts

9be06c6f4b refs #084200 arreglo lang

8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

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

1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

ecbfdad102 refs #5418 changelog

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

1e71f7487a refs #084200 I18n footer

7e42bd1116 refs #5379 referencia a vn2008 quitada

014998952e refs #084200 recipientId

f7191f0f7f refs #5517 log relativeDate function fixes

9f4d027014 refs #5316 sql

d7d4b9515e refs #5517 json value and date format fixes

161fc25c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

d21ab7a5a7 refs #5316 primer kkeo

abaeeddc21 refs #5418 fix e2e

1770b8c038 refs #5075

d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito"

1ce2705869 refs #5316 last kkentry

c928274e24 Merge branch 'dev' into 5075-client_balance

1456da58f5 refs #5075

58750aa065 refs #5318 eliminido triggers y añadido loggable en salix

117849f093 refs #5540 supplier js

0666163ca0 refs #5546 deleted log property, fixed back tests

ef6e85532e refs #5213 cambios e2e, descriptor

60103fa80a refs #5540 validacion nif

eed57c9b4e refs #5546 removed log tests

747efc4342 refs #5540 sql mod

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

520d5ab55c Merge branch 'dev' into 5379-quitar-referencia-vn2008

d191403df4 refs #5075 empty commit

9594bd68b5 refs #4795

534a58409f Merge branch 'dev' into 5379-quitar-referencia-vn2008

eb1798100f Added version 23.16

ad267c933c refs #5540 country.code

40333a2ff4 Merge branch 'dev' into 5379-quitar-referencia-vn2008

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

44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo

71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro

15d7139bc5 Merge branch '5284-fueraPlazo' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo

f4491cb263 Merge pull request 'fixes #5379 Dejar de hacer referencia a vn2008 en salix' (!1425) from 5379-quitar-referencia-vn2008 into dev ...

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

2ada64e1bf refs #5517 eliminadas traducciones duplicadas

86a67eb0c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price

41f9ec63ff refs #5418 changelog

05ceba65d6 refs #5418 changelog

90268a79b0 refs #5284 test createClaim

ac4772e44e refs #5418 mistake doing git pull origin dev

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

025c158b27 refs #5418 minor fixes

a2ddbd8a66 refs #5284 test update

b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro

ecac5fffd4 Merge pull request 'fixes #5546 Actualizar código de registro de histórico de los modelos' (!1436) from 5546-codigo-registro into dev ...

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

b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price

83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management

4c18efa589 refs #5128 creado método setRating

ad3836552e refs #5518 sections added

add3a8b1fa merge with dev

2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute

ca3a1be20f refs #4480 md5 removed from VnUser

c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing

af8603185c refs #5439 inheritedRole

51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev ...

Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

0bfdbcb750 refs #4617 use temporary instead of vn

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

02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

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

3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

d399cda050 refs #5316 quitar comment

0dcbc9fc8b refs #5293 redirected claim.photos to lilium

2bc190b01e Merge branch 'dev' into 5293-claim-sections

f97d169cbf observationEmail

2675c02d13 refs #5518 moved models to account

7d8a0597c1 Merge branch 'dev' into 5518-log-user-role

6144c24a44 fix(ticket_edit): fix e2e

b5434c5e4e tab

6a0a08be95 typo

06a845e7f0 Cambios SQL

2a8383f9cc Merge pull request 'fix e2e' (!1450) from fix_e2e into dev

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

f76727903a update insert

560b5b374f Merge branch 'dev' into 5075-client_balance

8b60e9f5fd sql arreglado

3636543f73 refs #5075

6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2

d6fb05cc93 Merge pull request 'refs #5213 cambios e2e, descriptor' (!1437) from 5213-minorBugs2 into dev ...

Reviewed-on: #1437
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management

48cd23750e refs #5128 add testBack

c5225cb632 refs #5128 borrado código innecesario

b3e7cedd1e refs #5128 borrada línea por error

fded7d062b section fix

28a7722bb6 Merge branch 'dev' into 5518-log-user-role

e8e373d924 Merge pull request 'fixes #5518 Crear secciones de histórico para usuarios y roles' (!1446) from 5518-log-user-role into dev ...

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

2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price

3c639b9a2b refs # cambios entrantes

11b905138f Merge pull request 'fixes #5418 Buscador lateral en item/fixed-price' (!1412) from 5418-buscador-lateral-fixed-price into dev ...

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

a0d8ed1433 E2e fixes

32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser

e0a8daf2f8 Merge pull request '4480-vnUser - Replaced model Account in favor of VnUser' (!1267) from 4480-vnUser into dev ...

Reviewed-on: #1267

274aff14b5 Merge branch 'dev' into 084200-footerAlbaranReport

6f2aa0f618 Worker note ACL

3c334a9f01 refs #5128 fix e2e: manejado que pueda haver más de 1 menú desplegable en el card

3ead22968a Merge branch 'dev' into 084200-footerAlbaranReport

a559c1f648 refs #5575 mod3Decimal

be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix

5ace66ebca refs #5318 fix e2e

6f96820168 refs #5237 Ahora lee un conjunto de arrays

34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management

0b5d16a78c fix e2e

187ba032d2 refs #5128 rol por ACL

6fbb734a34 quitado salto de linea

f6bf92b74b refs #5128 intentando poner icono grafana

4f25f153a9 Merge pull request 'fix e2e smartTable' (!1462) from fix-e2e-smartTable into dev ...

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

84c2512847 refs #5293 open lilium in the same page

aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections

30924bb8f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5575-tercerDecimalLatest

c103eeab7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo

5a4fcc2728 refs #5527 header fixed

d8fff8f3c4 refs #5527

b4183c2698 refs #5436 mod de error

d6e6dab03b Merge branch 'dev'

ec9a5722c2 refs #5128 añadido icono de grafana

a898c6d4c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management

33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole

6fc71672a6 Merge pull request 'fixes #5527 cabecera facturas' (!1468) from 5527-cabecera-facturas into dev ...

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

681b027098 refs #5456 añadida traducción al francés y corregida la de portugués

89cca5ee9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5456-client-welcome_email_añadirTraducciones

bcf7b6ab3d borrado acl innecesario

46938b224c Merge branch 'dev' into 5436-mensajeClienteSinCorreo

e32939cde9 Merge branch 'dev' into 084200-footerAlbaranReport

b942bc2fe7 Merge branch 'dev' into 5575-tercerDecimalLatest

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

de3b4f37c2 Merge branch 'dev' into 5075-client_balance

07e76a9333 Merge branch 'dev' into 5128-client.credit-management

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

7a79dfd4d1 deploy: 231401 test to dev

9bd8f71f19 fix package.json

8e885fa335 Merge pull request '231401_test_to_dev' (!1473) from 231401_test_to_dev into dev ...

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

ea1035311e Merge branch 'dev' into 5128-client.credit-management

f738d1659b Merge branch 'dev' into 5456-client-welcome_email_añadirTraducciones

f347256617 Merge pull request '5456-client-welcome_email_añadirTraducciones' (!1470) from 5456-client-welcome_email_añadirTraducciones into dev ...

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

f96122ad3e Merge branch 'dev' into 5128-client.credit-management

75432b8823 Merge pull request '5128-client.credit-management' (!1459) from 5128-client.credit-management into dev ...

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

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

5b7ca82509 Merge branch 'dev' into 5318-deviceProductionLog_toSalix

a7a0853248 Merge pull request '5318-deviceProductionLog_toSalix' (!1460) from 5318-deviceProductionLog_toSalix into dev ...

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

5e33395534 Merge branch 'dev' into 5436-mensajeClienteSinCorreo

ef12fdf889 Merge branch 'dev' into 5575-tercerDecimalLatest

caed48de01 Merge branch 'dev' into 084200-footerAlbaranReport

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

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

cd4f66e292 refs #5540 arreglar e2e

925e30350a resolved conflicts

67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies

4eeeccf263 Merge pull request 'test-to-dev' (!1478) from test-to-dev into dev ...

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

9b432bac85 refs #5542 fix: test

4983aa1632 refs #5542 fix backTest

1717f03ccc Merge branch 'dev' into 5575-tercerDecimalLatest

210bd949d2 Merge branch 'dev' into 5436-mensajeClienteSinCorreo

4473cc11c7 Merge branch 'dev' into 5439-inheritRole

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

9d0facd2ba Merge branch 'dev' into 084200-footerAlbaranReport

a053764122 refs #5517 E2E fixes

70ef302b67 Merge pull request 'refs #5439 inheritedRole' (!1447) from 5439-inheritRole into dev ...

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

08e890d6d9 Merge branch 'dev' into 5436-mensajeClienteSinCorreo

ce20f46fef Merge pull request '5436-mensajeClienteSinCorreo' (!1469) from 5436-mensajeClienteSinCorreo into dev ...

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

40da3dfe52 Merge branch 'dev' into 5575-tercerDecimalLatest

b1376a394f Merge pull request 'refs #5575 mod3Decimal' (!1461) from 5575-tercerDecimalLatest into dev ...

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

3e15728db4 Merge branch 'dev' into 5075-client_balance

7636302e7f Merge pull request '5075-feat: sendEmail checkBox and docuware open clientBalanceCreate with default data' (!1317) from 5075-client_balance into dev ...

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

49368a837b refs #5517 Filter improved

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

83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev

f2bef8dcf6 Merge pull request 'test -> dev' (!1481) from test-to-dev into dev ...

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

60146b8b9c added #5518 changelog

59b556ede1 Merge branch 'dev' into changelog-5518

c9a42f9eb8 Merge pull request 'added #5518 changelog' (!1484) from changelog-5518 into dev ...

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

73153071d6 Merge branch 'dev' into 5293-claim-sections

24a007d609 Merge branch 'dev' into 084200-footerAlbaranReport

740e03f0ee Merge pull request 'fixes #5293 Añadir secciones en claim' (!1448) from 5293-claim-sections into dev ...

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

ad9c189e35 Merge branch 'dev' into 084200-footerAlbaranReport

57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

a945f4dedd Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport

43bb762129 Merge branch 'dev' into 5237-greugeAlarmNotification

899ef23541 refs #084200 test back solve

af875dd67e Merge

be6d416f67 Merge pull request 'refs: #084200 mod del footer y readapatacion heade' (!1382) from 084200-footerAlbaranReport into dev ...

Reviewed-on: #1382
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

b25071f52b refs #5316 solve e2e

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

1219cfcc5c refs #5255 fixed condition

fd36592c70 Merge branch 'dev' into 5237-greugeAlarmNotification

4548fc8552 Merge pull request '5237-greugeAlarmNotification' (!1485) from 5237-greugeAlarmNotification into dev ...

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

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

480784ee18 refs #084200 cambio nombre

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

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

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

990bfc63a8 Merge branch 'dev' into 4795-client_getDebt

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>

6e3e2cf798 refs #5517 Filter RC

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

b8f7f7bd69 refs #5540 create validateIban

cdbbec9d36 refs #5540 validate

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

38142c121d refs #5540 mods client

c0deb745d6 refs #5540 arreglo en supplier

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

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

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

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>

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

a712c0a303 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice

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>

2e020b5ebb fix(): correct version

alexm added 28 commits 2023-05-08 10:10:51 +00:00

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

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

5844da4474 refs #4713 updated sql

2467534d1f refs #5090 mod golabel

b2027fddf3 fix(client): use account setPassword

a2d3b79246 Merge branch 'dev' into 4713-saleTracking

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>

677764f302 refs #5517 Fix e2e

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>

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

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

Reviewed-on: #1502

68b1b6c5bd refs #5517 E2E fixes

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

alexm changed title from WIP: 231801_dev_to_test to 231801_dev_to_test 2023-05-08 10:11:33 +00:00

alexm requested review from vicent 2023-05-08 10:12:17 +00:00

vicent approved these changes 2023-05-08 10:14:20 +00:00

alexm added 1 commit 2023-05-08 10:21:29 +00:00

90465c275a correct folder

alexm requested review from vicent 2023-05-08 10:22:13 +00:00

vicent approved these changes 2023-05-08 10:23:54 +00:00

vicent approved these changes 2023-05-08 10:24:58 +00:00

alexm merged commit dde62f8971 into test 2023-05-08 10:29:08 +00:00

alexm deleted branch 231801_dev_to_test 2023-05-08 10:29:08 +00:00

alexm referenced this issue from a commit 2023-05-08 10:29:10 +00:00

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

Sign in to join this conversation.

Reviewers

No reviewers

vicent

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

No description provided.