13131 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	107a0a6555	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-25 11:35:12 +02: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	ddbbfa4360	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-25 07:46:39 +00:00
Pau	d937a1b505	Add acl	2022-10-25 09:45:09 +02:00
Pau	23598c993b	Change ACL from employee to hr	2022-10-25 09:25:15 +02:00
Joan Sanchez	8f0b566935	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 07:25:07 +00:00
Pau	a43e642ff7	Add transferclient	2022-10-25 09:23:46 +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
Vicent Llopis	c77999871e	refs #3951	2022-10-24 14:34:17 +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
Alex Moreno	a66c5e6798	acl	2022-10-24 11:30:17 +02:00
Alex Moreno	6a17a634d4	hotFix(receipt): add receiptPdf	2022-10-24 09:49:51 +02:00
Alex Moreno	d29d1ff538	Merge branch '4548-invoiceIn-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-24 08:27:12 +02:00
Alex Moreno	6c38835e8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-24 08:20:25 +02:00
Pau	25e934a591	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-24 06:02:20 +00:00
Joan Sanchez	04be661b68	Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev ... Reviewed-on: #1094	2022-10-21 10:38:11 +00:00
Joan Sanchez	ceeab73cf2	Merge pull request '4091-dms_clean_fix2' (!1091) from 4091-dms_clean_fix2 into dev ... Reviewed-on: #1091 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-21 10:36:45 +00:00
Joan Sanchez	cf0b750304	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-21 12:35:01 +02:00
Vicent Llopis	888f612dbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-21 11:41:53 +02:00
Vicent Llopis	18c119c62a	change acl	2022-10-21 09:20:27 +02:00
Vicent Llopis	f968b19d1e	fix: testFront	2022-10-21 09:08:17 +02:00
Vicent Llopis	c33cab7b10	fix: test back	2022-10-21 09:01:08 +02:00
Vicent Llopis	2d0cb60b50	feat: check if uses mana	2022-10-21 08:55:05 +02:00
Vicent Llopis	e7261573d7	delete focus	2022-10-21 08:01:22 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Vicent Llopis	5da29fe381	refactor: unify duplicated code	2022-10-21 08:00:24 +02:00
Alex Moreno	066cf6f69b	add show dialog	2022-10-20 15:11:56 +02:00
Vicent Llopis	6891190c72	refactor: create endpoint to unify code	2022-10-20 15:05:46 +02:00
Joan Sanchez	32dcdf8f8d	Merge pull request 'MASTER_hotFix(driver-route): if not have tickets' (!1098) from hotFix-driver-route-pdf into master ... Reviewed-on: #1098	2022-10-20 12:32:34 +00:00
Vicent Llopis	29093d7d30	feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas	2022-10-20 14:25:55 +02:00
Alex Moreno	c23d58da69	fix if not ticket	2022-10-20 14:21:36 +02:00
Vicent Llopis	dd15d06f5e	delete focus test	2022-10-20 10:21:44 +02:00
Vicent Llopis	5824fee213	feat: add e2e	2022-10-20 09:40:23 +02:00
Vicent Llopis	2da34d0850	feat: add e2e	2022-10-20 09:40:11 +02:00
Alex Moreno	3564cbe246	Merge pull request 'MASTER_4689-hotFix(route_index): fix driverRoutePdf' (!1095) from hotFix_driverRoutePdf2 into master ... Reviewed-on: #1095 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-20 07:22:07 +00:00
Pau	aa13034ee6	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-20 07:10:21 +00:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	bcc9acac0a	fix: tBack	2022-10-20 08:41:00 +02:00
Vicent Llopis	51cad75298	fix: testFront	2022-10-20 08:17:15 +02:00
Pau	b1a792eb2d	Merge branch '4153-supplier.fiscal-data' of https://gitea.verdnatura.es/verdnatura/salix into 4153-supplier.fiscal-data	2022-10-20 08:00:49 +02:00