12042 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	1e275eb4e3	Invoice folder	2022-03-16 14:26:56 +01:00
Joan Sanchez	e5bbff80d4	Added storage on gitignore	2022-03-16 14:24:51 +01:00
Joan Sanchez	dc21408b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-03-16 14:24:20 +01:00
Joan Sanchez	22002c2ee9	Added storage pdf folder	2022-03-16 14:24:18 +01:00
Vicent Llopis	26f77ca07e	add panel-search	2022-03-16 13:02:48 +01:00
Alex Moreno	7a45b6014a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-16 07:45:09 +01:00
Carlos Jimenez Ruiz	2d4f182fe6	Merge pull request '3690-fix(worker): fix calendar e2e' (#896) from 3690-worker_calendar_fixe2e into dev ... Reviewed-on: #896 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 14:34:27 +00:00
Carlos Jimenez Ruiz	969ddb3e37	Merge branch 'dev' into 3690-worker_calendar_fixe2e	2022-03-15 14:22:12 +00:00
Alex Moreno	e0924ea373	refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh	2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz	17c95a654e	Merge pull request '3604-route_agencyTerm' (#893) from 3604-route_agencyTerm into dev ... Reviewed-on: #893 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 14:18:24 +00:00
Carlos Jimenez Ruiz	3098fc36fb	Merge branch 'dev' into 3604-route_agencyTerm	2022-03-15 14:14:16 +00:00
Alex Moreno	499cfb2797	Merge branch '3690-worker_calendar_fixe2e' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e	2022-03-15 15:12:01 +01:00
Alex Moreno	39b3e35725	change description	2022-03-15 15:11:58 +01:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Vicent Llopis	1ecc76067a	code to correct insert in model	2022-03-15 14:50:09 +01:00
Alex Moreno	c7d8ebebff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e	2022-03-15 14:49:22 +01:00
Carlos Jimenez Ruiz	9ea3c1832e	Merge branch 'dev' into 3690-worker_calendar_fixe2e	2022-03-15 13:31:43 +00:00
Carlos Jimenez Ruiz	a9f4386ad6	Merge pull request '3689-refactor(ticket): change role productionBoss to deliveryBoss' (#894) from 3689-deliveryBoss into dev ... Reviewed-on: #894 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 13:31:16 +00:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Vicent Llopis	656efa2be9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-15 12:23:28 +01:00
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