12572 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	ec41123772	button for insert rows	2022-03-15 09:36:48 +01:00
Alex Moreno	f774b1f784	typo	2022-03-15 09:13:35 +01:00
Vicent Llopis	6742d7aa43	upload db changes	2022-03-15 07:22:15 +01:00
Alex Moreno	31eb22c1b4	feat(db): update users to role deliveryBoss	2022-03-14 11:34:09 +01:00
Alex Moreno	bacfa3f1f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3689-deliveryBoss	2022-03-14 10:27:00 +01:00
Alex Moreno	0fd556dd2a	fix(worker): fix calendar e2e	2022-03-11 13:23:02 +01:00
Vicent Llopis	97f856afcc	corrected comment	2022-03-11 12:24:53 +01:00
Vicent Llopis	aa5ff474ec	solved test e2e	2022-03-11 12:21:39 +01:00
Vicent Llopis	6a91fe6c11	solved backTest	2022-03-10 14:43:07 +01:00
Vicent Llopis	7f5b30aa87	delete frontTest	2022-03-10 10:40:52 +01:00
Vicent Llopis	ba31d96cdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-10 10:36:02 +01:00
Vicent Llopis	16208a5e11	especify PK	2022-03-10 10:35:35 +01:00
Vicent Llopis	189fe2ed41	update acl	2022-03-10 08:14:50 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Juan Ferrer	d49d1b437c	User.login() error fixed	2022-03-09 15:34:26 +01:00
Carlos Jimenez Ruiz	8e37518449	Merge pull request '3636-feat(route): add ticket-popup' (#895) from 3636-route_index into dev ... Reviewed-on: #895 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-09 09:13:29 +00:00
Vicent Llopis	91a23088c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-09 08:40:55 +01:00
Alex Moreno	9c4d58fc1a	refactor(ticket-popup): extends from dialog	2022-03-09 08:08:13 +01:00
Alex Moreno	b11a6a7c5c	feat(route): add ticket-popup and tests	2022-03-08 15:17:18 +01:00
Alex Moreno	c8a512db4e	unnecessary	2022-03-08 15:16:36 +01:00
Alex Moreno	62aeea04bc	refactor(print): report driver-route remove ticket.import	2022-03-08 15:15:59 +01:00
Vicent Llopis	97f2341ae0	pull request changes	2022-03-08 13:42:44 +01:00
Carlos Jimenez Ruiz	20ee9727e9	Merge pull request '3626-client_basic-data' (#883) from 3626-client_basic-data into dev ... Reviewed-on: #883 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-08 08:57:21 +00:00
Carlos Jimenez Ruiz	4fc6da5ba9	Merge branch 'dev' into 3626-client_basic-data	2022-03-08 08:53:03 +00:00
Carlos Jimenez Ruiz	9826278829	Merge pull request '3644-feat(client_descriptor): add supplier quick-link' (#892) from 3644-client_descriptor into dev ... Reviewed-on: #892 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-08 08:50:22 +00:00
Vicent Llopis	527387aad5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-03-08 08:45:40 +01:00
Alex Moreno	e8d7ce7cc7	refactor(ticket): change role productionBoss to deliveryBoss	2022-03-07 14:50:51 +01:00
Vicent Llopis	6b51b7ddd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-07 13:54:33 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	4e3fe180ca	feat(client_descriptor): add supplier quick-link	2022-03-07 13:25:55 +01:00
Vicent Llopis	f88f60ef27	refactor code and icons	2022-03-07 12:43:05 +01:00
Carlos Jimenez Ruiz	76b63c8c45	Merge pull request '3676-zone_delivery-days' (#891) from 3676-zone_delivery-days into dev ... Reviewed-on: #891 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-07 10:26:04 +00:00
Alex Moreno	0359e05def	description	2022-03-07 11:22:16 +01:00
Alex Moreno	56bdb85af5	translations	2022-03-07 10:28:55 +01:00
Alex Moreno	a136d8b03d	accept array in params	2022-03-07 10:10:45 +01:00
Alex Moreno	b421038bbe	typo	2022-03-07 08:11:21 +01:00
Alex Moreno	dedbccae19	description	2022-03-07 08:07:34 +01:00
Alex Moreno	2c853a7885	test(zone): getZoneClosing() front and back	2022-03-07 08:02:59 +01:00
Vicent Llopis	c1f15d4b91	Merge branch '3638-export_database' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 13:06:54 +01:00
Vicent Llopis	87daac03ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 13:06:38 +01:00
Alex Moreno	efa32a3dc7	export structure	2022-03-04 13:04:28 +01:00
Alex Moreno	138e2ee9b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 12:25:05 +01:00
Alex Moreno	a658969afa	feat(zone_delivery-days): get real closing hour	2022-03-04 12:24:01 +01:00
Vicent Llopis	10d48f9bb4	refactor uppercase	2022-03-04 12:01:32 +01:00
Vicent Llopis	b58020978a	fix: check cannot attach more than one file	2022-03-04 11:59:45 +01:00
Alex Moreno	a434d9268b	fix(zone_upcoming-deliveries): fix backgroundcolor	2022-03-04 11:48:18 +01:00
Vicent Llopis	d22be6620c	feat: add backTest	2022-03-04 11:28:45 +01:00
Vicent Llopis	cff1e6cfbf	feat: check cannot attach more than one pdf	2022-03-04 11:28:26 +01:00
Carlos Jimenez Ruiz	9203c38234	Merge pull request '3671-supplier_account' (#889) from 3671-supplier_account into dev ... Reviewed-on: #889 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-04 08:59:36 +00:00