8484 Commits

Author	SHA1	Message	Date
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
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	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	f592045925	refs #6784 Delete clientType.id and modify relationships in json and js	2024-02-21 11:49:27 +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
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
Carlos Satorres	f3511d4a43	refs #6414 tback	2024-02-20 09:53:28 +01:00
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00: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	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
Carlos Satorres	59ea47a8c3	refs #6414 tback	2024-02-16 13:06:33 +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	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
Guillermo Bonet	b449da28ef	Merge branch 'dev' into 6184-externalCmr	2024-02-13 08:42:31 +00: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	534b5bb05a	fix: refs #6106 where filter	2024-02-12 11:26:00 +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	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
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