5808-client.credit-management #1640

Merged

vicent merged 3 commits from 5808-client.credit-management into dev 2023-06-28 12:35:09 +00:00

Conversation 0 Commits 3 Files Changed 1 +2 -2

vicent commented 2023-06-27 08:32:07 +00:00

Contributor

Copy Link

No description provided.

vicent added the

Needs refactor

CR / Tests passed

labels 2023-06-27 08:32:07 +00:00

vicent added 1 commit 2023-06-27 08:32:08 +00:00

0dbd3abd65 refs #5808 fix: corregido el condicional

vicent removed the

Needs refactor

label 2023-06-27 08:32:18 +00:00

vicent added 315 commits 2023-06-27 08:32:51 +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

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

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

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

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

37a7d02006 quitado scope

8a9e4ccefb refs #5468 fix e2e

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

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

87ffd2668e refs #5468 scope para VnUser

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

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

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

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

ad3c6dcee2 wip #5595

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

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

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

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

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

73fb940c63 refs #5472 try change-password

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

74ea0ce9fd refs #5468 actualizados acls

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

3f26072787 refs #5468 eliminados getters a VnUser

2b1e951692 refs #5635 smart-table

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

c6c15d7c69 refs #5472 feat: changePassword with passExpired

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

b65ebc6af3 refs #5468 feat: cambiados acls

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

aea39dd0b7 refs #5468 feat: modificalos acl de VnUser

9426ff204f refs #5468 fix: testFront

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

96163cb07f refs #5468 feat: update acls

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

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

91207c5a3c refs #5468 fix: test e2e

c9b4c68b0c refs #5468 refactor: actualizada vista

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

c35e2e155f refs #5472 test(changePassword): back

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

9b363bc7a4 refs #5635 remove vn, smart-table

d6d72ed289 refs #5635 smart-table, counter, filter

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

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

2e69e4eea7 a

4869d81d11 refs #5635 fix back & e2e

fdd22ca2d8 refs #5554 codigo eliminado de vnLayout

1f24314ab2 refs #5635 fix back

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

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

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

b95ee6cbfa refs #5554 feat: add front test

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

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

96feb24f12 refs #5252 fix: back test

71d8a355bd refs #5252 fix: te2e

8adc104cf4 refs #5735 fix currency

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

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

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

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

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

0263d76021 refs #5701 update to mariadb 10.7.7

4f3b6c3035 typo

f9528b922c refs #5595 added userId in options

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

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

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

86cd5f5237 refs #5472 fix sync

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

fe32a2af05 refs #5667 RoleInherit & Sms: Translations added

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

5d6eaca6b8 refs #5472 test(changePassword): e2e

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>

cb50c617ee refs #5489 deprecate account.user.password

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

d09075d490 Merge branch 'dev' into 5635-contadotTicketExpedition

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

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

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>

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>

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>

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

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

807596f735 refs #5772

18a8106461 refs #5339 fix after save

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

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'

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

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>

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

d69cbe0ad4 refs #5900 Origin separator style fix

544445c4ae refs #5800 Origin separator style more clear

c42b38c5cc refs #5900 Code clean, refactor & accurated

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>

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

vicent changed title from refs #5808 fix: corregido el condicional to 5808-client.credit-management 2023-06-27 08:36:19 +00:00

vicent requested review from alexm 2023-06-27 08:49:31 +00:00

alexm approved these changes 2023-06-28 11:46:22 +00:00

alexm approved these changes 2023-06-28 11:46:29 +00:00

vicent added 13 commits 2023-06-28 11:47:42 +00:00

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

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

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

5f4b62f133 refs #5688 fix: test front

d26778e94e refs #5688 fix: e2e

d272121258 refs 5688 fix: e2e

d9b1f4b8a1 refs #5688 fix: test e2e

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

vicent merged commit a6fba97b7d into dev 2023-06-28 12:35:09 +00:00

vicent referenced this issue from a commit 2023-06-28 12:35:09 +00:00

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

vicent deleted branch 5808-client.credit-management 2023-06-28 12:35:09 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

alexm

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

No description provided.