70 Commits

Author	SHA1	Message	Date
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Guillermo Bonet	8da36569f7	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:44:43 +01:00
Guillermo Bonet	3d1c69be56	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:43:32 +01:00
Guillermo Bonet	2f611391b9	Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery" ... This reverts commit bfd6e1f398.	2023-11-17 07:17:29 +01:00
Guillermo Bonet	bfd6e1f398	refactor: refs #4502 Deleted zoneEstimatedDelivery	2023-11-16 08:29:00 +01:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Sergio De la torre	881a1ee0b8	refs #5652 modify: solved Tests	2023-09-15 11:24:17 +02:00
Carlos Satorres	b1b6bd13ea	refs #5843 change userFk	2023-08-22 10:45:41 +02:00
Pablo Natek	9594bd68b5	refs #4795	2023-04-12 21:10:50 +02:00
Vicent Llopis	92aed3eac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 08:11:35 +01:00
Vicent Llopis	afdfe5e3f3	refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'	2023-03-23 14:55:19 +01:00
Vicent Llopis	27bb50ad12	refs #5342 esta tabla ya se borra en el proc	2023-03-22 12:17:48 +01:00
Vicent Llopis	d276c7b611	refs #5342 unificados proc x_getWarnings	2023-03-22 10:57:18 +01:00
Vicent Llopis	2f2d65bfd6	refs #5342 feat: añadido icono en los tickets que tengan sales fragiles	2023-03-16 10:33:24 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Joan Sanchez	721f89b76c	fix(ordersFilter): wrong table schema	2022-11-17 16:39:12 +01:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Alexandre Riera	ff00066138	refs #4700 tests front y fixtures	2022-11-08 15:56:58 +01:00
Alex Moreno	74383b61e7	hotFix(monitor): use left join in ticketState	2022-10-13 09:22:53 +02:00
Alex Moreno	a15c051098	fix(monitor_salesFilter): mariadb not optimize query	2022-09-08 08:07:46 +02:00
Alex Moreno	886abfd897	fix(monitor): fix left join salesFilter	2022-09-07 08:49:24 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	7c7c64415d	fix(monitor_ticket): add isTooLittle problem	2022-05-31 12:00:15 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Alex Moreno	ac4d4e6db1	test and fixtures	2022-05-04 10:59:37 +02:00
Alex Moreno	b5a73ec3a2	fix(monitor_client): clientsFilter refactor	2022-05-04 10:32:14 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Vicent Llopis	6c43ea716e	fix: update test failed	2022-03-29 09:10:42 +02:00
Alex Moreno	8eebe1abbb	feat(monito_clients): smart-table and filter by date	2022-03-21 11:32:26 +01:00
Carlos Jimenez Ruiz	e9189509c2	Merge branch 'dev' into 3552-monitor_ticket_state	2022-02-03 09:50:01 +00:00
Joan Sanchez	483a67e8b5	fix(salesFilter): search by ticket id	2022-02-02 09:26:33 +01:00
Alex Moreno	78b3df0b6a	feat(monitor_ticket): classColor in db	2022-01-31 13:15:37 +01:00
Joan Sanchez	872f5b488b	Merge branch 'dev' into 3411-route_ticket_fixtures	2021-12-20 09:40:34 +00:00
Joan Sanchez	4cb346c2a8	fix(monitor): changed order to prevent row duplication ... Refs: 3458	2021-12-17 12:40:23 +01:00
Vicent Llopis	ac3dc039fe	feat: add fixtures of ticket and update test	2021-12-01 12:49:53 +01:00
Carlos Jimenez Ruiz	13c06bf5be	refactor(monitors): added transactions to endpoints	2021-10-22 17:32:10 +02:00
Carlos Jimenez Ruiz	05df98939b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-15 14:47:34 +02:00
Joan Sanchez	d5cf57fbb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 14:07:48 +02:00
Joan Sanchez	b6a9896cba	Fixed monitor problems filter	2021-10-15 12:10:28 +02:00
Joan Sanchez	85b4730c6c	feat(monitor): show client risk to future on tickets ... Refs: 2624	2021-10-15 10:49:23 +02:00
Carlos Jimenez Ruiz	99043bd94e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-14 16:21:55 +02:00
Joan Sanchez	d06385fc73	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-13 15:09:34 +02:00
Joan Sanchez	c0e1f2f0dc	Changed column order	2021-10-13 14:55:53 +02:00
Joan Sanchez	31e160559b	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:28:50 +02:00
Joan Sanchez	a0a01de937	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:17:45 +02:00
Carlos Jimenez Ruiz	cb3d0678ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 10:09:51 +02:00
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +02:00
Joan Sanchez	08cba0a9c8	fix(filter): search limit by date range was not being applied ... Refs: 3059	2021-09-21 15:49:59 +02:00