3539 Commits

Author	SHA1	Message	Date
Joan Sanchez	8695fadc18	Merge branch 'dev' into 2948-ticket_sale_itemPackingType	2021-06-18 05:21:01 +00:00
Joan Sanchez	bbbf008076	Added done() to async beforeAll()	2021-06-17 16:09:17 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz	b906a8e91d	added ticket.nickname to basicdata	2021-06-17 11:52:12 +02:00
Javi Gallego	e2f32a60fd	cambio campos en front	2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz	47ad63c154	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight	2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz	588a499c44	editLatestsBuys now is called only with id and itemFk	2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz	f5ad0c9c1c	Merge branch 'dev' into 2961-summary_tickets	2021-06-16 10:18:47 +00:00
Joan Sanchez	447d8341e7	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:49:12 +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	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	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	9591f04853	Merge branch 'dev' into 2938-entry_buy_style	2021-06-15 12:18:59 +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
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
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	cdbab4d7bf	Merge branch 'dev' into 2567-calendar_rework	2021-06-14 10:00:47 +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
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	de30a2d978	Total holidays fix	2021-06-14 08:09:53 +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
Joan Sanchez	e8fd1c9c9c	Merge branch 'dev' into 2951-fix_unit_test	2021-06-10 14:24:17 +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
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
Carlos Jimenez Ruiz	76e723cc34	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-08 07:47:42 +00:00
Carlos Jimenez Ruiz	238975644f	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz	3894fe94ec	Merge branch 'dev' into 2937-module_transactions	2021-06-07 13:02:20 +00:00
Joan Sanchez	8fa64122f8	Ammends	2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz	a46fef5295	endpoint minor refactor	2021-06-07 14:26:34 +02:00
Carlos Jimenez Ruiz	8fd7faa47b	fixed bug module importation + rewritten tests	2021-06-07 11:12:56 +02:00
Javi Gallego	c90fa41fae	accountingType.isAutoConciliated == true	2021-06-07 07:57:46 +02:00
Carlos Jimenez Ruiz	647b7a93cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions	2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz	b38605442e	transactions for entry module endpoints	2021-06-04 17:16:02 +02:00
Joan Sanchez	c853cfc86f	Refactor	2021-06-04 15:49:48 +02:00
Joan Sanchez	2c0fc7e45e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 11:46:37 +02:00
Joan Sanchez	6b65aa87d8	HOTFIX: Max width for client name field	2021-06-04 11:46:09 +02:00
Joan Sanchez	b77ecc2c06	changes2	2021-06-04 11:45:35 +02:00
Joan Sanchez	f8df3f1f3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-04 11:10:43 +02:00
Joan Sanchez	651a9356f3	Merge branch 'dev' into 2932-invoiceIn_log	2021-06-04 07:54:18 +00:00
Javi Gallego	2604c81533	falta solucionar test	2021-06-04 08:24:33 +02:00
Joan Sanchez	e1c1bb8425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 08:00:08 +02:00
Joan Sanchez	8bb254e93f	HOTFIX: Ticket monitor clientGetDebt	2021-06-03 16:29:45 +02:00
Joan Sanchez	edf18938a6	HOTFIX: clientGetDebt	2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz	b0bed3c1c4	invoiceInLog section, model and table	2021-06-03 16:14:52 +02:00
Joan Sanchez	d1daed3540	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-03 13:39:51 +02:00
Joan Sanchez	5962a68d15	HOTFIX: Sort by zone hour	2021-06-03 12:40:27 +02:00
Joan Sanchez	3fcd78e1f3	Changes	2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz	86631c84d0	moved transferor from fiscal data to basic data + e2e	2021-06-02 17:35:30 +02:00
Joan Sanchez	655380a52c	Removed focus	2021-06-02 10:33:10 +02:00
Joan Sanchez	07026a68bb	#2934 - HOTFIX: Route suggested tickets	2021-06-02 10:29:56 +02:00
Joan Sanchez	a594e63566	Chip color	2021-06-01 11:39:40 +02:00
Javi Gallego	70fc260eae	vnConfig solucionado	2021-06-01 10:10:09 +02:00
Javi Gallego	3a5d84b34c	rutas reparadas	2021-05-31 08:21:16 +02:00
Joan Sanchez	a24cfe0087	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-27 09:42:27 +00:00
Joan Sanchez	27cd54bef1	Updated icons title	2021-05-27 11:41:45 +02:00
Joan Sanchez	920e7b1daf	E2E fixes	2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz	3f167de10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions	2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz	d6ef5352a2	sale module now has canEdit endpoint to check arrays of sales	2021-05-26 09:14:18 +02:00
Joan Sanchez	099ff657e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems	2021-05-25 14:08:02 +02:00
Joan Sanchez	f6a0bcb12c	Updated unit tests	2021-05-25 13:33:17 +02:00
Joan Sanchez	26cc3a3dec	2891 - Show problems on tickets sales	2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz	e418d6239b	fixed getSummary unit test	2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz	2a4ff5a97b	fixed a problem where warehouseFk wasn't yet defined upon updateStock call	2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz	9a1b6e4653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse	2021-05-21 15:33:23 +02:00
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