12689 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	a8e01909d0	ancho ok	2021-06-15 09:02:00 +02:00
Carlos Jimenez Ruiz	9c0cff2f3a	removed unused code	2021-06-14 16:09:28 +02:00
Carlos Jimenez Ruiz	88a5443d64	table style changes	2021-06-14 15:52:46 +02:00
Joan Sanchez	bbac4483cd	Merge pull request '2931-entry_summary_pagination' (#650) from 2931-entry_summary_pagination into dev ... Reviewed-on: #650 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-14 10:58:48 +00:00
Carlos Jimenez Ruiz	b055308978	Merge branch '2931-entry_summary_pagination' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 12:36:16 +02:00
Carlos Jimenez Ruiz	e85b7b9817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz	187aa8d318	Merge branch 'dev' into 2931-entry_summary_pagination	2021-06-14 10:07:22 +00:00
Carlos Jimenez Ruiz	05d7eb837d	Merge pull request 'Worker calendar rework' (#645) from 2567-calendar_rework into dev ... Reviewed-on: #645 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-14 10:04:40 +00:00
Carlos Jimenez Ruiz	cdbab4d7bf	Merge branch 'dev' into 2567-calendar_rework	2021-06-14 10:00:47 +00:00
Joan Sanchez	82627d7e76	Merge pull request '2957-ticket_summary_postcode + fetched tags css' (#649) from 2957-ticket_summary_postcode into dev ... Reviewed-on: #649 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-14 10:00:24 +00:00
Carlos Jimenez Ruiz	c09d25ba48	Merge branch 'dev' into 2567-calendar_rework	2021-06-14 09:59:13 +00:00
Joan Sanchez	59e90c2c10	Removed commented block	2021-06-14 11:58:39 +02:00
Joan Sanchez	722c9ad4d4	Merge branch 'dev' into 2957-ticket_summary_postcode	2021-06-14 09:42:40 +00:00
Joan Sanchez	9547879f1b	Merge pull request 'route.tickets suggested tickets now shows both descriptors' (#648) from 2933-route_tickets_new_ticket_to_route into dev ... Reviewed-on: #648 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-14 09:40:48 +00:00
Carlos Jimenez Ruiz	7f69909bbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 11:39:04 +02:00
Carlos Jimenez Ruiz	f36b54f97b	invoiceOut summary tickets pagination + refactor	2021-06-14 11:38:57 +02:00
Joan Sanchez	a303b98093	Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route	2021-06-14 09:37:23 +00:00
Joan Sanchez	24b300939a	Merge pull request 'invoiceIn basic data and summary added some fields' (#647) from 2942-invoiceIn-basicdata into dev ... Reviewed-on: #647 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-14 09:36:32 +00:00
Javi Gallego	44ce54ede4	seccion en summary	2021-06-14 09:47:04 +02:00
Joan Sanchez	de30a2d978	Total holidays fix	2021-06-14 08:09:53 +02:00
Carlos Jimenez Ruiz	f0292c0b03	updated all fetched tags font-size to 1rem	2021-06-13 19:44:50 +02:00
Carlos Jimenez Ruiz	5d8a9938d6	formattedAddress tests amended for postcode	2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz	48f80fad8f	added postcode to summary + basic data translation	2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz	7bf832079d	route.tickets suggested tickets now shows both descriptors	2021-06-11 13:02:18 +02:00
Joan Sanchez	17a6dfc81b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-11 10:58:40 +02:00
Joan Sanchez	a72010554c	Fixes and E2E updated	2021-06-11 10:58:00 +02:00
Carlos Jimenez Ruiz	c776d34cdf	invoiceIn basic data and summary added some fields	2021-06-10 17:08:21 +02:00
Carlos Jimenez Ruiz	7775eb7951	Merge pull request '2951 - Added transaction to updateVolume() method' (#646) from 2951-fix_unit_test into dev ... Reviewed-on: #646 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-10 14:28:47 +00:00
Joan Sanchez	e8fd1c9c9c	Merge branch 'dev' into 2951-fix_unit_test	2021-06-10 14:24:17 +00:00
Joan Sanchez	31f8336bc9	Merge pull request 'ticket expedition now shows scan worker and scanned date' (#644) from 2947-new_ticket_expedition_fields into dev ... Reviewed-on: #644 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-10 14:22:57 +00:00
Joan Sanchez	be791d1f00	2951 - Added transaction to updateVolume() method	2021-06-10 16:08:44 +02:00
Joan Sanchez	3f3e5c2735	Unit tests	2021-06-10 16:05:10 +02:00
Joan Sanchez	1b62233ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-10 14:22:13 +02:00
Joan Sanchez	8284702603	2567 - Working calendar refactor	2021-06-10 11:24:32 +02:00
Carlos Jimenez Ruiz	fc3af7b6a6	ticket expedition now shows scan worker and scanned date	2021-06-09 14:25:50 +02:00
Joan Sanchez	e3484750ba	Merge pull request 'ticket create now takes clientFk from params' (#643) from 2946-ticket_create_from_client_tickets into dev ... Reviewed-on: #643 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-09 09:42:50 +00:00
Javi Gallego	acf03959f5	creada seccion invoiceInTax	2021-06-09 10:20:18 +02:00
Carlos Jimenez Ruiz	c4f07d238e	new ticket index selector updated	2021-06-09 09:33:33 +02:00
Carlos Jimenez Ruiz	f969323a86	ticket create now takes clientFk from params	2021-06-08 17:30:00 +02:00
Joan Sanchez	3c8629b3f3	Added entilementRate effects	2021-06-08 16:36:16 +02:00
Joan Sanchez	43ddd509b6	Merge pull request '2945-travel_create_e2e_fix' (#642) from 2945-travel_create_e2e_fix into dev ... Reviewed-on: #642 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:54:44 +00:00
Carlos Jimenez Ruiz	485ab14501	Merge branch 'dev' into 2945-travel_create_e2e_fix	2021-06-08 07:51:43 +00:00
Joan Sanchez	6017f5090d	Merge pull request 'getWorkedHours refactor' (#641) from 2943-timecontrol_now_showing_hours into dev ... Reviewed-on: #641 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:50:45 +00:00
Carlos Jimenez Ruiz	76e723cc34	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-08 07:47:42 +00:00
Joan Sanchez	67b9fb2c37	Merge pull request '2937-module_transactions' (#640) from 2937-module_transactions into dev ... Reviewed-on: #640 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:46:14 +00:00
Carlos Jimenez Ruiz	943ce150b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2945-travel_create_e2e_fix	2021-06-08 09:37:00 +02:00
Carlos Jimenez Ruiz	d164cb1c2c	added waitForTimeout to e2e for the autocompleted fields	2021-06-08 09:34:49 +02:00
Javi Gallego	8878a2280a	models	2021-06-08 08:04:38 +02:00
Joan Sanchez	4674fc9414	Merge branch 'dev' into 2937-module_transactions	2021-06-08 05:43:55 +00:00
Joan Sanchez	d7bb6cb184	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-07 15:02:29 +02:00