9228 Commits

Author	SHA1	Message	Date
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
Ivan Mas	48310d24c7	refs #6732 change name supplier.isSerious to supplier.isReal	2024-02-21 14:36:12 +01:00
Javier Segarra	57a1f2a1f6	refs #5858 test: check vn_schedules	2024-02-21 14:29:20 +01:00
Javier Segarra	dddd482317	refs #5858 test: check vn_schedules	2024-02-21 14:22:19 +01:00
Javier Segarra	e00133458b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-21 13:48:53 +01:00
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +01:00
Ivan Mas	f592045925	refs #6784 Delete clientType.id and modify relationships in json and js	2024-02-21 11:49:27 +01:00
Jorge Penadés	c6c2f84e29	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-21 10:29:49 +01:00
Carlos Satorres	7514348d13	Merge branch 'dev' into 6414-testBackClient	2024-02-21 09:29:45 +00:00
Alex Moreno	946006c7e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-21 07:48:05 +01:00
Pablo Natek	59336b8588	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-02-20 14:33:45 +01:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Carlos Satorres	ed37902291	Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-20 13:14:54 +01:00
Ivan Mas	3813dbb9fd	refs #6784 Delete clientTypeFk	2024-02-20 13:10:03 +01:00
Carlos Satorres	728224cad9	refs #5858 fix accepts	2024-02-20 13:04:45 +01:00
Alex Moreno	7fbb9b5c3f	Merge branch 'master' into hotFix_workerTimeControl_reUse_hasToRefill	2024-02-20 11:15:16 +00:00
Alex Moreno	ab9c952afc	hotFix(sendMail): hasToRefill	2024-02-20 12:13:49 +01:00
Jorge Penadés	9ce162da71	fix: refs #6776 back	2024-02-20 10:59:13 +01:00
Carlos Satorres	f3511d4a43	refs #6414 tback	2024-02-20 09:53:28 +01:00
Pablo Natek	ab7eb88913	merge(dev): refs #6005 merge dev	2024-02-20 09:34:08 +01:00
Jorge Penadés	55b490160b	fix: refs #6776 back	2024-02-20 09:27:37 +01:00
Jorge Penadés	072280cc9c	fix: refs #6776 method names	2024-02-20 08:48:47 +01:00
Jorge Penadés	9b5823384a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-20 08:26:02 +01:00
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00:00
Jorge Penadés	e9f7fbed86	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 14:46:56 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Pablo Natek	011880eb72	fix(spec): refs #6879 remove f from describe	2024-02-19 14:15:44 +01:00
Pablo Natek	7b0dd6975d	fix(usesMana): refs #6879 add mana excluded worker	2024-02-19 14:13:36 +01:00
Jorge Penadés	d127354905	Merge branch 'dev' into 6776-makeMulti	2024-02-19 12:21:48 +00:00
Alex Moreno	231ebf78d7	hotFix: remove console.log	2024-02-19 12:33:33 +01:00
Alex Moreno	8328dd6f4c	hotFix: workerTimeControl use department.hasToRefill	2024-02-19 12:31:14 +01:00
Alex Moreno	e8a945ba51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-19 11:49:20 +01:00
Sergio De la torre	7a0320270a	Merge pull request 'test' (!2048) from test into dev ... Reviewed-on: #2048 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:25:33 +00:00
Jorge Penadés	fc6e34ddfd	fix: refs #6776 replace name	2024-02-19 11:18:05 +01:00
Sergio De la torre	adeca2bb22	refs #6531 feat:modify name	2024-02-19 09:17:57 +01:00
Sergio De la torre	5b541aa804	refs #6531 feat:modify name	2024-02-19 09:13:03 +01:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Jorge Penadés	9f2768c131	fix: refs #6776 tests	2024-02-16 15:51:54 +01:00
Jorge Penadés	4bfd259845	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-16 14:18:32 +01:00
Jorge Penadés	69acebb43c	fix: refs #6776 replace name	2024-02-16 13:48:55 +01:00
Jorge Penadés	8cecff36ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-16 13:14:59 +01:00
Jorge Penadés	030f42d03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 13:11:02 +01:00
Carlos Satorres	59ea47a8c3	refs #6414 tback	2024-02-16 13:06:33 +01:00
Jorge Penadés	1767ce426a	fix: refs #6276 collection_addItem	2024-02-16 11:54:59 +01:00
Jorge Penadés	89970e39d0	fix: refs #6276 back tests	2024-02-16 10:47:41 +01:00
Jorge Penadés	63c615655b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 08:34:05 +01:00
Jorge Penadés	556a67ecfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-16 08:26:32 +01:00
Jorge Penadés	78583751ec	refactor: refs #6760 ticketsIds improved	2024-02-15 16:22:13 +01:00
Jorge Penadés	2fb68e81c9	fix: refs #6276 rollback sale	2024-02-15 15:17:39 +01:00
Jorge Penadés	f11aa2605b	feat: refs #6776 back & procedure modified	2024-02-15 14:48:30 +01:00
Carlos Satorres	98d2b5a0ff	hotfix creditClient	2024-02-15 12:59:30 +01:00
Jorge Penadés	be7a570314	fix: refs #6776 test	2024-02-15 11:18:01 +01:00
Jorge Penadés	bec574ff99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-15 11:03:33 +01:00
Guillermo Bonet	256aa76e23	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 09:18:13 +00:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Alex Moreno	2703d50cbf	refs #6859 fix(account): changePassword name	2024-02-15 09:39:02 +01:00
Guillermo Bonet	5a0ce700b3	fix: refs #5586 Requested changes	2024-02-15 09:38:34 +01:00
Jorge Penadés	fa7b94590d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-15 08:36:00 +01:00
Javier Segarra	234ea26fe2	Merge branch 'test' into 2687_fix_travel_cloneWithEntries	2024-02-15 07:07:44 +00:00
Guillermo Bonet	8c262df31e	Merge branch '5586-optimizeNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix into 5586-optimizeNegativeBases	2024-02-15 07:52:34 +01:00
Guillermo Bonet	10bfb7a7d7	fix: refs #5586 Minor change	2024-02-15 07:52:33 +01:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Guillermo Bonet	46a1ad35b5	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 06:50:03 +00:00
Guillermo Bonet	05b7c37b94	fix: refs #5586 Rollback	2024-02-15 07:49:17 +01:00
Alex Moreno	b08dd95e92	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 07:30:42 +01:00
Javier Segarra	3ff3c812ed	refs #2687 fix: remove bad changes file	2024-02-14 20:15:34 +01:00
Jorge Penadés	32f8d13359	fix: refs #6760 back modified & revoke update on ticket.clientFk	2024-02-14 13:15:31 +01:00
Javier Segarra	5918c14d41	refs #5878 feat: replace by any	2024-02-14 10:14:54 +01:00
Javier Segarra	b9a624d9cd	refs #2687 feat: create util.procedures	2024-02-14 09:30:31 +01:00
Guillermo Bonet	bdc6192a7c	refactor: refs #5586 Optimized SQL negativeBases	2024-02-13 12:50:39 +01:00
Guillermo Bonet	42de1a7e51	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-13 12:29:46 +01:00
Jorge Penadés	47bfb34507	fix: refs #6744 remove params	2024-02-13 10:10:48 +01:00
Guillermo Bonet	b449da28ef	Merge branch 'dev' into 6184-externalCmr	2024-02-13 08:42:31 +00:00
Jorge Penadés	6e915d36d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-13 09:42:05 +01:00
Guillermo Bonet	744171dd4c	fix: refs #6184 Requested changes	2024-02-13 09:41:26 +01:00
Jorge Penadés	c8e13fa858	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView	2024-02-13 09:36:07 +01:00
Guillermo Bonet	e08fb3d229	fix: refs #6184 Minor change	2024-02-13 08:59:58 +01:00
Alex Moreno	06fe4957d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-13 08:13:58 +01:00
Guillermo Bonet	97f02187e3	Merge branch 'dev' into 6184-saveCmr	2024-02-13 07:35:07 +01:00
Jorge Penadés	7b862c5c30	fix: refs #6744 fix setPassword	2024-02-12 16:10:58 +01:00
Javier Segarra	0a398fdd6c	refs #5858 feat: comments	2024-02-12 11:37:08 +01:00
Jorge Penadés	534b5bb05a	fix: refs #6106 where filter	2024-02-12 11:26:00 +01:00
Javier Segarra	3cb494c735	refs #5858 fix: restore test to default	2024-02-12 10:14:23 +01:00
Javier Segarra	995a99c661	refs #5858 feat: removeZoneIncludedCheck	2024-02-12 08:53:55 +01:00
Javier Segarra	a756c3bc3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 08:51:58 +01:00
Javier Segarra	e79bdb4456	refs #2687 test: fix	2024-02-12 08:45:07 +01:00
Jorge Penadés	d60a95feaa	fix: refs #6379 await & locale	2024-02-12 08:34:25 +01:00
Jorge Penadés	9cf5edb26e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:45:33 +01:00
Jorge Penadés	c3b0a8260a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 13:38:59 +01:00
Jorge Penadés	e61b6b0c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail	2024-02-09 13:36:53 +01:00
Jorge Penadés	4aeb88229d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-09 13:07:42 +01:00
Jorge Penadés	e0de498f65	fix: refs #6379 add Error & locale	2024-02-09 13:04:27 +01:00
Carlos Satorres	e03e871529	Merge branch 'dev' into 6791-negativeNickname	2024-02-09 11:47:36 +00:00
Carlos Satorres	1597f17230	refs #6791 remove intro	2024-02-09 12:47:17 +01:00
Jorge Penadés	4075375d6e	fix: refs #6379 get mail	2024-02-09 12:12:10 +01:00
Carlos Satorres	3e57bf2b34	refs #6791 remake negativeBases	2024-02-09 11:49:29 +01:00
Jorge Penadés	3f08cdd51c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter	2024-02-09 09:45:10 +01:00
Jorge Penadés	30069ded15	fix: refs #6806 fix date filter	2024-02-08 16:01:34 +01:00
Guillermo Bonet	974228eedd	refactor: refs #5586 Optimized SQL negativeBases	2024-02-08 11:37:15 +01:00
Jorge Penadés	8ad69a62b9	fix: refs #6276 loggable & userId	2024-02-08 10:08:16 +01:00
Jorge Penadés	2940c68516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 08:36:05 +01:00
Alex Moreno	b54827a2ad	refs #5509 feat(EntryDms): add download & upload file	2024-02-08 07:23:42 +01:00
Carlos Satorres	7e18bd0a12	refs #6281 vehicles remove where	2024-02-07 13:03:24 +01:00
Carlos Satorres	9ee0669903	hotfix kmMax	2024-02-07 11:27:18 +01:00
Guillermo Bonet	ffa9212861	fix: refs #6184 Requested changes	2024-02-07 10:29:42 +01:00
Jorge Penadés	aff8ee28ea	fix: refs #6272 back & create test	2024-02-07 10:16:47 +01:00
Alex Moreno	e6735f9ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-07 08:35:54 +01:00
Guillermo Bonet	f4feb6e8b7	Merge branch 'dev' into 6184-saveCmr	2024-02-06 12:13:48 +01:00
Guillermo Bonet	2cab007f57	fix: refs #6184 Requested changes	2024-02-06 12:12:45 +01:00
Carlos Satorres	318f74072e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus	2024-02-06 10:09:11 +01:00
Guillermo Bonet	f2946e4168	fix: refs #6184 Requested changes	2024-02-06 08:04:19 +01:00
Guillermo Bonet	d6ae1fd1f8	Merge branch 'dev' into 6184-saveCmr	2024-02-06 06:39:51 +01:00
Alex Moreno	691853df49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-05 12:55:16 +01:00
Jorge Penadés	a0c5b1fff6	feat: refs # test corrective & clone	2024-02-05 11:59:51 +01:00
Jorge Penadés	cd73e5adfe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 09:37:43 +01:00
Jorge Penadés	99fbb95669	fix: refs #6703 test back	2024-02-05 09:35:20 +01:00
Jorge Penadés	05478b43f2	fix: refs #4466 test back	2024-02-05 09:30:29 +01:00
Jorge Penadés	17680b2cc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:49:48 +01:00
Jorge Penadés	86d839ad45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-05 08:48:22 +01:00
Jorge Penadés	ef5401aa46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-05 08:44:23 +01:00
Jorge Penadés	0c356938fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-05 08:43:56 +01:00
Jorge Penadés	743f317b20	fix: refs #4466 test & sql	2024-02-02 14:02:16 +01:00
Guillermo Bonet	eec36300ad	refactor: refs #6184 Minor changes	2024-02-02 12:25:48 +01:00
Guillermo Bonet	1d596b63a0	Merge branch 'dev' into 6184-saveCmr	2024-02-02 12:24:28 +01:00
Jorge Penadés	c9b28d10bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-02 11:27:19 +01:00
Jorge Penadés	9f194f4f63	fix: refs #6276 fix model	2024-02-02 10:28:13 +01:00
Alex Moreno	d5e6750998	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-02 09:36:41 +01:00
Jorge Penadés	21cf05ddd0	fix: refs #6276 fix tests & errors	2024-02-02 09:23:29 +01:00
Alex Moreno	9ac0ffb85a	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-02 07:30:59 +00:00
Jorge Penadés	7d01449518	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-02 08:11:48 +01:00
Jorge Penadés	a20effc42c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-02 08:11:23 +01:00
Jorge Penadés	9f9d953b86	fix: refs #6276 resolve conflicts	2024-02-02 08:11:00 +01:00
Jorge Penadés	bda23a2139	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 14:33:51 +01:00
Jorge Penadés	ec7a88c6dd	fix: refs #6703 tests, backs & fixtures	2024-02-01 12:56:11 +01:00
Carlos Satorres	6576bab305	Merge branch 'dev' into 6397-emailValidation	2024-02-01 11:48:48 +00:00
Carlos Satorres	ffbe0e1261	Merge branch 'dev' into 6318-removeQuantityCheck	2024-02-01 11:27:08 +00:00
Carlos Satorres	e56e5905c2	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 11:22:47 +00:00
Alex Moreno	a9a1f97366	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:17:48 +01:00
Carlos Satorres	91c3c8f04d	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-01 10:51:11 +00:00
Alex Moreno	36e8840e6e	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 09:28:59 +00:00
Jorge Penadés	4490dc7bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-02-01 08:15:15 +01:00
Jorge Penadés	af4af43d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:50 +01:00
Jorge Penadés	c4161eec97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 08:14:37 +01:00
Guillermo Bonet	b045584658	Merge branch 'dev' into 6184-saveCmr	2024-02-01 07:11:33 +00:00
Guillermo Bonet	548526964e	Merge branch 'dev' into 6184-saveCmr	2024-02-01 06:23:25 +00:00
Carlos Satorres	aa993e7386	refs #6757 fix back, fix upperCase, fix e2e back	2024-01-31 17:01:47 +01:00
Carlos Satorres	cbdb089562	Merge branch 'dev' into 6397-emailValidation	2024-01-31 15:44:57 +00:00
Carlos Satorres	40dd0d4e02	Merge branch 'dev' into 6318-removeQuantityCheck	2024-01-31 14:50:05 +00:00
Guillermo Bonet	851e5cc5af	refactor: refs #6235 Fixed tests back	2024-01-31 13:16:56 +01:00
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Carlos Satorres	bbf50995c7	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 10:21:06 +00:00
Guillermo Bonet	e0d15e572c	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 10:13:57 +00:00
Jorge Penadés	2c1b8bd9db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-31 10:02:58 +01:00
Jorge Penadés	be3e7bb8df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 10:01:21 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Jorge Penadés	e6eac54709	fix: refs #6703 tests & front	2024-01-31 09:59:32 +01:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Sergio De la torre	a8b483078f	refs #6186 feat:deprecated packingShelve	2024-01-31 08:52:36 +01:00
Jorge Penadés	9e12bdf4e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 08:49:28 +01:00
Carlos Satorres	5d2f3d1a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:00 +01:00
Jorge Penadés	2a6abffef9	fix: refs #6276 fix errors & refactor	2024-01-30 16:07:33 +01:00
Jorge Penadés	5690da0a18	fix: refs #6776 add userId	2024-01-30 16:05:56 +01:00
Carlos Satorres	509d5cea14	refs #6270 fix back	2024-01-30 15:54:03 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Jorge Penadés	afa34c6296	feat: refs #6776 makeMulti	2024-01-30 14:00:08 +01:00
Carlos Satorres	2fc39d54a0	refs #6318 fix code	2024-01-30 13:09:15 +01:00
Jorge Penadés	88dfdb157f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-30 11:25:17 +01:00
Guillermo Bonet	d39d54a514	fix: #6184 Requested changes	2024-01-30 09:50:53 +01:00
Guillermo Bonet	1e56e741e2	fix: #6184 Requested changes	2024-01-30 09:44:10 +01:00
Guillermo Bonet	13b8964e3d	Merge branch 'dev' into 6184-saveCmr	2024-01-30 07:27:34 +00:00
Sergio De la torre	0f3ffcfa61	fix: refs #6184 Upload sign	2024-01-30 08:11:33 +01:00
Guillermo Bonet	1fe6818a0f	fix: #6184 Minor changes	2024-01-30 07:42:58 +01:00
Guillermo Bonet	65268487b9	fix: #6184 Now creates only one dms in saveSign	2024-01-30 07:32:26 +01:00
Carlos Satorres	9b8c58ba7d	refs #6270 makeInvoice	2024-01-29 16:00:24 +01:00
Carlos Satorres	94cc3ad80e	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:47:52 +00:00
Alex Moreno	f4dc596e97	refs 5509 feat: add triggers, downloadFile	2024-01-29 15:13:56 +01:00
Carlos Satorres	f14c239391	Merge branch 'dev' into 6397-emailValidation	2024-01-29 14:10:17 +00:00
Javier Segarra	2e0da0881b	refs #6174 test: fix method	2024-01-29 14:54:19 +01:00
Javier Segarra	9bf08f31ae	refs #6174 feat: replace method in salix-front	2024-01-29 14:10:22 +01:00
Carlos Satorres	04f1a03d4d	refs #6397 fix back	2024-01-29 14:08:43 +01:00
Juan Ferrer	194262a93e	fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks	2024-01-29 13:48:02 +01:00
Alex Moreno	cf0e74c457	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-01-29 11:37:53 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Guillermo Bonet	65756f98ad	fix: #6184 Minor changes	2024-01-29 08:25:00 +01:00
Guillermo Bonet	990e8ee249	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-29 08:14:34 +01:00
Guillermo Bonet	7c80a7bdda	fix: #6184 Minor changes	2024-01-29 08:14:33 +01:00
Jorge Penadés	4fc780967f	fix: refs #6703 tests	2024-01-26 15:32:50 +01:00
Guillermo Bonet	49a08a96da	Merge branch 'dev' into 6184-saveCmr	2024-01-26 11:56:43 +00:00
Guillermo Bonet	567e480e3b	feat: #6184 Minor changes	2024-01-26 12:40:42 +01:00
Jorge Penadés	ab3fdf4fe4	fix: refs #6703 remove console log	2024-01-26 12:33:04 +01:00
Guillermo Bonet	25fa154f60	feat: #6184 Minor changes	2024-01-26 12:25:02 +01:00
Jorge Penadés	e33861a80d	fix: refs #6703 filter	2024-01-26 12:15:53 +01:00
Guillermo Bonet	d5a145ba1b	feat: #6184 Minor changes	2024-01-26 10:44:04 +01:00
Guillermo Bonet	dec795d902	feat: #6184 Minor changes	2024-01-26 10:14:47 +01:00
Guillermo Bonet	5828fa9657	feat: #6184 Refactor saveSign	2024-01-26 10:05:24 +01:00
Javier Segarra	0afc9ab109	refs #6174 test: fix test bug	2024-01-26 09:55:21 +01:00
Jorge Penadés	53f37bb0eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-26 09:32:08 +01:00
Javier Segarra	f1cbb6aab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-26 08:48:05 +01:00
Jorge Penadés	e5d466b697	fix: refs #6703 drop & replace sale refund by clone	2024-01-26 08:30:43 +01:00
Jorge Penadés	ed77347fe1	fix: #6557 replace procedure	2024-01-25 15:41:55 +01:00
Pablo Natek	a7faac3ef6	fix. refs #6743 remove consoleLog	2024-01-25 15:07:19 +01:00
Pablo Natek	2e1b55448a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 15:04:32 +01:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Guillermo Bonet	9005975f1c	feat: #6184 Modified email cmr	2024-01-25 13:56:47 +01:00
Jorge Penadés	e6335548ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 12:23:08 +01:00
Jorge Penadés	63fb3db8a1	fix: refs #6276 test item_card & general fixes	2024-01-25 12:14:14 +01:00
Alex Moreno	66936d8983	hotFix: saveSign	2024-01-25 11:37:25 +01:00
Alex Moreno	578bcd3cce	hotFix: saveSign	2024-01-25 11:09:56 +01:00
Alex Moreno	d305de2438	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-25 09:00:48 +01:00
Pablo Natek	36fc55180a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:30:28 +01:00
Pablo Natek	01c21baa65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:25:08 +01:00
Jorge Penadés	01340408c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-25 08:14:02 +01:00
Jorge Penadés	02e38eb711	fix: refs #6276 fix tests	2024-01-25 08:13:47 +01:00
Alex Moreno	dec625d2df	Merge branch 'master' into 6745-2404_testToMaster	2024-01-25 06:23:29 +00:00
Carlos Satorres	a594fda704	Merge branch 'dev' into 6313-removecanForceQuantity	2024-01-24 12:50:03 +00:00
Alex Moreno	1c0f8acb87	refs #5871 fix: awb	2024-01-24 13:37:29 +01:00
Sergio De la torre	48e4e21aa8	refs #6028 hotFix : getByWorker days to show	2024-01-24 12:55:51 +01:00
Sergio De la torre	fc53e98bb5	refs #6028 hotFix : getByWorker days to show	2024-01-24 10:48:01 +01:00
Robert Ferrús	2ee48a53e2	refs #6222 fix(ticket): step-two	2024-01-24 09:59:27 +01:00
Javier Segarra	bc6f9bc074	refs #6174 test: new test for new method	2024-01-23 23:52:45 +01:00
Guillermo Bonet	c7be1b57b1	Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr	2024-01-23 14:13:41 +01:00
Guillermo Bonet	a676607e29	feat: #6184 Added email cmr	2024-01-23 14:13:40 +01:00
Guillermo Bonet	12bfb8ca77	feat: #6184 Added tests and process.env.IS_SPEC_RUNNING	2024-01-23 11:05:39 +01:00
Guillermo Bonet	43bfb3cfde	Merge branch 'dev' into 6184-saveCmr	2024-01-23 10:05:21 +00:00
Jorge Penadés	799237e14c	feat: refs #6276 test shelving_addLog	2024-01-23 09:09:55 +01:00
Javier Segarra	dcb2907d49	Merge branch 'dev' into 6174_refactor_invoicePdfNotify	2024-01-23 07:43:40 +00:00
Jorge Penadés	dcf6232c14	feat: refs #6276 test sale_getFromSectorCollection	2024-01-23 08:39:30 +01:00
Jorge Penadés	efb8bc46c6	refactor: refs #6276 saleTracking_mark	2024-01-22 15:13:49 +01:00
Jorge Penadés	e3899b2cf7	refactor: refs #6276 saleTracking_mark	2024-01-22 13:32:50 +01:00
Jorge Penadés	65e5c6dac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-22 12:45:25 +01:00
Jorge Penadés	ed713e762b	feat: refs #6276 test saleTracking_mark	2024-01-22 12:36:52 +01:00
Javier Segarra	7f43a45955	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 11:08:06 +00:00
Carlos Satorres	cf03982d0c	refs #6397 trad tback	2024-01-22 10:20:10 +01:00
Guillermo Bonet	6701f70a33	Merge branch 'dev' into 6184-saveCmr	2024-01-22 09:07:31 +00:00
Javier Segarra	95398485dc	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 09:01:28 +00:00
Javier Segarra	ba2815becb	Merge branch 'dev' into 6174_refactor_invoicePdfNotify	2024-01-22 09:00:55 +00:00
Alex Moreno	ee6fe5a6e1	Merge branch 'dev' into 6667-searchFilter	2024-01-22 07:02:51 +00:00
Jorge Penadés	f04724a61f	feat: refs #6276 new test added	2024-01-22 07:58:18 +01:00
Jorge Penadés	89d18e29f0	feat: refs #6276 test saleTrackingReplace (updateTracking)	2024-01-22 07:49:21 +01:00
Jorge Penadés	6ee7ca79b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-19 14:54:25 +01:00
Carlos Satorres	73e1b52348	refs #6397 refactor	2024-01-19 14:53:56 +01:00
Jorge Penadés	f8faa958e6	feat: refs #6276 drop worker_getPrinter	2024-01-19 14:53:41 +01:00
Jorge Penadés	d78e90687e	fix: refs #6276 drop worker_getPrinter	2024-01-19 14:51:03 +01:00
Jorge Penadés	428da6fe00	feat: refs #6276 drop worker_getPrinter	2024-01-19 14:50:33 +01:00
Jorge Penadés	6e59a87f9c	feat: refs #6276 test operator_add	2024-01-19 14:44:07 +01:00
Jorge Penadés	817a6b1289	feat: refs #6276 test operator_add	2024-01-19 14:35:10 +01:00
Carlos Satorres	391f418883	refs #6397 fix test back	2024-01-19 14:18:17 +01:00
Carlos Satorres	0f104e5410	refs #6667 view workerDepartment	2024-01-19 10:11:33 +01:00
Jorge Penadés	5c0425b942	feat: refs #6276 test machineWorker_update	2024-01-19 09:52:49 +01:00
Carlos Satorres	3be194356f	fix expense	2024-01-19 09:31:25 +01:00
Carlos Satorres	882dd04adb	Merge branch 'dev' into 6296-countryAddress	2024-01-19 07:55:00 +00:00
Alex Moreno	7ea1fbfb26	refs #5509 feat: entryDms funcionality	2024-01-18 15:09:52 +01:00
Jorge Penadés	34420375cd	feat: refs #6276 test item_updateFromSale	2024-01-18 15:03:17 +01:00
Jorge Penadés	b33594e0da	fix: refs #6276 item_card & wip test	2024-01-18 14:35:51 +01:00
Jorge Penadés	d41d57143f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-18 13:53:26 +01:00
Jorge Penadés	c8bfb35cf6	feat: refs #6276 test itemShelvingMake_multi	2024-01-18 13:28:22 +01:00
Jorge Penadés	6f35c62cd5	feat: refs #6276 test collection_addItem	2024-01-18 11:51:21 +01:00
Carlos Satorres	e9c1f125a5	refs #6397 test back	2024-01-18 11:43:05 +01:00
Carlos Satorres	7cb7c7dace	refs #6397 back validation	2024-01-18 10:57:17 +01:00
Guillermo Bonet	9faf889833	Merge branch 'dev' into 6184-saveCmr	2024-01-18 09:55:04 +00:00
Alex Moreno	ef2b156b55	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-18 08:07:47 +01:00
Guillermo Bonet	ce5a2ada62	feat: #6184 Requested changes	2024-01-18 07:46:58 +01:00
Jorge Penadés	8e5be5f5da	feat: refs #6276 test itemBarcode_delete	2024-01-17 15:26:04 +01:00
Carlos Satorres	23b8703afc	refs #6397 emailValidation	2024-01-17 15:00:31 +01:00
Guillermo Bonet	a486b7f2d4	feat: #6184 Minor change	2024-01-17 14:42:38 +01:00
Carlos Satorres	ccdef0458a	refs #6667 fix groupBy	2024-01-17 14:39:11 +01:00
Guillermo Bonet	85a0f8b323	feat: #6184 Minor change	2024-01-17 14:30:58 +01:00
Jorge Penadés	c0398d17bf	feat: refs #6276 test itemShelving_return	2024-01-17 14:21:50 +01:00
Alex Moreno	3c778216a4	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-17 13:19:18 +00:00
Guillermo Bonet	1a52e58eaa	feat: #6184 Created generateCmrPdf	2024-01-17 14:18:31 +01:00
Carlos Satorres	7525998477	refs #6296 postal code	2024-01-17 14:13:09 +01:00
Carlos Satorres	d1a3c67d2e	refs #6667 fix limit	2024-01-17 14:07:04 +01:00
Carlos Satorres	1458a803bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-17 13:49:05 +01:00
Carlos Satorres	bf796c445d	refs #5919 fix section	2024-01-17 13:20:28 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Jorge Penadés	1fbb84ae9f	fix: refs #6276 itemShelving_return	2024-01-17 12:58:57 +01:00
Jorge Penadés	bf13e85ecc	fix: refs #6276 getFromSectorCollection	2024-01-17 12:14:38 +01:00
Jorge Penadés	e69ec2c856	feat: refs #6276 test expeditionPallet_get	2024-01-17 12:07:22 +01:00
Javier Segarra	3564a77043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-17 11:12:04 +01:00
Guillermo Bonet	f1b84ee7a0	Merge branch 'dev' into 6184-saveCmr	2024-01-17 10:44:00 +01:00
Javier Segarra	21ce57d217	refs #6174 feat: update back to separate invoice and pdf	2024-01-17 10:31:07 +01:00
Jorge Penadés	90b1e8d664	fix: refs #6276 backend tests	2024-01-17 10:18:13 +01:00
Carlos Satorres	d47429b4a7	refs #6667 sql	2024-01-17 10:01:38 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Jorge Penadés	6a78123fca	fix: refs #6276 machineWorke_update	2024-01-17 09:01:48 +01:00
Jorge Penadés	07e9b737c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-17 07:50:21 +01:00
Jorge Penadés	4f7240b496	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-16 14:50:55 +01:00
Jorge Penadés	fafc25ed19	refactor: refs #6276 sectorCollection_getSale	2024-01-16 14:50:09 +01:00
Alex Moreno	aac3e17d3c	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-16 13:40:37 +00:00
Alex Moreno	9452aacb49	Merge branch 'dev' into 6230-basicItem	2024-01-16 13:25:28 +00:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	3ebeebc159	refs #6230 remove basic-data columns	2024-01-16 11:47:45 +01:00
Carlos Satorres	b3e1c58918	refs #6313 remove restriction	2024-01-15 14:50:08 +01:00
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Carlos Satorres	55b5e4cfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-15 13:29:39 +01:00
Javier Segarra	831d358e41	refs #6174 feat first approach	2024-01-15 10:52:02 +01:00
Guillermo Bonet	107e35001a	fix: refs #6582 Solved log error	2024-01-15 10:09:43 +01:00
Carlos Satorres	107dded411	refs #6296 countryAddress	2024-01-15 09:03:56 +01:00
Jorge Penadés	fcca927adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund	2024-01-15 07:54:35 +01:00
Alex Moreno	c20b9fe212	refs #6656 fix(updateTimeEntry): correct accessType (WRITE)	2024-01-15 07:45:40 +01:00
Jorge Penadés	6236cf0621	hotfix ticketRefund	2024-01-12 16:18:26 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	c0c3d913b7	refs #5919 locker	2024-01-12 09:03:54 +01:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Jorge Penadés	ddcecb8f22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 16:52:54 +01:00
Alex Moreno	b1530d049e	refs #6398 hotFix: use userFk	2024-01-11 13:29:03 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Juan Ferrer	ce5e8c278f	Merge branch 'dev' into 6660-mariadbV10.11.6	2024-01-11 11:22:55 +00:00