16256 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9b950cd8d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-16 07:23:41 +02:00
Alexandre Riera	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>	2023-06-16 05:15:43 +00:00
Alexandre Riera	73133778fc	Merge branch 'dev' into 5513-back-embalaje	2023-06-16 05:07:16 +00:00
Carlos Satorres	238a6406c5	Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev ... Reviewed-on: #1613 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-15 17:49:33 +00:00
Carlos Satorres	7bff915a7f	refs #5325 back fix correct	2023-06-15 17:14:34 +02:00
Carlos Satorres	4157e30d4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-15 16:47:33 +02:00
Alex Moreno	e8d28ddb02	v232601	2023-06-15 15:15:41 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Sergio De la torre	a43792be26	Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev ... Reviewed-on: #1615 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-15 11:40:41 +00:00
Juan Ferrer	1c666cd48e	refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm	2023-06-15 13:10:44 +02:00
Carlos Satorres	8b832c68b3	refs #5325 fix back	2023-06-15 12:49:53 +02:00
Alexandre Riera	5825d5e16a	Merge branch '5513-back-embalaje' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 12:06:44 +02:00
Alexandre Riera	2a34abac61	refs #5513 minor fixes	2023-06-15 12:06:42 +02:00
Alex Moreno	71651b96a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 11:49:40 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Alex Moreno	d9c7d3b8f0	Merge pull request '5842-hotfix_recalcularFechaFactura' (!1617) from 5842-hotfix_recalcularFechaFactura into master ... Reviewed-on: #1617 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-15 08:32:03 +00:00
Vicent Llopis	5f2c5c5f9d	refs #5842 delete console.log	2023-06-15 09:55:32 +02:00
Vicent Llopis	a50de4e509	refs #5842 feat: comprueba que invoiceDate no sea null	2023-06-15 09:50:46 +02:00
Alex Moreno	3862e3084e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:32:25 +02:00
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
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	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
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
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	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Vicent Llopis	fa9719de78	refs #5691 feat: cambiado url por data en los crudModel	2023-06-13 08:16:37 +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
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