5674 Commits

Author	SHA1	Message	Date
Vicent Llopis	8c4e70c11d	Merge branch 'dev' into 3095-item.shelving	2022-11-02 14:06:06 +00:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	7eaafa36a0	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 13:42:26 +00:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Vicent Llopis	57564325e1	feat: añadidas opciones para confirmar o no confirmar el registro de horas	2022-11-02 14:22:18 +01:00
Alexandre Riera	8d8d217fe7	refs #4547 formateo arreglado	2022-11-02 13:59:13 +01:00
Alex Moreno	59e66e1f49	typo	2022-11-02 13:55:06 +01:00
Alex Moreno	2c3b735650	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-11-02 13:49:09 +01:00
Alex Moreno	6a9134d8f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-02 13:48:36 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Alex Moreno	acf76aeeef	Merge branch 'dev' into 4159-tableQ_filter	2022-11-02 12:25:38 +00:00
Alex Moreno	2a8a8ed84a	Merge branch 'dev' into 4146-claim_pickup_order	2022-11-02 12:01:11 +00:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Alex Moreno	4cded53347	Merge branch 'dev' into 4077-login_recover-password	2022-11-02 11:23:03 +00:00
Joan Sanchez	2fba17ab15	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 09:33:27 +00:00
Alexandre Riera	dc3ee2c30d	refs #2818 sincronización quitada en test	2022-11-02 10:18:38 +01:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Joan Sanchez	fe3ebe8e0c	Merge branch 'dev' into 3095-item.shelving	2022-11-02 06:43:43 +00:00
Joan Sanchez	177b448441	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 06:42:35 +00:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Joan Sanchez	33c92a0f24	Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev ... Reviewed-on: #1076 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:34:49 +00:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Pau	ff5e601a1e	Item islaid and test	2022-10-31 14:43:31 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Vicent Llopis	1f2ea2c4d8	fix: incorrect number of params	2022-10-31 13:30:08 +01:00
Vicent Llopis	273a8cd7c7	refactor code	2022-10-31 13:00:32 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Joan Sanchez	463d3e6e12	Fixes	2022-10-31 12:39:26 +01:00
Vicent Llopis	b17fe0d18c	refator code	2022-10-31 09:55:11 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +01:00
Vicent Llopis	786ba0d614	feat: inserta fichadas de los teletrabajadores	2022-10-31 07:34:34 +01:00
Alexandre Riera	1246a65f32	refs #4547 informe y email generados	2022-10-28 14:49:22 +02:00
Alex Moreno	445c6f1cc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-28 09:32:08 +02:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Pau	00061caa65	Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients	2022-10-27 09:05:06 +02:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Pau	c576e503cf	fix httpBack.flush error	2022-10-27 09:05:05 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Pau	d64f0e4b34	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-27 06:52:08 +00:00
Pau	04514804b7	fix tests	2022-10-27 08:51:22 +02:00
Pau	bfb9484e02	Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients	2022-10-27 08:46:24 +02:00
Pau	d4a22f7962	Apply requested changes	2022-10-27 08:46:22 +02:00
Alex Moreno	99fca9834f	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-27 06:10:14 +00:00
Vicent Llopis	1d908002e2	feat: add backTest	2022-10-26 14:25:27 +02:00
Vicent Llopis	c0b95564c3	refactor: borrado codigo sql innecesario	2022-10-26 14:25:17 +02:00
Alexandre Riera	bc6e639746	refs #4644 cambio en un test	2022-10-26 13:23:54 +02:00
Vicent Llopis	b39b28e43d	refactor: añadido salto de lineas	2022-10-26 13:10:17 +02:00
Alexandre Riera	405bc8765a	refs #4645 valores ref cambiados	2022-10-26 12:48:48 +02:00
Vicent Llopis	65e32f5e7f	feat: client search panel add find by zone	2022-10-26 12:40:13 +02:00
Vicent Llopis	350c516bb1	feat: cancelar petición cuando esta calculando el packaging	2022-10-26 10:36:41 +02:00
Alexandre Riera	d243f9a87d	refs #4644 checkbox añadido	2022-10-26 10:03:13 +02:00
Vicent Llopis	e0e015c268	fix: backTest	2022-10-26 09:49:58 +02:00
Vicent Llopis	ec81b12239	refactor: el UserError se lanza en back	2022-10-26 09:33:03 +02:00
Vicent Llopis	21e2945d4f	refactor: delete destroyAll	2022-10-26 09:30:17 +02:00
Vicent Llopis	c671540a7f	refactor: renombrada variable	2022-10-26 09:04:53 +02:00
Vicent Llopis	d1e2b1f7d5	refactor: tranducciones	2022-10-26 09:02:54 +02:00
Alex Moreno	a07a45c1b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-26 08:40:49 +02:00
Vicent Llopis	3110172c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice	2022-10-26 08:39:58 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	1e1d4f00f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-26 08:26:23 +02:00
Vicent Llopis	925565d3d2	refator: borrada variable global y añadida Promesa al array	2022-10-26 08:23:36 +02:00
Vicent Llopis	a8dfc9d06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-26 08:11:15 +02:00
Alex Moreno	342832c475	try	2022-10-25 15:02:22 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Pau	d83972d3fa	Merge branch 'dev' into 4157-send-sms-to-routes	2022-10-25 12:07:32 +00:00
Pau	3cfa56d610	Add deliveryBoss ACL to the front	2022-10-25 13:15:19 +02:00
Pau	e72d57150a	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 10:40:57 +00:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	296a743d8a	Fix test, remove console log	2022-10-25 12:25:56 +02:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	e1e13468a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-25 11:58:43 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00
Pau	9089ba7346	requested changes	2022-10-25 10:42:16 +02:00
Pau	ddbbfa4360	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-10-25 07:46:39 +00:00
Pau	d937a1b505	Add acl	2022-10-25 09:45:09 +02:00
Joan Sanchez	8f0b566935	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 07:25:07 +00:00
Pau	a43e642ff7	Add transferclient	2022-10-25 09:23:46 +02:00
Alex Moreno	e8500f926c	feat(invoiceIn): add email	2022-10-25 08:19:56 +02:00
Vicent Llopis	931a891f71	fix: check client.email exists	2022-10-25 08:09:23 +02:00
Vicent Llopis	8a3573474a	refactor: move 'lastEntries' to thrid position in descriptor	2022-10-25 07:40:32 +02:00
Alex Moreno	7cb8175b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-25 07:36:21 +02:00
Vicent Llopis	d18b22bb05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-25 07:05:26 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Vicent Llopis	c77999871e	refs #3951	2022-10-24 14:34:17 +02:00
Alex Moreno	6a17a634d4	hotFix(receipt): add receiptPdf	2022-10-24 09:49:51 +02:00
Pau	30933220ac	#4507 greuge.js/json now insert userFk @2h	2022-10-24 09:37:17 +02:00
Alex Moreno	d29d1ff538	Merge branch '4548-invoiceIn-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-24 08:27:12 +02:00
Pau	5bf425d8e3	Front test and sms require client #4157 @1h30m	2022-10-24 08:22:04 +02:00
Alex Moreno	6c38835e8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-24 08:20:25 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Joan Sanchez	cf0b750304	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-21 12:35:01 +02:00
Vicent Llopis	888f612dbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-21 11:41:53 +02:00
Vicent Llopis	0f57a40aac	fix: backTest	2022-10-21 10:50:18 +02:00
Vicent Llopis	b06f5b7246	feat: cuando seleccionas 'allClients' no tiene en cuenta el 'clientsRange'	2022-10-21 10:06:34 +02:00
Vicent Llopis	f968b19d1e	fix: testFront	2022-10-21 09:08:17 +02:00
Vicent Llopis	c33cab7b10	fix: test back	2022-10-21 09:01:08 +02:00
Vicent Llopis	2d0cb60b50	feat: check if uses mana	2022-10-21 08:55:05 +02:00
Vicent Llopis	e7261573d7	delete focus	2022-10-21 08:01:22 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Vicent Llopis	5da29fe381	refactor: unify duplicated code	2022-10-21 08:00:24 +02:00
Alex Moreno	066cf6f69b	add show dialog	2022-10-20 15:11:56 +02:00
Vicent Llopis	6891190c72	refactor: create endpoint to unify code	2022-10-20 15:05:46 +02:00
Pau	ca53ec7c23	Changed the location of the function	2022-10-20 15:04:59 +02:00
Pau	28bd535e2b	Implemented SMS to route clients	2022-10-20 15:04:25 +02:00
Vicent Llopis	29093d7d30	feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas	2022-10-20 14:25:55 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	bcc9acac0a	fix: tBack	2022-10-20 08:41:00 +02:00
Vicent Llopis	51cad75298	fix: testFront	2022-10-20 08:17:15 +02:00
Pau	8cbcb197bb	fix downloadPDF wrong method	2022-10-20 08:14:11 +02:00
Vicent Llopis	53112995bc	refactor: delete counter	2022-10-20 07:58:38 +02:00
Pau	2c98563cfa	Add buttons to bottom-right	2022-10-20 07:39:33 +02:00
Vicent Llopis	39f4445172	refator: endpoint name	2022-10-20 07:23:57 +02:00
Vicent Llopis	abd2d9a849	fix: e2e	2022-10-19 15:10:43 +02:00
Alex Moreno	9ef835a077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-19 15:10:22 +02:00
Joan Sanchez	7d502c6f57	Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev ... Reviewed-on: #1086	2022-10-19 13:00:18 +00:00
Alex Moreno	192e61a70d	hotFix(route_index): fix driverRoutePdf	2022-10-19 14:54:13 +02:00
Vicent Llopis	390c5790d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-10-19 14:49:24 +02:00
Vicent Llopis	9d53360d50	feat: replaced await by recursive function	2022-10-19 13:59:57 +02:00
Alex Moreno	ca138cc2be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-19 08:23:19 +02:00
Alex Moreno	508decaf0b	try	2022-10-19 08:22:36 +02:00
Pau	dc1b1bc1c3	Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox	2022-10-19 05:35:06 +00:00
Alex Moreno	c9073641aa	feat(invoiceInPdf): content	2022-10-18 14:58:38 +02:00
Vicent Llopis	dc62841c3d	refator: trying to delete async and await	2022-10-18 14:46:40 +02:00
Pau	9fa81fe9eb	Merge branch '2612-create-supplier' of https://gitea.verdnatura.es/verdnatura/salix into 2612-create-supplier	2022-10-18 14:22:56 +02:00
Pau	c2fd1fa44d	fixed tests	2022-10-18 14:22:54 +02:00
Pau	73a69051a8	Merge branch 'dev' into 2612-create-supplier	2022-10-18 12:01:04 +00:00
Pau	8b07180890	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-18 11:56:56 +00:00
Pau	579299855f	Replaced one freightItemFk to IsBox	2022-10-18 13:52:42 +02:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Pau	db12ceb369	removed async from the redirect function	2022-10-18 13:07:10 +02:00
Pau	470b4485d5	Fixed test and DB structure	2022-10-18 12:58:44 +02:00
Vicent Llopis	ae3e3c3c49	fix: id model duplicated	2022-10-18 12:37:06 +02:00
Pau	a204c6e2b0	Fixed the suppliers not appearing	2022-10-18 12:29:04 +02:00
Alex Moreno	a5ceee07e9	use loopback	2022-10-18 11:50:16 +02:00
Vicent Llopis	5fce93abd5	refactor: change variables name	2022-10-18 11:47:37 +02:00
Vicent Llopis	423454d19e	feat: add date-picker	2022-10-18 11:47:22 +02:00
Pau	f481cc3c97	Capitalizar	2022-10-18 10:38:40 +02:00
Pau	89bbf35a87	Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox	2022-10-18 08:30:32 +00:00
Pau	1d8fb25325	Refactored according to the suggested changes	2022-10-18 10:25:54 +02:00
Vicent Llopis	f95f977b69	fix: backTest	2022-10-18 10:04:53 +02:00
Alex Moreno	8985a678d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-18 09:49:06 +02:00
Vicent Llopis	9f70a1d513	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-10-18 08:17:16 +02:00
Pau	047076f189	changed tests	2022-10-18 07:14:40 +02:00
Alex Moreno	eb58839839	feat(invoiceIn): invoiceInPdf	2022-10-17 15:13:27 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Pau	9290cd6fb6	Finished back tests	2022-10-17 14:02:18 +02:00
Vicent Llopis	f85c2e9700	refactor: delete code repeated	2022-10-17 14:01:21 +02:00
Vicent Llopis	8ab6a50c73	try to fix frontTest	2022-10-17 13:02:19 +02:00
Vicent Llopis	86d24ffede	refactor code	2022-10-17 13:02:03 +02:00
Pau	70c9c3d788	initial back test created, modified DB statetments	2022-10-17 12:07:34 +02:00
Vicent Llopis	2d1b48280c	fix: backTest	2022-10-17 11:53:29 +02:00
Alex Moreno	57b2ae770d	fix(e2e)	2022-10-17 11:44:29 +02:00
Vicent Llopis	dd10b79441	delete: throw error	2022-10-17 11:43:26 +02:00
Vicent Llopis	e5fd6adfe5	fix: delete throw error	2022-10-17 11:43:01 +02:00
Vicent Llopis	33092acee7	refactor: delete unnecessary code	2022-10-17 11:42:05 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Pau	cf50c4690a	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-17 08:41:39 +00:00
Vicent Llopis	6924b05c8a	feat: add radio button	2022-10-17 10:19:07 +02:00
Pau	a4243e14c5	Created Back test for newSupplier	2022-10-17 10:17:56 +02:00
Joan Sanchez	cfdcf91be2	Merge branch 'dev' into 3505-closure_refund	2022-10-17 08:15:16 +00:00
Vicent Llopis	15ba6681af	refator: code unified	2022-10-17 09:49:47 +02:00
Pau	dc53aac163	Merge branch 'dev' into 2612-create-supplier	2022-10-17 07:32:50 +00:00
Pau	f0b1591b14	Remove debugging elements	2022-10-17 09:22:50 +02:00
Pau	0cdee89ac3	Button removed when user does not have permissions	2022-10-17 09:20:45 +02:00
Vicent Llopis	787d10aac6	fix: select one result only	2022-10-17 08:29:09 +02:00
Vicent Llopis	cdce628038	refactor: delete line break	2022-10-17 08:11:50 +02:00
Vicent Llopis	06ecceb478	refactor: lines to long	2022-10-17 08:02:19 +02:00
Vicent Llopis	a11ef73dfb	refactor: code repetead	2022-10-17 08:01:55 +02:00
Pau	1603619d81	removed debugging elements	2022-10-17 07:38:54 +02:00
Pau	594cee12f3	add checks to the existence of object variables	2022-10-17 07:35:02 +02:00
Alex Moreno	2b060a1437	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-17 07:32:32 +02:00
Pau	dc6c8f924d	feat: Create new Supplier	2022-10-17 07:25:25 +02:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +02:00
Alex Moreno	3e746ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-14 14:47:42 +02:00
Vicent Llopis	a036578832	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-14 14:43:08 +02:00
Vicent Llopis	40075e7e21	fix: testFront	2022-10-14 14:38:47 +02:00
Vicent Llopis	86b7e9cabe	fix: only can exists 'mana' or 'manaClaim' discount. Never both	2022-10-14 14:30:37 +02:00
Vicent Llopis	2455a11c26	feat: changeMultipleDiscount uses the same popover than changeDiscount	2022-10-14 14:29:21 +02:00
Vicent Llopis	5918b3e0df	refactor: juan changes	2022-10-14 09:30:09 +02:00
Joan Sanchez	390ee60e59	Get first element in array	2022-10-14 07:26:34 +02:00
Vicent Llopis	50ec41dece	refator: cancel request	2022-10-13 15:01:15 +02:00
Joan Sanchez	67097970ed	Incoterms required param	2022-10-13 10:44:20 +02:00
Joan Sanchez	e81c39d8dc	Send delivery note to refund tickets	2022-10-13 09:30:31 +02:00
Alex Moreno	74383b61e7	hotFix(monitor): use left join in ticketState	2022-10-13 09:22:53 +02:00
Vicent Llopis	0d785695fe	feat: invoicing by (clientFk, addressFk)	2022-10-11 12:24:06 +02:00
Pau	012cd68c89	Added menu to create a new supplier, not working	2022-10-11 11:43:01 +02:00
Vicent Llopis	53f78a98d2	feat: update message while globalInvoicing	2022-10-11 10:04:13 +02:00
Vicent Llopis	4f5abb709a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-10-11 09:14:14 +02:00
Vicent Llopis	bfefec397e	feat: add testFront	2022-10-11 09:13:29 +02:00
Vicent Llopis	1a38fc307f	delete: duplicated keybinding	2022-10-11 08:42:59 +02:00
Vicent Llopis	9c52508a88	feat: add total labels	2022-10-11 08:40:22 +02:00
Alex Moreno	c29b8c99d0	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-10-11 05:43:15 +00:00
Alex Moreno	e80197bd6f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-11 07:22:10 +02:00
Vicent Llopis	7b7e01f49e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-11 07:09:20 +02:00
Vicent Llopis	dbfc3d335d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-11 07:06:45 +02:00
Joan Sanchez	e3606c7273	Updated unit test	2022-10-10 14:46:06 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Alex Moreno	c7a06baa63	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-10-10 11:47:09 +00:00
Vicent Llopis	1f21fdeb65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-10 13:30:27 +02:00
Alex Moreno	99271f275f	remove unnecessary isEditable	2022-10-10 13:26:38 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Alex Moreno	a6c171d00a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-10 13:05:00 +02:00
Vicent Llopis	843f67919c	feat: add backTest	2022-10-10 12:56:03 +02:00
Vicent Llopis	8130cf9e6a	feat: separate globalInvoicing in 2 parts	2022-10-10 12:40:10 +02:00
Joan Sanchez	7f023d7456	Set user default warehouse	2022-10-10 12:23:40 +02:00
Joan Sanchez	990a1b3c67	250 nodes	2022-10-10 10:33:08 +02:00
Joan Sanchez	31d1b84bb9	Unfold when there's less than 100 nodes to show	2022-10-10 10:25:59 +02:00
Alex Moreno	3ac8e1d3bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-10 09:57:21 +02:00
Alex Moreno	e497ddd664	fix: add td-editable	2022-10-10 09:21:14 +02:00
Alex Moreno	18cd34bccb	fix(travel_extraCommunity): css	2022-10-10 08:57:41 +02:00
Joan Sanchez	4ecbb59ac0	Closure hours	2022-10-10 07:49:08 +02:00
Alex Moreno	9befa2531b	Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:29:26 +02:00
Joan Sanchez	934c0d0169	Updated unit test	2022-10-10 07:28:10 +02:00
Alex Moreno	49e82156cf	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:10:25 +02:00
Joan Sanchez	3dee50a796	Updated method accessType	2022-10-09 20:14:14 +02:00
Alex Moreno	00d5876f88	hotFix(travel_extraCommunity): fix css	2022-10-07 14:35:16 +02:00
Vicent Llopis	bb26fa6502	feat: add tFront	2022-10-07 13:49:42 +02:00
Joan Sanchez	587da840c0	Fix	2022-10-07 12:16:30 +02:00
Joan Sanchez	6c5acc75eb	Consumption fix	2022-10-07 12:00:06 +02:00
Alex Moreno	94a51db3d5	hotFix(ticket_request): autocomplete buyer	2022-10-07 10:56:12 +02:00
Vicent Llopis	deb8a00dfb	feat: add backRoutes	2022-10-07 10:47:54 +02:00
Vicent Llopis	1894492a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-07 09:26:51 +02:00
Vicent Llopis	3da948f3f9	refactor: delete unnecessary lines	2022-10-07 09:17:14 +02:00
Pau	4f25961988	Created checkbox and logic, package-lock	2022-10-07 08:33:45 +02:00
Vicent Llopis	2e91698c1e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-10-07 08:19:08 +02:00
Alex Moreno	e7bafb1386	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-07 07:47:46 +02:00
Javi Gallego	d5592d6a0f	sin toClientId	2022-10-06 15:19:55 +02:00
Alex Moreno	c29625f079	fix: funcionalityAcl	2022-10-06 15:04:27 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00:00
Joan Sanchez	dd9b517883	Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev ... Reviewed-on: #1061	2022-10-06 11:30:49 +00:00
Javi Gallego	d73dab3454	Merge branch 'dev' into 4090-global_invoincing	2022-10-06 13:01:56 +02:00
Pau	3376293d1a	Added user icon and fixed icon not updating	2022-10-06 11:54:14 +02:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Vicent Llopis	d427c3a6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-06 11:48:31 +02:00
Vicent Llopis	37601934f5	feat: first option to delete and update	2022-10-06 11:40:46 +02:00
Joan Sanchez	8f3e09b88f	Merge branch 'dev' into 4033-route	2022-10-06 08:23:19 +00:00
Vicent Llopis	a3a432c753	fix: delete one or more expeditions	2022-10-06 10:18:19 +02:00
Pau	1165e050eb	feat: workerDisableExcluded update DB field	2022-10-06 10:18:08 +02:00
Vicent Llopis	26d04ce2d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-06 10:08:29 +02:00
Vicent Llopis	ddbe1057ad	feat: add new section	2022-10-06 09:47:53 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Vicent Llopis	434db10ac9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-06 07:22:16 +02:00
Joan Sanchez	fd219f853f	Merge branch 'dev' into 4581-client.web-access	2022-10-05 14:26:03 +00:00
Joan Sanchez	b134aeb0ea	Mock report pdf	2022-10-05 16:19:07 +02:00
Vicent Llopis	2f17257e46	feat: add new sub section itemShelving	2022-10-05 15:13:48 +02:00
Alex Moreno	9d482f7dfd	test(ticket): fix tests and add funcionalityAcl	2022-10-05 15:13:36 +02:00
Joan Sanchez	3d36c0339a	Merge branch 'dev' into 4592-jenkins_tests	2022-10-05 12:05:10 +00:00
Alex Moreno	8b636497a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-05 13:47:25 +02:00
Vicent Llopis	761563edc5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-05 13:38:17 +02:00
Vicent Llopis	26d655075e	fix: bad pull	2022-10-05 13:28:08 +02:00
Joan Sanchez	726b2d5eb2	Exit on completion	2022-10-05 13:26:18 +02:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Pau	600dd7a434	Created the model and UI	2022-10-05 11:52:14 +02:00
Vicent Llopis	994cf7ccf0	fix: '==' by '='	2022-10-04 15:04:27 +02:00
Alex Moreno	5f39249edb	fix(ticket): canEdit use aclFunc	2022-10-04 15:02:00 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Alex Moreno	fe8ae164eb	refactor(ticket): isEditable, canEdit	2022-10-04 13:22:11 +02:00
Joan Sanchez	eadff3fff9	Updated back unit tests	2022-10-04 09:46:44 +02:00
Joan Sanchez	1598b6c703	Back unit tests	2022-10-04 09:39:42 +02:00
Pau	3caf89bddb	refactor: Replaced isBox with freightItemFk	2022-10-04 09:27:31 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Vicent Llopis	68e4f3a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-04 09:10:15 +02:00
Vicent Llopis	6e9909400b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-04 08:19:38 +02:00
Vicent Llopis	5c76437498	refator: delete unnecessary transaction	2022-10-04 08:19:09 +02:00
Vicent Llopis	f510e26141	refactor: translation	2022-10-04 07:55:30 +02:00
Vicent Llopis	000655fe1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-04 07:51:24 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Vicent Llopis	11484edd10	feat: create new ticket	2022-10-03 15:18:07 +02:00
Alex Moreno	cca2878716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4073-user_privileges	2022-10-03 15:16:33 +02:00
Alex Moreno	7a690dd880	feat(user): add section privileges and remove changeRole in descriptor ... test(user):back and e2e	2022-10-03 15:11:29 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	e4b61f81a9	Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev ... Reviewed-on: #1066 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-03 07:41:58 +00:00
Pau	5ca39c9dd3	Modified TextField to have a insertable option	2022-10-03 08:48:04 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Javi Gallego	eb48685484	selectores reparados	2022-09-30 14:55:31 +02:00
Joan Sanchez	7fd4728c33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-30 14:13:16 +02:00
Joan Sanchez	4005d6f82a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-09-30 13:55:53 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Alex Moreno	eec1d6df4a	add translation	2022-09-30 09:06:43 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	ccec38ef97	Renamed table	2022-09-29 14:49:08 +02:00
Joan Sanchez	3601881026	Client consumption queue	2022-09-29 14:43:27 +02:00
Joan Sanchez	7a7ad6ac5f	InvoiceOut_sendQueued	2022-09-29 13:09:44 +02:00
Joan Sanchez	4172229051	Closure hotfix	2022-09-29 09:35:57 +02:00
Joan Sanchez	5aec280adb	Closure migration	2022-09-29 09:07:18 +02:00
Pau	7ac7189a8a	added maxlength binding, finished logic on insert	2022-09-29 08:08:49 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Alex Moreno	203b223cc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-28 12:24:40 +02:00
Alex Moreno	840140c40f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-28 12:20:35 +02:00
Joan Sanchez	ae2bc91cb5	Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev ... Reviewed-on: #1067 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:38:46 +00:00
Joan Sanchez	93f5bf089d	Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev ... Reviewed-on: #1031 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:10:55 +00:00
Joan Sanchez	d7ab95fcc8	closure	2022-09-27 15:00:12 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Pau	901007d34b	change test case to expect the image to be defined	2022-09-27 13:58:27 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Pau	d30065f90a	Add vn-input-account tag and logic	2022-09-27 12:12:25 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	410e651edd	Buyer waste	2022-09-27 07:24:45 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Pau	26a16bf846	ACL para sector,añadido sector al model-config	2022-09-23 13:53:33 +02:00
Pau	620162aec7	Añadido el modelo de sector a shelving	2022-09-23 12:24:11 +02:00
Vicent Llopis	c4649352a9	feat: add totalChecked	2022-09-23 08:50:11 +02:00
Joan Sanchez	664fd444cc	Sample refactor	2022-09-22 15:44:35 +02:00
Vicent Llopis	2a64fde57c	feat: add option "move expedition"	2022-09-22 14:58:38 +02:00
Vicent Llopis	a486b1593b	fix: backTest	2022-09-22 13:55:09 +02:00
Vicent Llopis	95e5b1a970	fix: code for search-function	2022-09-22 13:54:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	68f3544477	Claim pickup order	2022-09-22 09:17:14 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Vicent Llopis	0fb7487191	feat: add getItemTypeWorker endpoint	2022-09-22 08:32:18 +02:00
Vicent Llopis	fae1516b33	refactor: correct bleeding	2022-09-21 14:55:43 +02:00
Vicent Llopis	65e15ada69	refator: delete line break	2022-09-21 14:53:02 +02:00
Joan Sanchez	5a43bdb6c9	Delivery note	2022-09-21 13:18:32 +02:00
Joan Sanchez	284524e3fa	Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev ... Reviewed-on: #1054 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:49:44 +00:00
Joan Sanchez	fcce73086e	Merge pull request '2805-fix(entry_latestBuys): save chekeds when crudModel load more data' (#1045) from 2805-entry_latestBuy_saveChekeds into dev ... Reviewed-on: #1045 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:47:29 +00:00
Joan Sanchez	5d6459d565	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-21 08:37:20 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	55d6dacebb	test(ticket_listPackaging):enable back test	2022-09-19 10:11:44 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Joan Sanchez	fe71e485aa	Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev ... Reviewed-on: #1055	2022-09-16 07:15:41 +00:00
Joan Sanchez	9f9581c722	Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev ... Reviewed-on: #1048 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:12:41 +00:00
Joan Sanchez	1b09f3bf7f	Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev ... Reviewed-on: #1052 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:11:59 +00:00
Joan Sanchez	f9f09440ec	Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev ... Reviewed-on: #1053 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:10:48 +00:00
Alex Moreno	54b41faf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss	2022-09-16 08:55:39 +02:00
Vicent Llopis	f5bbe3a9ac	fix: scope updated	2022-09-15 11:55:07 +02:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Vicent Llopis	eb7bd3dc59	update brach	2022-09-14 14:03:15 +02:00
Alex Moreno	e72c0ae919	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-09-14 13:09:00 +02:00
Alex Moreno	06eab58b3d	is agency	2022-09-14 12:45:40 +02:00
Alex Moreno	8c984b5ebe	refactor(client): change rol manager to financialBoss	2022-09-14 12:32:19 +02:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Alex Moreno	49a7a05310	feat(travel_extra-community): add vn-anchor	2022-09-14 08:08:07 +02:00
Alex Moreno	2b101cf7c1	refactor(travel_extra-community): use smart-table, fix scroll	2022-09-13 15:11:14 +02:00
Vicent Llopis	a6a5a84add	fix: incorrect name of function	2022-09-13 14:42:15 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Vicent Llopis	3bf5f5f86e	fix: tfront	2022-09-13 13:47:54 +02:00
Vicent Llopis	bddc998b86	feat: allow update route.isOk field	2022-09-13 13:34:32 +02:00
Joan Sanchez	5cff983d4c	Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev ... Reviewed-on: #1040 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:33:04 +00:00
Vicent Llopis	6e31865add	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent	2022-09-13 12:17:30 +02:00
Vicent Llopis	cc6ba8712c	feat: log when a day is excluded	2022-09-13 12:15:28 +02:00
Joan Sanchez	1f850d13e9	Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev ... Reviewed-on: #1035 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:00:36 +00:00
Vicent Llopis	1fd97f167c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-09-13 11:35:15 +02:00
Vicent Llopis	b02aa8466c	fix: tfront	2022-09-13 10:27:17 +02:00
Vicent Llopis	8c6c7345cd	fix: change GET by POST, to solve "Request Header Fields Too Large"	2022-09-13 10:27:08 +02:00
Joan Sanchez	3210f91bf7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-12 12:20:49 +02:00
Joan Sanchez	de3e14e739	4514 - Write permissions for rrhh	2022-09-12 10:23:17 +02:00
Joan Sanchez	faa3865da1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-09 11:53:57 +02:00
Alex Moreno	8da24a56b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-09 07:52:17 +02:00
Alex Moreno	c9721f4c7f	fix(entry_latestBuys): save chekeds when crudModel load more data	2022-09-08 14:52:43 +02:00
Alex Moreno	a15c051098	fix(monitor_salesFilter): mariadb not optimize query	2022-09-08 08:07:46 +02:00
Alex Moreno	c06d2970ae	test(boxing): getVideoList	2022-09-07 13:58:39 +02:00
Javi Gallego	f0a9441e1f	Merge branch 'dev' into #4226-remove-density	2022-09-07 11:31:47 +02:00
Alex Moreno	886abfd897	fix(monitor): fix left join salesFilter	2022-09-07 08:49:24 +02:00
Alex Moreno	8dd02ab6ee	quit console.logs	2022-09-06 15:08:28 +02:00
Alex Moreno	6fcb1e54b4	refactor(claim_action): set translations	2022-09-06 09:35:01 +02:00
Alex Moreno	43df1e7e10	refactor(boxing): refactor getVideo	2022-09-05 12:06:14 +02:00
Alex Moreno	4a058faaf8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-05 08:12:07 +02:00
Javi Gallego	9fe32788fc	regularizado	2022-08-24 14:38:05 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	cceb456209	Filter by province	2022-08-12 15:31:59 +02:00
Joan Sanchez	d0185017b7	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
Vicent Llopis	f3df373f70	delete: unnecessary code	2022-08-10 13:23:50 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	8f54365350	refator: parametrizardo con ?	2022-08-10 09:19:23 +02:00
Vicent Llopis	31aafc0719	feat: add inserts in printQueue	2022-08-10 09:11:38 +02:00
Joan Sanchez	d2b901d47f	Relative path for master versions	2022-08-09 11:49:28 +02:00
Alex Moreno	6054e0bef3	fix(mdb): use relative path	2022-08-05 13:24:48 +02:00
Alex Moreno	062806b3f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-08-05 13:19:43 +02:00
Joan Sanchez	cabc30ef87	Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev ... Reviewed-on: #1029 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-05 09:18:53 +00:00
Joan Sanchez	624428212b	Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev ... Reviewed-on: #1026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-08-04 12:51:41 +00:00
Joan Sanchez	1dda78c438	Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master ... Reviewed-on: #1036	2022-08-04 12:23:27 +00:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Juan Ferrer	22503375b3	Hotfix: User synchronization	2022-08-04 08:53:31 +02:00
Alex Moreno	b4b6d61460	feat(ticket_boxing): fix getVideo	2022-08-03 14:57:39 +02:00
Joan Sanchez	eed0ac66c6	Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev ... Reviewed-on: #1023 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-08-03 07:09:08 +00:00
Joan Sanchez	0de2c08739	Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev ... Reviewed-on: #1034 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-03 06:45:58 +00:00
Joan Sanchez	1b9de5cc95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create	2022-08-03 08:44:43 +02:00