12934 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	da78b39874	Merge branch 'dev' into 4075-ticket_boxing	2022-10-27 07:29:39 +00:00
Alex Moreno	5c65314162	use findById	2022-10-27 09:27:50 +02:00
Joan Sanchez	714fe32552	Fix error	2022-10-27 09:26:02 +02:00
Joan Sanchez	51f95f0261	Fixed error	2022-10-27 09:23:08 +02:00
Joan Sanchez	6a2bc5b593	Disabled back tests	2022-10-27 09:18:32 +02:00
Pau	736de00e77	deleted the test as requested on #1885	2022-10-27 09:18:00 +02:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Vicent Llopis	1d908002e2	feat: add backTest	2022-10-26 14:25:27 +02:00
Vicent Llopis	c0b95564c3	refactor: borrado codigo sql innecesario	2022-10-26 14:25:17 +02:00
Vicent Llopis	fa89d1f944	fix: comentario corregido	2022-10-26 13:10:50 +02:00
Vicent Llopis	b39b28e43d	refactor: añadido salto de lineas	2022-10-26 13:10:17 +02:00
Vicent Llopis	65e32f5e7f	feat: client search panel add find by zone	2022-10-26 12:40:13 +02:00
Vicent Llopis	21e2945d4f	refactor: delete destroyAll	2022-10-26 09:30:17 +02:00
Vicent Llopis	c671540a7f	refactor: renombrada variable	2022-10-26 09:04:53 +02:00
Vicent Llopis	d1e2b1f7d5	refactor: tranducciones	2022-10-26 09:02:54 +02:00
Vicent Llopis	3110172c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice	2022-10-26 08:39:58 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	1e1d4f00f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-26 08:26:23 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Vicent Llopis	925565d3d2	refator: borrada variable global y añadida Promesa al array	2022-10-26 08:23:36 +02:00
Vicent Llopis	a8dfc9d06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-26 08:11:15 +02:00
Vicent Llopis	07a18dc736	delete sql	2022-10-26 08:05:11 +02:00
Alex Moreno	f07f0679d8	fix fixture	2022-10-25 15:03:20 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Joan Sanchez	418ba65c2e	Merge pull request '2612-create-supplier' (!1089) from 2612-create-supplier into dev ... Reviewed-on: #1089 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 10:42:05 +00:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	296a743d8a	Fix test, remove console log	2022-10-25 12:25:56 +02:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00
Joan Sanchez	330af56d2f	Intl polyfill	2022-10-25 11:42:28 +02:00
Pau	39b70ed75f	Merge pull request '4153-supplier.fiscal-data' (!1096) from 4153-supplier.fiscal-data into dev ... Reviewed-on: #1096 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 09:38:14 +00:00
Pau	d60f6769b4	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-25 08:53:01 +00:00
Pau	9089ba7346	requested changes	2022-10-25 10:42:16 +02:00
Pau	23598c993b	Change ACL from employee to hr	2022-10-25 09:25:15 +02:00
Joan Sanchez	5811a0f56e	Merge pull request 'MASTER_hotfix: check if email exists' (!1103) from 4708-client.basic-data into master ... Reviewed-on: #1103 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 06:21:36 +00:00
Alex Moreno	e8500f926c	feat(invoiceIn): add email	2022-10-25 08:19:56 +02:00
Joan Sanchez	4520443734	fix: Intl polyfill for spanish locale	2022-10-25 08:16:56 +02:00
Vicent Llopis	931a891f71	fix: check client.email exists	2022-10-25 08:09:23 +02:00
Vicent Llopis	7f1dd801a5	refactor: change ACLs	2022-10-25 07:56:17 +02:00
Vicent Llopis	8a3573474a	refactor: move 'lastEntries' to thrid position in descriptor	2022-10-25 07:40:32 +02:00
Alex Moreno	7cb8175b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-25 07:36:21 +02:00
Vicent Llopis	d18b22bb05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-25 07:05:26 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Joan Sanchez	fe95c45c42	Merge pull request 'MASTER_hotFix(receipt): add receiptPdf' (!1100) from hotFix_receiptPdf into master ... Reviewed-on: #1100 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-24 10:23:05 +00:00