17337 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	44381e4a1c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-15 07:31:43 +02:00
Alex Moreno	a206f64e3c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:27:04 +02:00
Vicent Llopis	14ebcf96c0	refs #5842 refactor: change names	2023-06-15 07:24:17 +02:00
Sergio De la torre	1f454e6219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 07:22:10 +02:00
Carlos Satorres	b3022d0ce2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-14 17:47:56 +02:00
Carlos Satorres	9cdc914a25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-14 17:03:09 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Vicent Llopis	7fa4eabf86	refs #5842 fix: recalcula invoiceDate cuando se cambia la company	2023-06-14 14:59:18 +02:00
Sergio De la torre	d086c676a2	Merge branch '5651-packingSiteAdvanced' of https://gitea.verdnatura.es/verdnatura/salix into 5651-packingSiteAdvanced	2023-06-14 13:19:08 +02:00
Sergio De la torre	e8b98a2daf	Merge branch 'dev' into 5651-packingSiteAdvanced	2023-06-14 11:18:24 +00:00
Sergio De la torre	927c0fddc6	refs #5651	2023-06-14 13:15:37 +02:00
Vicent Llopis	98b270b885	refs #5528 feat: add back test	2023-06-14 13:05:46 +02:00
Vicent Llopis	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>	2023-06-14 11:01:43 +00:00
Vicent Llopis	9e89167d27	Merge branch 'dev' into 5691-route.index_optimizar	2023-06-14 10:57:58 +00:00
Vicent Llopis	65108943ab	refs #5528 feat: back test	2023-06-14 12:48:14 +02:00
Vicent Llopis	e62a3ce166	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys	2023-06-14 12:39:16 +02:00
Sergio De la torre	c62e6fa0eb	refs #5651 packingSiteAdvanced	2023-06-14 10:51:22 +02:00
Alex Moreno	aa2d3be451	typo	2023-06-14 07:30:50 +02:00
Alex Moreno	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>	2023-06-14 05:29:25 +00:00
Juan Ferrer	961941ecb3	refs #5667 TicketRequest translations added/fixed	2023-06-13 20:52:26 +02:00
Carlos Satorres	66c5eda6f2	refs #5325 remove defaultSearch	2023-06-13 16:08:11 +02:00
Vicent Llopis	0cc5781f3f	refs #4734 feat: añadido método putExpedicionInternacional de viaexpress	2023-06-13 15:05:37 +02:00
Carlos Satorres	3cef6d642d	refs #5325 smartTable e2e fix	2023-06-13 14:15:31 +02:00
Carlos Satorres	61ce25c1e1	refs #5325 all e2e fix smartTable	2023-06-13 13:32:04 +02:00
Alex Moreno	dd4b62d0a5	description	2023-06-13 12:42:12 +02:00
Alex Moreno	aeb04efe82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-13 11:49:42 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Vicent Llopis	5d3ecfa00e	refs #5554 fix: test front	2023-06-13 10:44:29 +02:00
Vicent Llopis	ddd23a9842	refs #5554 refactor: sustiuido window.localStorage por this	2023-06-13 10:40:26 +02:00
Vicent Llopis	72b779f5c0	refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro	2023-06-13 10:26:12 +02:00
Vicent Llopis	fa9719de78	refs #5691 feat: cambiado url por data en los crudModel	2023-06-13 08:16:37 +02:00
Vicent Llopis	61f99744c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-13 07:43:23 +02:00
Vicent Llopis	0aae1732bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-13 07:35:29 +02:00
Vicent Llopis	6f3c28c4a4	refs #5468 refactor: eliminado código obsoleto	2023-06-13 07:34:41 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d8b041c734	refs #5472 correcto version folder	2023-06-12 22:04:02 +02:00
Carlos Satorres	b7c8b03a65	refs #5325 e2e 2	2023-06-12 19:51:16 +02:00
Carlos Satorres	7127c5a3a8	refs #5325 e2e 1 smart Table	2023-06-12 17:37:25 +02:00
Juan Ferrer	cc788d7e06	refs #5667 Account translations added	2023-06-12 16:28:47 +02:00
Juan Ferrer	3386af9b17	refs #5667 MailAliasAccount translations added	2023-06-12 16:27:02 +02:00
Carlos Satorres	59642ab3ca	refs #5325 defaultSearch	2023-06-12 15:44:22 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02:00
Alex Moreno	983081a08e	Merge pull request 'test' (!1606) from test into dev ... Reviewed-on: #1606 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-12 12:58:00 +00:00
Carlos Satorres	c9c9b64884	refs #5660 deliveryAssit	2023-06-12 14:57:41 +02:00
Alex Moreno	f113bfbc95	Merge branch 'dev' into test	2023-06-12 12:32:29 +00:00
Carlos Andrés	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>	2023-06-12 12:20:16 +00:00
Carlos Andrés	ff6a2daf37	Merge branch 'test' into use_invoiceIn_booking	2023-06-12 11:45:56 +00:00
Carlos Satorres	58bcad7b2d	refs #4764 validator create	2023-06-12 12:42:30 +02:00
Alex Moreno	80f6c72fee	Merge pull request '5472-user_passExpired' (!1594) from 5472-user_passExpired into dev ... Reviewed-on: #1594 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-12 10:38:24 +00:00