11465 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	b7342ec15d	Merge pull request '2965-delete_travel_from_descriptor' (#656) from 2965-delete_travel_from_descriptor into dev ... Reviewed-on: #656 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-16 09:48:58 +00:00
Joan Sanchez	76623d8c95	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:47:45 +00:00
Joan Sanchez	0ce782a4de	Updated unit tests	2021-06-16 11:40:00 +02:00
Joan Sanchez	3e938fa9fb	Updated unit tests	2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz	b9cdc5ed6a	Merge branch 'dev' into 2965-delete_travel_from_descriptor	2021-06-16 08:19:01 +00:00
Joan Sanchez	efc9edb384	Fixes	2021-06-16 10:13:06 +02:00
Joan Sanchez	c3bebc9f7e	Merge pull request 'removed several columns from bulk edit and added packingOut' (#652) from 2929-entry_latestsbuys_refactor into dev ... Reviewed-on: #652 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-16 08:02:31 +00:00
Joan Sanchez	df94190a8c	Removed console log	2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz	34e0d0b7cf	translations update	2021-06-16 09:50:32 +02:00
Joan Sanchez	225bfd09b9	Missing translation	2021-06-16 09:47:54 +02:00
Joan Sanchez	c10f792619	Merge branch 'dev' into 2929-entry_latestsbuys_refactor	2021-06-16 07:44:30 +00:00
Joan Sanchez	353d0e352d	2961 - Show tickets on summary	2021-06-16 09:43:07 +02:00
Joan Sanchez	55908c0fca	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz	47c9071bdb	Merge pull request '2963 - Show section to all employee' (#655) from 2963-creditInsurance_acl into dev ... Reviewed-on: #655 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-15 14:43:44 +00:00
Carlos Jimenez Ruiz	1a053942a1	Merge branch 'dev' into 2963-creditInsurance_acl	2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz	8c1df0743d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor	2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz	8aa3d269ea	Travel descriptor now shows delete option if there are no entries	2021-06-15 16:41:01 +02:00
Joan Sanchez	2262f3e542	Merge pull request '2938-entry_buy_style' (#651) from 2938-entry_buy_style into dev ... Reviewed-on: #651 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-15 12:46:50 +00:00
Joan Sanchez	9591f04853	Merge branch 'dev' into 2938-entry_buy_style	2021-06-15 12:18:59 +00:00
Joan Sanchez	120be190ae	Merge pull request 'added missing html closing tag' (#653) from 2968-move_supplier_billingdata_form_buttons into dev ... Reviewed-on: #653 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-15 12:17:46 +00:00
Joan Sanchez	92e8f528e8	2963 - Show section to all employee	2021-06-15 14:16:12 +02:00
Joan Sanchez	2469409068	2941 - Monitor changes	2021-06-15 13:48:42 +02:00
Carlos Jimenez Ruiz	db3d5ca4d8	added missing html closing tag	2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz	7004ad5ade	removed several columns from bulk edit and added packingOut	2021-06-15 12:47:40 +02:00
Javi Gallego	500b68162b	summary con chip	2021-06-15 09:58:21 +02:00
Javi Gallego	5369e8d97e	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-15 09:09:08 +02:00
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