3445 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	5c18c5c94c	ticket module descriptor now takes warehouseFk from the ticket	2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz	1bfe537186	claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig	2021-05-21 15:31:05 +02:00
Joan Sanchez	60185bdf34	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-21 07:24:34 +00:00
Joan Sanchez	a103c8d7fc	2891 - Get ticket problems for every sale	2021-05-21 08:49:32 +02:00
Joan Sanchez	6f245698f2	Merge branch 'dev' into 2620-mostrar-disponible	2021-05-21 06:29:43 +00:00
Joan Sanchez	b7049122fe	Url fix	2021-05-20 10:28:37 +02:00
Joan Sanchez	fbc11b7a39	Merge branch 'dev' into 2921-notification_url	2021-05-20 08:23:45 +00:00
Javi Gallego	df073cce2f	refactor tod usa get sales	2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz	2494af0113	removed unused relation from item @addSale	2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz	5eb0ab8296	add and edit sales no longer intervene the prices	2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Joan Sanchez	a5c3ba3926	2921 - Changed the ticket url of rocket notifications	2021-05-19 10:26:58 +02:00
Joan Sanchez	714142f868	Merge branch 'dev' into 2908-label_value_full_text	2021-05-18 12:53:33 +00:00
Joan Sanchez	98d7f246a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-18 14:44:38 +02:00
Joan Sanchez	a9e33abacc	FIX: Show employee list	2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz	e10dc53a9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 14:22:36 +02:00
Joan Sanchez	3402bd119d	Css fixes	2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz	06d396a76a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz	c0e2ff12da	moved vn-log to salix components + css changes and renamed worker-log to log	2021-05-18 13:22:40 +02:00
Joan Sanchez	5c760b3faa	Max height	2021-05-18 12:21:01 +02:00
Joan Sanchez	b87e79b9d3	Changes	2021-05-18 11:58:32 +02:00
Joan Sanchez	6ec28cbc86	Removed transaction block	2021-05-18 11:58:32 +02:00
Joan Sanchez	bc7f2d8193	Responsive	2021-05-18 11:58:32 +02:00
Joan Sanchez	bb67277c68	#2913, #2914 - Changes to sales monitors	2021-05-18 11:58:32 +02:00
Joan Sanchez	400bf7b4f2	Changes	2021-05-18 10:05:13 +02:00
Joan Sanchez	5d278f416f	Removed transaction block	2021-05-18 10:04:01 +02:00
Joan Sanchez	bf250b77ef	Responsive	2021-05-18 09:12:47 +02:00
Joan Sanchez	10387ee40b	#2913, #2914 - Changes to sales monitors	2021-05-18 08:41:36 +02:00
Carlos Jimenez Ruiz	5843140cf5	minor refactor for code usage instead of description	2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz	e848b94859	removed LEFT from join	2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz	3a25dbc3b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-17 09:05:15 +02:00
Joan Sanchez	085a5a104b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-17 08:39:55 +02:00
Joan Sanchez	b67c95e5f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-17 07:38:04 +02:00
Joan Sanchez	378175224c	HOTFIX: Buyer ACL	2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz	b902a4dd4a	front unit test fix	2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz	97e9dc57bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Joan Sanchez	e45af1c60a	Updated unit test	2021-05-14 13:56:04 +02:00
Joan Sanchez	c0f2590b61	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-14 12:56:10 +02:00
Joan Sanchez	e39758ee16	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-14 12:46:54 +02:00
Joan Sanchez	a70b29f9bf	#2916 - HOTFIX: Grouping selection limit	2021-05-14 12:44:23 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	c4357ea577	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-13 12:27:01 +02:00
Joan Sanchez	e6f7ef41b0	Hotfix: Catalog items without ink	2021-05-13 12:21:12 +02:00
Joan Sanchez	ac02f8b309	Ticket request hotfix	2021-05-13 12:18:21 +02:00
Joan Sanchez	24981912e4	2907 - Proper claim rate percentage	2021-05-13 12:13:15 +02:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz	95666ccc1d	Merge branch 'dev' into 2905-restore_ticket_date	2021-05-13 07:44:01 +00:00
Joan Sanchez	4a1d286a95	2907 - Proper claim rate percentage	2021-05-13 09:17:49 +02:00
Joan Sanchez	af49a66911	Unit test fix	2021-05-13 08:57:49 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	8af66a7ca5	HOTFIX: Sort by column	2021-05-12 15:11:07 +02:00
Joan Sanchez	b3cbf9374c	Hotfix: Catalog items without ink	2021-05-12 14:22:29 +02:00
Joan Sanchez	9363726d67	Updated unit test	2021-05-12 13:37:01 +02:00
Joan Sanchez	873fc54dff	More ammends	2021-05-12 13:18:58 +02:00
Joan Sanchez	65f0cb4612	More ammends	2021-05-12 13:14:41 +02:00
Joan Sanchez	6f5df10413	Removed controller	2021-05-12 13:06:36 +02:00
Joan Sanchez	eecba426ee	Removed unused class	2021-05-12 13:00:54 +02:00
Joan Sanchez	b828609d33	Ammends	2021-05-12 12:39:45 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz	83d6581349	indentation correction	2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz	457d23dc16	reoute tickets order columns + endpoint refactor	2021-05-12 09:51:32 +02:00
Joan Sanchez	e22da9b0d5	Merge branch 'dev' into 2863-monitor_module	2021-05-12 07:14:08 +00:00
Joan Sanchez	88616862cb	Updated unit tests	2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz	d4eedc69e1	indentation on route filter	2021-05-11 12:53:08 +02:00
Joan Sanchez	6ae8b72268	Merge branch 'dev' into 2902-error-getSuggestedTickets	2021-05-11 09:52:42 +00:00
Joan Sanchez	d2169000f4	Merge branch 'dev' into 2863-monitor_module	2021-05-11 07:46:18 +00:00
Joan Sanchez	dc44af148d	2863 - Added sales monitor	2021-05-11 09:43:15 +02:00
Carlos Jimenez Ruiz	ac917b6115	mino changes on translations	2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz	58447c8168	transaltion changes	2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz	657896bce0	increased section width	2021-05-10 10:32:00 +02:00
Javi Gallego	84cd89d7f7	modifica la descripcion de la compensacion	2021-05-07 08:45:20 +02:00
Javi Gallego	19b35f5f6c	landed en lugar de shipped	2021-05-07 07:52:03 +02:00
Javi Gallego	f1c30ca6d1	cambio landed por created	2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz	245243aa14	routes without vehicle or vehicles without drop off now throw	2021-05-05 13:36:54 +02:00
Joan Sanchez	db148c8177	2863 - Added monitor module	2021-05-04 12:44:21 +02:00
Joan Sanchez	1efe8cb683	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption	2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz	47e36913a1	Merge branch 'dev' into 2770-supplier_address	2021-05-03 11:55:55 +00:00
Joan Sanchez	8f3d2d892d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-03 12:13:20 +02:00
Joan Sanchez	03e77685a1	SMS hotfix	2021-05-03 12:09:12 +02:00
Joan Sanchez	4d90006aa6	Updated unit test	2021-04-30 14:27:50 +02:00
Joan Sanchez	07dbeaf515	2727 - Send consumption report to an email address	2021-04-30 13:50:41 +02:00
Joan Sanchez	fcc8ab4236	Added model ACL	2021-04-30 10:08:40 +02:00
Joan Sanchez	dbe22844a6	Removed unused method	2021-04-30 09:53:20 +02:00
Joan Sanchez	5445764043	Added supplier address fixtures	2021-04-30 08:26:05 +02:00
Joan Sanchez	61a63ad76f	Merge branch 'dev' into 2770-supplier_address	2021-04-29 12:42:42 +00:00
Joan Sanchez	330b6bdf8a	2770 - Added supplier addresses section	2021-04-29 14:41:10 +02:00
Joan Sanchez	5a53cb09da	Create receipt button changed role to salesAssistant	2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz	eea8ed9a3c	front unit test entry import buys fix	2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz	3c280eed2e	e2e path for entry buy after entry import path	2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz	9ef4497ea6	translations and tittles	2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz	d3b22d7078	controller refactor to remove repeated code	2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz	e53298f35c	test new uses transaction	2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz	ddc19ddbcd	enpoint now receives all data for a buy + css refactor	2021-04-28 11:15:02 +02:00
Carlos Jimenez Ruiz	65457d6dac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy	2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz	daa94e4eb5	entry buy index	2021-04-28 10:32:24 +02:00
Javi Gallego	9ee1385cd1	test ok	2021-04-26 12:33:33 +02:00
Javi Gallego	2395a0af63	done	2021-04-26 12:24:16 +02:00
Javi Gallego	4a7a4f6dcf	test ok	2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz	0abb8f2d5f	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-21 13:21:16 +00:00
Carlos Jimenez Ruiz	94cd6cfb3e	watcher aint looking after data changed to disable test conn button	2021-04-19 13:23:08 +02:00
Carlos Jimenez Ruiz	857c508391	Merge branch 'dev' into 2729-prices_popover	2021-04-19 07:59:09 +00:00
Javi Gallego	cd4f93f326	minor fixes	2021-04-16 18:35:03 +02:00
Javi	f7fa363fa5	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz	420f05bb03	mocked api client due to service instability	2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz	56ec7b4729	input number made wider	2021-04-16 10:17:59 +02:00
Carlos Jimenez Ruiz	9a4c056059	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover	2021-04-16 10:07:18 +02:00
Carlos Jimenez Ruiz	17904c4edb	only undo and save buttons are disabled until data changed now	2021-04-16 09:20:02 +02:00
Joan Sanchez	2cdafeecf4	Added unit tests	2021-04-15 14:30:47 +02:00
Joan Sanchez	bf976a3e8f	2729 - Prices popover refactor	2021-04-15 14:30:30 +02:00
Carlos Jimenez Ruiz	2ebd812a1f	updated model + translations	2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz	41ab1bbe35	fixed a test where invoiceIn was nested into the summary	2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz	38f43eca3b	invoiceIn basicData + index preview of summary	2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz	69069d5e28	invoiceIn summary frontend	2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz	ec378a17ae	invoiceIn model updated a summary registered	2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz	8faa1531c6	summary route + test	2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz	d8628379dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary	2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz	b2ecd7d3c2	Merge branch 'dev' into 2878-activeWorkers_refactor	2021-04-14 08:15:06 +00:00
Joan Sanchez	dac95805e8	2882 - Replaced worker userFk property by user id	2021-04-14 09:02:08 +02:00
Joan Sanchez	78313bd9a7	Updated unit tests	2021-04-14 08:15:03 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz	01f0fed0c3	Merge branch 'dev' into 2483-email_replyTo	2021-04-13 08:41:56 +00:00
Joan Sanchez	7033ec2c11	Added missing translations	2021-04-13 10:39:42 +02:00
Carlos Jimenez Ruiz	90a7c803fd	descriptor invoiceIn amount	2021-04-12 16:32:13 +02:00
Carlos Jimenez Ruiz	b6f31d7d44	invoiceIn descriptor implementation	2021-04-12 12:43:17 +02:00
Carlos Jimenez Ruiz	6f0c48847a	Merge branch 'dev' into 2815-ticket_without_state	2021-04-08 11:53:25 +00:00
Joan Sanchez	af0307a419	2859 - Force translation for SMS	2021-04-08 13:39:11 +02:00
Joan Sanchez	418d7a2d12	Updated unit test	2021-04-07 14:14:31 +02:00
Joan Sanchez	e40911e833	2815 - Fix ticket without state	2021-04-07 13:39:36 +02:00
Joan Sanchez	465955d0c5	2483 - Added replyTo param when sending an email to client	2021-04-07 13:09:53 +02:00
Carlos Jimenez Ruiz	2d041142c3	Merge branch 'dev' into 2631-notify_incomplete	2021-04-07 09:30:05 +00:00
Joan Sanchez	93399d6de6	Updated description	2021-04-07 11:18:44 +02:00
Joan Sanchez	6c36ab3905	Removed back button	2021-04-07 10:47:31 +02:00
Joan Sanchez	d4c6695629	2631 - Notify status change to incomplete	2021-04-07 07:45:00 +02:00
Joan Sanchez	65dc0e3780	2615 - Waste breakdown	2021-04-06 13:46:38 +02:00
Joan Sanchez	5ef3ff40ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-06 09:14:11 +02:00
Joan Sanchez	a2144405ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-02 17:04:37 +02:00
Joan Sanchez	9bbf43c590	Replace http with https	2021-04-02 14:34:16 +02:00
Javi Gallego	47a3779c45	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-01 18:39:18 +02:00
Javi Gallego	336472291d	test	2021-04-01 18:38:40 +02:00
Javi Gallego	eec901684a	reviso test	2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz	893de63f74	Merge branch 'dev' into 2866-descriptor_photo	2021-04-01 14:51:05 +00:00
Joan Sanchez	b4cceff4cb	2866 - Limit descriptor photo size to width 100%	2021-04-01 14:20:00 +02:00
Joan Sanchez	fa0b01a0d5	Fixed buttons alignment	2021-04-01 14:00:34 +02:00
Joan Sanchez	91c26ee5a5	Removed filter import	2021-04-01 13:55:01 +02:00
Joan Sanchez	389f10bda0	Removed entry import	2021-04-01 13:51:55 +02:00
Joan Sanchez	f89419962d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index	2021-04-01 13:42:38 +02:00
Javi Gallego	67f822ebdc	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-01 13:14:26 +02:00
Joan Sanchez	41ee6e70a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-01 08:42:02 +02:00
Javi Gallego	c036c7c7fe	model ok	2021-03-31 07:33:00 +02:00