19329 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	9dd5b725e1	Merge branch 'dev' into 6501-procMigration	2024-02-14 06:04:25 +00:00
Guillermo Bonet	142c1bf7bd	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-14 06:03:46 +00:00
Juan Ferrer	19bbb4a4bf	fix: refs#6706 package.json deprecated scripts removed	2024-02-13 17:20:04 +01:00
Juan Ferrer	27d7a114e6	fix: refs#6706 package.json dbtest script removed	2024-02-13 17:16:10 +01:00
Juan Ferrer	a5d1597884	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-13 16:21:02 +01:00
Juan Ferrer	999d9a0f9c	fix: refs#6706 E2E show parameter fix	2024-02-13 16:21:01 +01:00
Ivan Mas	11bbab6288	Merge pull request 'feat: refs #6830 item_getLack origin' (!2025) from 6830-item_getLackOrigin into dev ... Reviewed-on: #2025 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 13:14:02 +00:00
Ivan Mas	add5fedc4e	Merge branch 'dev' into 6830-item_getLackOrigin	2024-02-13 13:12:02 +00:00
Juanjo Breso	c9294680a5	Merge branch 'dev' into 6693-revisarTriggersPendientes	2024-02-13 12:53:13 +00:00
Pako Natek	cf0d7e04a1	rounding stickers down	2024-02-13 13:43:31 +01:00
Sergio De la torre	9f40cbc123	Merge branch 'dev' into 6669_ticketClosure	2024-02-13 12:32:13 +00:00
Guillermo Bonet	92261ebe0d	fix: refs #5586 Tests fix	2024-02-13 13:09:12 +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	9bd8c21660	Merge pull request '#6813 fix creditClient' (!2026) from 6813-fixCreditClient into dev ... Reviewed-on: #2026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-13 10:53:38 +00:00
Jorge Penadés	76b4f8f46f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 11:46:47 +01:00
Guillermo Bonet	bf6d068830	Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev ... Reviewed-on: #2032 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-13 10:16:43 +00:00
Jorge Penadés	579f2abe5b	fix: refs #6813 remove quotation marks	2024-02-13 11:16:00 +01:00
Guillermo Bonet	3c6e3a9856	Merge branch 'dev' into 6501-procMigration	2024-02-13 10:15:46 +00:00
Guillermo Bonet	ed67b1168f	refactor: refs #6501 Requested changes	2024-02-13 11:14:35 +01:00
Jorge Penadés	db2919b482	fix: refs #6813 procedure	2024-02-13 11:05:21 +01:00
Jorge Penadés	d7fb31ee60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 10:16:12 +01:00
Guillermo Bonet	d3755d6aa2	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-13 09:11:55 +00:00
Guillermo Bonet	b1fa834626	refactor: refs #6775 Deleted proc itemProposal_Add	2024-02-13 10:12:08 +01:00
Josep Domingo	51b336d9f7	Merge pull request 'refs#6685 RestoreViewCredit' (!2030) from 6685-fixRestoreViewCredit into dev ... Reviewed-on: #2030 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 09:00:03 +00:00
Josep Domingo	68034fc404	Merge branch 'dev' into 6685-fixRestoreViewCredit	2024-02-13 08:56:05 +00:00
Javi Gallego	51afb87122	feat: #6392 cambia gasto	2024-02-13 09:54:26 +01:00
Juanjo Breso	185cc4f17f	feat: refs #6693 revisar triggers	2024-02-13 09:50:07 +01:00
Juan Ferrer	4f9b46346f	fix: refs#6706 back tests spec timeout reduced	2024-02-13 09:49:33 +01:00
Guillermo Bonet	bbb3f3807a	Merge pull request 'fix: refs #6184 Minor change' (!2031) from 6184-externalCmr into dev ... Reviewed-on: #2031 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-13 08:45:03 +00:00
Guillermo Bonet	b449da28ef	Merge branch 'dev' into 6184-externalCmr	2024-02-13 08:42:31 +00:00
Jorge Penadés	995e249495	Merge pull request '#6106 where filter' (!2024) from 6106-fixSignView into dev ... Reviewed-on: #2024 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 08:42:14 +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
Jorge Penadés	6116ada156	fix: refs #6813 remove inserts	2024-02-13 09:35:39 +01:00
Guillermo Bonet	41db1c924f	refactor: refs #6781 Deleted timeControlDevice	2024-02-13 09:20:21 +01:00
Javier Segarra	37dd3c00c5	updates	2024-02-13 09:11:39 +01:00
Guillermo Bonet	e08fb3d229	fix: refs #6184 Minor change	2024-02-13 08:59:58 +01:00
Josep Domingo	4feae72ee3	Merge branch 'dev' into 6685-fixRestoreViewCredit	2024-02-13 07:58:41 +00:00
Josep Domingo	3b35e4dae8	refs#6685 RestoreViewCredit	2024-02-13 08:57:49 +01:00
Josep Domingo	5b137ad825	Merge pull request 'feat: refs #6685 RestoreViewCredit' (!2028) from 6685-fixRestoreViewCredit into dev ... Reviewed-on: #2028 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-13 07:46:18 +00:00
Javier Segarra	24984e8aca	Revert "refs #5858 feat: comments" ... This reverts commit 05d685c86b.	2024-02-13 08:32:04 +01:00
Javi Gallego	118fbcb94f	feat: #5720 vehicle nuevos campos	2024-02-13 07:55:40 +01:00
Josep Domingo	a897a05e8b	feat: refs#6685RestoreViewCredit	2024-02-13 07:52:09 +01:00
Guillermo Bonet	8f4b901818	Merge pull request 'refs #6184 saveCmr' (!1788) from 6184-saveCmr into dev ... Reviewed-on: #1788 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-13 06:47:05 +00:00
Guillermo Bonet	97f02187e3	Merge branch 'dev' into 6184-saveCmr	2024-02-13 07:35:07 +01:00
Guillermo Bonet	c4528a9eac	Merge branch 'dev' into 6501-procMigration	2024-02-13 06:16:13 +00:00
Guillermo Bonet	fb84fe4b97	refactor: refs #6501 Requested changes	2024-02-13 07:16:32 +01:00
Javier Segarra	242d675d28	Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 15:13:27 +01:00
Javier Segarra	955828c63e	refs #5858 feat: comments	2024-02-12 15:13:18 +01:00