9340 Commits

Author	SHA1	Message	Date
Robert Ferrús	a00dd82f14	hotFix(getBalance): if null	2024-05-02 08:21:39 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Robert Ferrús	77a1b4bb57	hotFix(getBalance): simplify	2024-05-02 08:02:17 +02:00
Robert Ferrús	b8b055b86c	hotFix(getBalance): date setHours to 0	2024-05-02 08:00:44 +02:00
Carlos Satorres	b66111a032	refs #6895 remove tfront	2024-04-30 13:33:46 +02:00
Carlos Satorres	b0b8f12ca9	refs #6895 remove code	2024-04-30 13:17:19 +02:00
Carlos Satorres	e546a13e5d	refs #6895 redirect lilium	2024-04-30 12:41:29 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Alex Moreno	d18f08e676	hotFix(addSaleByCode) add userId	2024-04-30 12:15:27 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Jorge Penadés	be69b5e2c4	fix: refs #5919 rollback	2024-04-29 12:04:31 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02:00
Jorge Penadés	f6e89c9049	fix: refs #5919 rollback	2024-04-29 11:46:58 +02:00
Jorge Penadés	7240269f5b	fix: refs #5919 rollback	2024-04-29 11:45:54 +02:00
Jorge Penadés	50ea41f99a	fix: refs #5919 rollback	2024-04-29 11:43:56 +02:00
Jorge Penadés	8adb52aac4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-04-29 09:24:10 +02:00
Sergio De la torre	a180f54390	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:59:12 +02:00
Sergio De la torre	f4767728bc	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:20:57 +02:00
Sergio De la torre	f2225b49a7	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:19:18 +02:00
Jorge Penadés	b9d3684db2	feat: refs #6600 add column	2024-04-26 15:48:30 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	fd7dcf2781	fix: refs #7039 fixpr	2024-04-26 10:26:20 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Javi Gallego	94e04c1c2f	Merge branch 'dev' into 7108-exchange-rate	2024-04-26 06:45:43 +02:00
Jorge Penadés	b9de2b3ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 17:18:37 +02:00
Jorge Penadés	32da39899a	fix: refs #7211 test e2e	2024-04-25 17:16:43 +02:00
Pablo Natek	5c45dd6c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 16:18:18 +02:00
Jorge Penadés	180a484c55	fix: refs #7211 rollback	2024-04-25 16:14:34 +02:00
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02:00
Jorge Penadés	edeed037a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl	2024-04-25 15:38:40 +02:00
Jorge Penadés	4e864fed52	fix: refs #7211 tests	2024-04-25 15:38:21 +02:00
Javi Gallego	2e2bc3d594	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 12:31:06 +00:00
Javi Gallego	4f20224acc	Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking	2024-04-25 14:28:53 +02:00
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00
Javier Casado	a9e4b2cd36	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-25 11:46:53 +00:00
Jorge Penadés	931c2c4f5e	feat: refs #7211 error & locale	2024-04-25 13:12:06 +02:00
Robert Ferrús	8153a526ce	feat: refs #7039 country-name	2024-04-25 12:35:21 +02:00
Jorge Penadés	6749722634	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 10:10:06 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Jorge Penadés	c9dfccbc53	feat: refs #7211 add test & changelog	2024-04-25 09:35:53 +02:00
Alex Moreno	917592cdad	Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ... Reviewed-on: #2366 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 12:34:46 +00:00
Alex Moreno	69486fb29f	fix(componentUpdate): refs #7225 fix transfer all lines to newTicket	2024-04-24 14:15:27 +02:00
jcasado	aeee012c2b	refs #6697 fix sql test	2024-04-24 11:43:10 +02:00
jcasado	87d5e0a311	Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity	2024-04-24 11:19:17 +02:00
jcasado	d1659ce04c	refs #6697 fix claimQuantity	2024-04-24 11:19:15 +02:00
Alex Moreno	0cd740ce0c	test: refs #7225 fix back test	2024-04-24 10:42:50 +02:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Javier Segarra	f7d9cc8102	Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev ... Reviewed-on: #2355 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 07:56:03 +00:00
Jon Elias	88ba6833be	Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev ... Reviewed-on: #2322 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 07:36:55 +00:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00
Javier Segarra	0fd120676d	Actualizar modules/ticket/back/methods/ticket-request/filter.js	2024-04-23 12:29:40 +00:00
Javier Casado	69ea518a49	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-23 10:55:45 +00:00
Guillermo Bonet	1044a24bc7	refactor: #6997 Deleted vn.client.eypbc	2024-04-23 12:00:23 +02:00
Alex Moreno	60d5b9e4aa	test: refs #7173 fix sql, adding alias	2024-04-23 08:47:52 +02:00
Alex Moreno	85491613b0	test: refs #7173 fix fixtures	2024-04-23 08:47:28 +02:00
Javi Gallego	b0c4f7fd3c	feat: moved files to invoiceIn	2024-04-22 11:45:58 +02:00
Sergio De la torre	23fa74a5ad	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 08:11:37 +00:00
Javier Segarra	f6199f8f8e	Actualizar modules/worker/back/models/worker.json	2024-04-22 06:56:05 +00:00
Javier Segarra	283d27e1c5	Actualizar modules/worker/back/models/worker.json	2024-04-22 06:22:36 +00:00
Jon Elias	fa653f630c	Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration	2024-04-22 07:37:49 +02:00
Jon Elias	9759ee4bd0	refactor: refs #6899 requested changes	2024-04-22 07:37:47 +02:00
Javier Segarra	b4503afc47	Merge branch 'dev' into 6930_scope_Default_Multimedia	2024-04-19 10:50:45 +02:00
Javier Segarra	30d0db163e	feat(salix): refs #6930 minor updates	2024-04-19 10:50:14 +02:00
Javier Segarra	322d91d814	feat(salix): refs #6930 Add DEFAULT scope	2024-04-19 10:49:57 +02:00
Alex Moreno	da7ab00c73	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 07:22:33 +00:00
Alex Moreno	5b5ec11973	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-19 08:58:17 +02:00
Jon Elias	9dedd5383c	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 06:10:49 +00:00
Jon Elias	f40c730f6e	refactor: refs #6899 changed comercial value in negativeBases	2024-04-19 07:52:43 +02:00
Sergio De la torre	f4afda8cb2	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 14:52:57 +00:00
Alex Moreno	87e23b49e7	hotFix: change require to import	2024-04-18 15:19:19 +02:00
Jon Elias	08ca1a302b	Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev ... Reviewed-on: #2323 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 12:55:58 +00:00
Sergio De la torre	279c300fbf	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 11:08:15 +00:00
Guillermo Bonet	2b11f85b67	Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev ... Reviewed-on: #2147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 11:06:47 +00:00
Jon Elias	f7a6d47c04	Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev ... Reviewed-on: #2219 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 09:34:35 +00:00
Sergio De la torre	958759dc80	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 08:12:46 +00:00
Sergio De la torre	e909d64757	refs #6921 feat: addFromDelivery	2024-04-18 10:01:22 +02:00
Alex Moreno	9143447eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-18 09:27:46 +02:00
Alex Moreno	af06ef30d4	hotFix(workerDms): document.isDocuware	2024-04-18 08:50:17 +02:00
Jon Elias	d42aab346f	refactor: refs #7139 replace warehouse with ticket	2024-04-18 08:17:43 +02:00
Jon Elias	f41177643f	refactor: refs #6899 corrected Lilium styles and functionalities	2024-04-18 08:01:16 +02:00
Sergio De la torre	32e2827287	refs #6921 feat: addFromDelivery	2024-04-17 13:55:07 +02:00
Sergio De la torre	a3c8532661	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 13:27:00 +02:00
Javier Segarra	6214da2c42	feat(salix): refs #6930 Undo rollback salix-back	2024-04-17 09:52:53 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Sergio De la torre	ae88a8a281	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 07:44:08 +02:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	56dc0ddb68	Merge branch 'test' into dev	2024-04-16 12:32:53 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Guillermo Bonet	d88957d157	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 06:45:04 +00:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Sergio De la torre	d24de61213	refs #6921 feat: addFromDelivery	2024-04-16 08:29:39 +02:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Jorge Penadés	3c9ac9634b	fix: refs #6938 front tests	2024-04-15 15:02:45 +02:00
Jorge Penadés	3e1218463c	fix: refs #6938 filters & scope	2024-04-15 14:44:18 +02:00
Guillermo Bonet	339c349ed0	feat: refs #6724 Added admon acl to vn-check	2024-04-15 14:00:54 +02:00
Guillermo Bonet	5c524ecc7d	rollback: refs #6724 entry.js	2024-04-15 13:13:40 +02:00
Guillermo Bonet	78bd561122	Merge branch 'dev' into 6724-permisos-vn.entry.isBooked	2024-04-15 11:11:55 +00:00
Sergio De la torre	4cb79956a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-15 13:03:47 +02:00
Jorge Penadés	d7b06fe637	fix: refs #6938 scope	2024-04-15 12:47:27 +02:00
Jorge Penadés	200cbd8d74	fix: refs #6938 acls & scope	2024-04-15 11:03:57 +02:00
Jorge Penadés	0219fa105e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone	2024-04-15 10:22:44 +02:00
Jorge Penadés	a68b8431c5	feat: refs #6938 add scope & acls	2024-04-15 10:21:59 +02:00
jcasado	dc8a6d1274	Merge branch 'dev' into 6641-checkboxMyTeam	2024-04-15 10:11:36 +02:00
Alex Moreno	b4862a8ce9	hotFix(claimBegginingModel): enable claimIsEditable and &&	2024-04-12 11:35:21 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Guillermo Bonet	4449441cbf	Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master ... Reviewed-on: #2279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 12:42:44 +00:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
jcasado	0cf1ced747	remove focus	2024-04-10 13:17:43 +02:00
jcasado	7d925bac87	refs #6641 fix PR changes	2024-04-10 13:16:41 +02:00
Pablo Natek	c581deef66	refactor: refs #6005 refactor spec	2024-04-10 13:09:31 +02:00
Sergio De la torre	9c373d9ef3	refs #6921 feat: getTicketsObservations	2024-04-10 12:02:25 +02:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Alex Moreno	51e7045e8b	hotFix(workerTimeControl): getWeekNumber	2024-04-10 09:44:09 +02:00
Ivan Mas	eedf30a2dd	refs #6732 salix dependencies and undo changes Proveedores	2024-04-09 17:31:34 +02:00
Pablo Natek	ed517399dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 15:04:04 +02:00
Pablo Natek	ac9732606c	remove(focus): refs #6005 from spec	2024-04-09 14:55:29 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00:00
Pablo Natek	da037c5235	refactor: refs #6005 delay on productionConfig	2024-04-09 13:34:33 +02:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Carlos Satorres	de75d811c3	refs #6682 absence	2024-04-09 12:30:25 +02:00
Alex Moreno	c69a4e1c98	Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ... Reviewed-on: #2269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-09 08:21:20 +00:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Pablo Natek	638b715ee5	fix: refs #6005 move logic to hook	2024-04-09 09:30:28 +02:00
Alex Moreno	500244dbed	fix id	2024-04-09 07:51:57 +02:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Alex Moreno	0ecc09fcc4	Merge branch 'dev' into 6551-workerDms_refactor	2024-04-08 12:50:05 +00:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
jcasado	a30c0ee675	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-08 14:39:00 +02:00
jcasado	84997eacd5	refs: 6697 remove claim quantity	2024-04-08 14:38:54 +02:00
jcasado	26c74a3e71	refs #6641 fix test	2024-04-08 13:03:15 +02:00
Guillermo Bonet	e27279e20e	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:36 +00:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Guillermo Bonet	16a6e3d8a6	feat: refs #6636 Requested change	2024-04-05 08:18:38 +02:00
Pablo Natek	4b4aaa9e10	feat: refs #6005 move logic from report to hook	2024-04-05 08:04:53 +02:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Guillermo Bonet	1656c8db63	Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup	2024-04-05 07:42:04 +02:00
Guillermo Bonet	23db6a41be	feat: refs #6636 Minor change	2024-04-05 07:42:03 +02:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder	2024-04-04 13:45:20 +00:00
jcasado	84e6e7f7bf	refs #6641 test fixtures	2024-04-04 14:53:26 +02:00
Carlos Andrés	9fcad457a7	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:46:51 +02:00
jcasado	1c6d913926	refs #6641 addFilterCollegues	2024-04-04 14:28:39 +02:00
Guillermo Bonet	fcb4fe92e8	Merge branch 'dev' into 6636-pickup	2024-04-04 12:14:23 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
jcasado	5acef1fcc0	refs #6641 add button my team	2024-04-04 13:53:23 +02:00
Alex Moreno	20e4ab1d2c	Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master ... Reviewed-on: #2253 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-04 11:35:09 +00:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error	2024-04-04 13:32:39 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Sergio De la torre	9423a2d043	refs #3520 hotFix: hasUncheckedTickets	2024-04-04 10:38:55 +02:00
Guillermo Bonet	c685000b47	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:13:56 +02:00
Jon Elias	3e044a8efe	fix: refs #7152 add supplier storage	2024-04-04 08:16:37 +02:00
Pablo Natek	2efd1945f8	feat: refs #4988 add agency	2024-04-04 07:27:27 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Alex Moreno	59ead0c2e5	debug(closure): add log	2024-04-03 15:29:56 +02:00
Javier Casado	3968d88a8d	Merge branch 'master' into hotfix_languageClaimNotification	2024-04-03 11:37:15 +00:00
jcasado	09f023090e	hotfix claimStateLanguage	2024-04-03 13:33:56 +02:00
Jorge Penadés	a62e189e47	feat: refs #6724 hook added	2024-03-28 16:10:52 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder	2024-03-28 10:08:56 +00:00
Alex Moreno	a376003da6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 10:10:22 +01:00
Alex Moreno	ed46ad03d2	refs #7152 warmFix	2024-03-28 09:33:57 +01:00
Carlos Satorres	9f438751d3	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-28 08:13:37 +00:00
Alex Moreno	f1931fce69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 08:19:26 +01:00
Alex Moreno	c47989c6fe	Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev ... Reviewed-on: #2218 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:16:56 +00:00
Alex Moreno	0b764ebc1b	Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev ... Reviewed-on: #2209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:12:51 +00:00
Sergio De la torre	4ca3e8f650	Merge branch 'dev' into 3520_wareshouse_back	2024-03-28 07:12:24 +00:00
Sergio De la torre	8e6416d59c	refs #3520 feat:uncheckedTicket	2024-03-28 08:08:32 +01:00
Alex Moreno	6853454d30	Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev ... Reviewed-on: #2206 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:04:17 +00:00
Alex Moreno	8cccc78b88	Merge branch 'dev' into 6532-deleteMermas	2024-03-28 06:42:39 +00:00
Javier Segarra	d30cac971f	refs #6930 updates	2024-03-28 07:22:28 +01:00
Sergio De la torre	7634d82d8b	refs #6964 feat:hasItemOlder	2024-03-28 07:15:30 +01:00
Carlos Satorres	f4915fbe2e	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-27 16:50:03 +00:00
Jorge Penadés	e7a29119d0	feat: refs #7002 add test	2024-03-27 13:38:04 +01:00
Jorge Penadés	227d123247	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry	2024-03-27 12:24:19 +01:00
Sergio De la torre	483345666e	refs #3520 feat:back WarehouseFk	2024-03-27 11:01:32 +01:00
Jon Elias	562dd4034f	feat: #7130 added "served" field to RouteList table(Salix).	2024-03-27 07:58:35 +01:00
Sergio De la torre	9240732c00	refs #6964 feat:advice for olderItem	2024-03-27 07:49:51 +01:00
Sergio De la torre	2cf572baf8	refs #3520 hasUncheckedTicket	2024-03-27 07:48:16 +01:00
Sergio De la torre	a983f25c57	refs #3520 hasUncheckedTicket	2024-03-27 07:47:36 +01:00
Sergio De la torre	39b1e9ff7b	refs #3520 hasUncheckedTicket	2024-03-27 07:26:11 +01:00
Sergio De la torre	eaf3749440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back	2024-03-27 07:11:16 +01:00
Sergio De la torre	ff8522cfd1	refs #6964 feat:advice for olderItem	2024-03-27 07:09:18 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-27 07:08:47 +01:00
Javier Segarra	38c5209c33	refs #6930 fix more endpoints	2024-03-26 15:01:28 +01:00
Jorge Penadés	6ded14b593	feat: refs #7002 update direction if it was not manual	2024-03-26 14:25:25 +01:00
Sergio De la torre	b805a5de0a	refs #3520 feat:uncheckedTicket	2024-03-26 12:40:44 +01:00
Robert Ferrús	3e2e0ccadb	Merge branch 'master' into 7141-sale_replaceItem	2024-03-26 11:00:44 +00:00
Sergio De la torre	caf99a9738	refs #3520 feat:uncheckedTicket	2024-03-26 11:06:14 +01:00
Sergio De la torre	678eb2928f	refs #6964 feat:hasItemOlder	2024-03-26 10:30:17 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Sergio De la torre	dc5f588c8e	refs #3520 feat: backWarehouse in Salix	2024-03-26 10:13:57 +01:00
Jon Elias	a5082d04f9	refs: #6514 fixed error	2024-03-26 08:52:11 +01:00
Jon Elias	0f4e1acf09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier	2024-03-26 08:37:51 +01:00
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Jon Elias	04e42cd3c8	feat: #6514 created supplierDms functionality	2024-03-26 08:29:07 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Sergio De la torre	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +01:00
Jorge Penadés	0188b3d1df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-25 15:03:00 +01:00
Robert Ferrús	dd977fab83	fix: refs #7141 catalog_calculate	2024-03-25 14:56:12 +01:00
Jorge Penadés	eb2b0d41de	feat: refs #7002 update direction if device exists	2024-03-25 13:33:39 +01:00
Sergio De la torre	0f5c5efcaa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6276-newWarehouse-salix	2024-03-25 13:04:02 +01:00
Sergio De la torre	386bc1c934	refs #6276 hotFix: setUserError and return	2024-03-25 13:00:55 +01:00
Jorge Penadés	308a449b94	Merge branch 'master' into 6085-hotFix-addOwnedAlias	2024-03-25 07:48:08 +00:00
Sergio De la torre	a40234ba9b	refs #6964 feat:hasItemOlder	2024-03-25 08:20:08 +01:00
Sergio De la torre	22f78dbb91	refs #6964 feat:hasItemOlder	2024-03-25 07:54:51 +01:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	2024-03-22 16:01:22 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Sergio De la torre	c4fcb2cd12	refs #6964 feat:advice for olderItem	2024-03-22 13:04:16 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem	2024-03-22 11:47:12 +01:00
Sergio De la torre	976c5b7ba8	refs #6964 feat:advice for olderItem	2024-03-22 11:42:19 +01:00
Sergio De la torre	027aa86662	refs #6964 feat:advice for olderItem	2024-03-22 10:08:20 +01:00
Sergio De la torre	9e5e49c28f	refs #6276 feat:newWarehouse	2024-03-22 06:56:27 +01:00
Carlos Satorres	ca0d269ee2	refs #6074 remove isBlocked	2024-03-21 15:02:09 +01:00
Jorge Penadés	d8aad86c92	feat: refs #6085 add acl authenticated	2024-03-21 13:42:02 +01:00
Sergio De la torre	2a976664ec	refs #6276 feat:newWarehouse	2024-03-21 12:05:34 +01:00
Sergio De la torre	5135bee2d2	refs #6276 feat:newWarehouse	2024-03-21 12:02:57 +01:00
Sergio De la torre	d8da317339	Merge branch 'dev' into 6964_itemOlder	2024-03-21 10:10:57 +00:00
Sergio De la torre	1d37d3d8bf	refs #6276 feat:newWarehouse	2024-03-21 10:33:49 +01:00
Sergio De la torre	3fbf32bd52	refs #6276 feat:newWarehouse	2024-03-21 10:32:36 +01:00
Pablo Natek	130fb68d27	Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev ... Reviewed-on: #2187 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-21 09:28:39 +00:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Pablo Natek	da8fbb5a92	fix: refs #6302 spec	2024-03-20 21:14:01 +01:00
Pablo Natek	f7b458d368	feat: refs #6302 delete after add to turn	2024-03-20 20:54:24 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Carlos Satorres	b352fc10e7	refs #6532 redirect grafana, remove mermas	2024-03-20 14:44:06 +01:00
Alex Moreno	7895a51e33	hotFix(closeAll): fix debug	2024-03-20 12:15:41 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Alex Moreno	517aeebe8b	refs #7019 fix(createManualInvoice): add throw error	2024-03-18 14:20:05 +01:00
Jorge Penadés	3c3dd64da1	feat: refs #6951 test	2024-03-18 09:39:56 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Alex Moreno	8119106e69	hotFix: try to debug closeAll	2024-03-15 15:40:54 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Jorge Penadés	6281ba352b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-03-15 10:38:08 +01:00
Jorge Penadés	b1bf6be44b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-15 09:29:42 +01:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00:00
Carlos Satorres	1457884252	Merge branch 'dev' into 6755-restoreRefactor	2024-03-14 08:54:06 +00:00
Carlos Satorres	dd7c700130	refs #6755 fix test	2024-03-14 09:53:50 +01:00
Alex Moreno	4ad562a4da	fix: refs #6925 transalation	2024-03-14 09:12:19 +01:00
Alex Moreno	974c95b961	Merge branch 'dev' into 6925-fix_translations	2024-03-14 08:00:29 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Carlos Satorres	24c1ab541d	Merge branch 'dev' into 6913-routeKm	2024-03-14 07:31:31 +00:00
Alex Moreno	977181f156	Merge branch 'dev' into 6925-fix_translations	2024-03-14 07:27:16 +00:00
Carlos Satorres	33bd21d40b	refs #6755 fix model	2024-03-13 16:29:05 +01:00
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Carlos Satorres	92cf8fc5e1	refs #6755 remove console	2024-03-13 11:46:43 +01:00
Sergio De la torre	def9aaf41a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-13 07:15:45 +01:00
Javier Segarra	99f01a1dbd	refs #6930 perf: add accessScopes to account.logout	2024-03-12 13:39:21 +01:00
Carlos Satorres	a6d1c5b6db	refs #6755 remove	2024-03-12 13:33:14 +01:00
Carlos Satorres	106296be7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-12 12:55:56 +01:00
Carlos Satorres	ed57212618	refs #6755 fix restore	2024-03-12 12:55:14 +01:00
Carlos Satorres	93170dd82f	Merge branch 'dev' into 6913-routeKm	2024-03-12 11:48:49 +00:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Carlos Satorres	6627c7a16a	refs #6913 routeKm	2024-03-12 08:25:01 +01:00
Alex Moreno	35ef9b53c2	Merge branch 'dev' into 6925-fix_translations	2024-03-11 12:49:34 +00:00
Jorge Penadés	745253f30b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-11 13:46:53 +01:00
Pablo Natek	35dab518c8	Merge branch 'dev' into 6005-backupLabeler	2024-03-11 12:41:07 +00:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Pablo Natek	8815f07850	feat(spec): refs #6005 add spec to backup Notify	2024-03-11 12:18:03 +01:00
Jorge Penadés	58635b5468	fix: refs #6942 add test & change column name	2024-03-11 12:11:13 +01:00
Pablo Natek	8529bed895	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-11 12:01:13 +01:00
Jorge Penadés	8b29152c00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-11 10:12:04 +01:00
Jorge Penadés	4e8e7d3f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-11 08:59:26 +01:00
Jorge Penadés	5c2e8c135b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-11 08:24:10 +01:00
Alex Moreno	51fa0e1a75	fix: refs #6925 refund invoice transaltions	2024-03-11 08:12:29 +01:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Carlos Satorres	879adfaac8	refs #6755 restore fix	2024-03-08 14:59:33 +01:00
Pablo Natek	ae25ba3fb6	feat(notify): refs #6005 add restriction on created notification time	2024-03-08 13:44:19 +01:00
Carlos Satorres	8a16c24245	refs #6755 fix ticket	2024-03-08 12:27:47 +01:00
Javier Segarra	a8420cd650	refs #7004 feat: translate label newSupplier	2024-03-08 10:39:54 +01:00
Javier Segarra	238099311b	refs #7004 fix: bug	2024-03-08 10:39:34 +01:00
Jorge Penadés	ea18d3ef6f	feat: refs #5186 add locale	2024-03-08 09:25:07 +01:00
Pablo Natek	2421cc7c68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-08 08:23:08 +01:00
Alex Moreno	8cda12a9da	feat: refs #6925 check incoterms in closure and makeInvoice	2024-03-08 07:49:00 +01:00
Alex Moreno	c2ecedca71	feat: refs #6925 check incoterms in closure and makeInvoice	2024-03-08 07:48:55 +01:00
Jorge Penadés	1e3967a4fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-07 15:56:02 +01:00
Jorge Penadés	13e08ceb51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-07 14:29:13 +01:00
Alex Moreno	2f2aba1cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-07 11:42:35 +01:00
Alex Moreno	dbbebbe73c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 11:39:03 +01:00
Alex Moreno	01cd2709cc	deploy: refs #6995 skip test	2024-03-07 11:38:30 +01:00
Carlos Satorres	d4d3fdceb5	refs #6755 fix canRestoreTicket	2024-03-07 11:36:30 +01:00
Jorge Penadés	b783a9cdfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-07 09:44:32 +01:00
Jorge Penadés	a94fd1a61c	fix: refs #6744 change error kind	2024-03-07 09:29:51 +01:00
Carlos Satorres	64d82d92d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-07 09:28:32 +01:00
Jorge Penadés	05f3a3f31b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-03-07 08:43:01 +01:00
Sergio De la torre	69ad44c0bd	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:18:16 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +00:00
Carlos Satorres	2e4a5029b8	refs #6755 fix restore	2024-03-06 14:52:49 +01:00
Carlos Satorres	a14ab90d5a	refs #6755 fix restore add fixtures	2024-03-06 14:41:58 +01:00
Alex Moreno	9ab0228714	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-06 13:58:10 +01:00
Jorge Penadés	b0814304aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-06 13:51:37 +01:00
Jorge Penadés	f79435bd13	feat: refs #6942 set false isBooed & ledger	2024-03-06 13:41:56 +01:00
Carlos Satorres	1b3a8ddbdd	refs #6755 fix restore	2024-03-06 12:03:35 +01:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Jorge Penadés	f600a99708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 10:55:05 +01:00
Jorge Penadés	b5e8184489	fix: refs #6942 delete	2024-03-06 09:56:22 +01:00
Jorge Penadés	f78f8ab6b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-03-06 09:34:49 +01:00
Carlos Satorres	a45aebf582	Merge branch 'dev' into 6980-validateIBANRefactor	2024-03-06 08:22:51 +00:00
Alex Moreno	31dc2db838	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-06 08:08:25 +00:00
Jorge Penadés	5a11e9ac76	feat: refs #6942 toUnbook	2024-03-05 16:14:05 +01:00
Carlos Satorres	70096e7a76	refs #6755 fix restore	2024-03-05 14:24:32 +01:00
Carlos Satorres	0156bb09d1	Merge branch 'dev' into 6980-validateIBANRefactor	2024-03-05 11:54:20 +00:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Carlos Satorres	16fc446b85	refs #6755 fix method	2024-03-05 10:46:15 +01:00
Guillermo Bonet	55ba315858	refactor: refs #6948 Bank to Accouting	2024-03-05 10:30:25 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Carlos Satorres	2b299eb32b	refs #6980 fix iban	2024-03-05 09:48:53 +01:00
Carlos Satorres	cac388f986	refs #6755 fix ticket	2024-03-05 09:43:07 +01:00
Sergio De la torre	09923d2509	refs #6964 feat:advice for olderItem	2024-03-04 18:35:36 +01:00
Carlos Satorres	893320b114	refs #6755 model ticketlog, restore	2024-03-04 15:00:43 +01:00
Alex Moreno	d979e36686	refs #6336 feat(claimState): delete without using & refactor: unnecessary test	2024-03-04 14:13:37 +01:00
Alex Moreno	b761c258a1	refs #6336 feat(claimState): delete without using	2024-03-04 14:12:56 +01:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Jorge Penadés	854a9b62af	fix: refs #6276 refactor updateInTime & changes	2024-03-04 09:21:41 +01:00
Jorge Penadés	7d8d31022b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 12:29:55 +01:00
Jorge Penadés	657430d28b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-01 12:15:49 +01:00
Pablo Natek	6aa68afd8f	Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev ... Reviewed-on: #2100 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-01 07:39:06 +00:00
Jorge Penadés	7b0bed209e	feat: refs #5186 add acl & model	2024-02-29 16:27:42 +01:00
Jorge Penadés	c54c9ce913	fix: refs #5186 create parkingLog & add sector relation	2024-02-29 14:43:37 +01:00
Jorge Penadés	c79bdeb3f4	fix: refs #6744 drop to set emailVerified	2024-02-29 13:41:27 +01:00
Jorge Penadés	1658838c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-29 12:41:24 +01:00
Alex Moreno	e844a3f8fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-29 09:45:07 +01:00
Alex Moreno	3f6ec13fa5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-29 09:43:44 +01:00
Javier Segarra	8e976d2e4f	refs #5858 feat: remove Schedule system	2024-02-29 09:28:27 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Javier Segarra	599e8761c1	hotfix fix: replace pdf with csv	2024-02-29 06:26:21 +00:00
Javier Segarra	6b7dc67c3e	hotfix fix: replace pdf with csv	2024-02-29 06:25:41 +00:00
Ivan Mas	10a89cb790	refs #6827 Check usernames special characters	2024-02-28 13:32:17 +01:00
Javier Segarra	a1a80259a2	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-02-28 06:41:17 +00:00
Jorge Penadés	cbb7bd0028	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 15:50:47 +01:00
Carlos Satorres	482805de4b	Merge branch 'dev' into 5858-fiscalData-validations	2024-02-27 12:01:36 +00:00
Alex Moreno	7874762da9	Merge pull request 'master' (!2102) from master into test ... Reviewed-on: #2102 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-27 11:38:02 +00:00
Sergio De la torre	699af5b9b7	refs #6531_hotFix_lastTickets	2024-02-27 11:53:55 +01:00
Guillermo Bonet	89ebd36b9b	Merge branch 'test' into dev	2024-02-27 11:50:23 +01:00
Guillermo Bonet	6339a59de0	Merge branch 'master' into test	2024-02-27 11:49:58 +01:00
Jorge Penadés	b86110c898	fix: refs #6276 changes	2024-02-27 10:29:49 +01:00
Guillermo Bonet	a8065ab1a4	fix: refs #6184 hasFile false in saveSign and saveCmr	2024-02-27 09:43:53 +01:00
Jorge Penadés	c875abf5e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 09:42:14 +01:00
Carlos Satorres	aa49a5c82d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-27 09:28:27 +01:00
Pablo Natek	8263b203a7	remove(claimRma): refs #6349 remove	2024-02-26 18:38:50 +01:00
Guillermo Bonet	554f6c4695	Merge branch 'test' into dev	2024-02-26 14:28:46 +01:00
Guillermo Bonet	3579c94268	fix: refs #6184 saveSign	2024-02-26 14:09:53 +01:00
Guillermo Bonet	096987040e	fix: refs #6184 saveSign	2024-02-26 14:00:04 +01:00
Guillermo Bonet	a4419a2542	fix: refs #6184 saveSign	2024-02-26 13:57:07 +01:00
Guillermo Bonet	c1c64d0f89	fix: refs #6184 saveSign	2024-02-26 13:39:57 +01:00
Guillermo Bonet	817f685621	fix: refs #6184 saveSign	2024-02-26 13:00:35 +01:00
Guillermo Bonet	a359ace1b8	fix: refs #6184 saveSign	2024-02-26 12:57:49 +01:00
Sergio De la torre	96abdd4630	refs #6078 feat:add workeractivity	2024-02-26 12:52:34 +01:00
Guillermo Bonet	413f7eb8c8	fix: refs #6184 saveSign	2024-02-26 12:45:38 +01:00
Alex Moreno	b1a8fcf968	refs #6925 fix(invoice): incoterms error	2024-02-26 11:50:46 +01:00
Alex Moreno	9f8e448562	refs #5509 fix(EntryDms): some issues	2024-02-26 07:22:51 +01:00
Alex Moreno	d37802fda8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-26 07:21:47 +01:00
Javier Segarra	04086e37ee	refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method	2024-02-26 06:57:17 +01:00
Javier Segarra	ae0ce8e49a	refs #6930 feat: use tokenMultimedia intead tokenUser	2024-02-26 06:53:30 +01:00
Carlos Satorres	6dc4181575	refs #5878 fix pr	2024-02-23 13:54:32 +01:00
Carlos Satorres	efdc8eb188	refs #5878 fix phone	2024-02-23 13:52:44 +01:00
Carlos Satorres	8fa4346f8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-23 13:37:49 +01:00
Jorge Penadés	70c400c5f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-23 12:51:22 +01:00
Jorge Penadés	3bf25e5759	fix: refs #6744 locale	2024-02-23 09:31:01 +01:00
Jorge Penadés	cab8a9c8b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-23 09:24:15 +01:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Jorge Penadés	625c498f26	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-23 09:18:45 +01:00
Alex Moreno	0ad3abcea3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 08:39:54 +01:00
Alex Moreno	1d4c48e149	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 08:39:26 +01:00
Alex Moreno	f51df43d17	Merge branch 'master' into 6878-hotfix-addManualTimeEntries	2024-02-23 07:32:18 +00:00
Alex Moreno	489432b4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:51:26 +01:00
Alex Moreno	607b908814	Merge branch 'dev' into 6414-fix_backTest_newWorker	2024-02-23 06:41:36 +00:00
Alex Moreno	4a2032b9cd	refs #5509 fix(EntryDms): sql	2024-02-23 07:39:56 +01:00
Alex Moreno	1f48245223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:13:54 +01:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
Jorge Penadés	744dd61561	fix: refs #6744 create setUnverifiedPassword	2024-02-22 15:42:54 +01:00
Guillermo Bonet	df5e9bc830	fix: refs #6184 Rollback saveSign.js	2024-02-22 14:46:10 +01:00
Carlos Satorres	fac7071bae	refs #6414 fix(newWorker): back test	2024-02-22 14:38:26 +01:00
Ivan Mas	a0cb32ea10	refs #6784 Delete unnecessary JOINs	2024-02-22 14:01:19 +01:00
Jorge Penadés	168e8ca205	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-22 13:21:46 +01:00
Jorge Penadés	76b1433099	fix: refs #6878 use clockIn procedure on update time	2024-02-22 12:48:07 +01:00
Guillermo Bonet	80fc9e4472	fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js	2024-02-22 10:16:29 +01:00
Alex Moreno	033b176e72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-22 09:06:03 +01:00
Alex Moreno	60dfe8ec05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8	2024-02-21 15:12:48 +01:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00