20204 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	a24d38128b	feat: #7013 muestra solo clientes asegurados	2024-03-21 10:48:43 +01:00
Javi Gallego	c46e7227e7	feat: #7013 solo muestra clientes asegurados	2024-03-21 10:40:30 +01:00
Guillermo Bonet	2f87ba03b2	Merge branch 'test' into dev	2024-03-21 08:16:44 +01:00
Guillermo Bonet	bbbd212547	build: refs #5846 HOTFIX Myt updated	2024-03-21 08:14:59 +01:00
Guillermo Bonet	de83cef68c	build: refs #5846 HOTFIX Myt updated	2024-03-21 08:01:27 +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
Alex Moreno	60ebe31b3f	Merge pull request '2412_testToMaster' (!2185) from 2412_testToMaster into master ... Reviewed-on: #2185 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-21 06:00:09 +00:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Alex Moreno	d89e35c429	Merge pull request 'hotFix(closeAll): fix debug' (!2179) from hotFix_closeAll_debug into master ... Reviewed-on: #2179 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-20 13:55:45 +00:00
Carlos Satorres	120419c423	Merge pull request 'refs #6842 remove sage' (!2182) from 6842-fixViewEmpresa into dev ... Reviewed-on: #2182 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-20 13:26:00 +00:00
Carlos Satorres	5a45cf7ea2	refs #6842 remove sage	2024-03-20 13:39:26 +01:00
Alex Moreno	7895a51e33	hotFix(closeAll): fix debug	2024-03-20 12:15:41 +01:00
Guillermo Bonet	a76b7c8535	Merge pull request 'feat: refs #6395 Added buyerFk in buy' (!2020) from 6395-buyBuyerFk into dev ... Reviewed-on: #2020 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-20 09:09:16 +00:00
Guillermo Bonet	cdaa7999d1	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-20 07:55:05 +00:00
Guillermo Bonet	397b49db91	fix: refs #6232 Comment conveyorConfig lines	2024-03-20 08:02:11 +01:00
Guillermo Bonet	b327120932	fix: refs #6232 Comment queueConfig lines	2024-03-20 07:39:38 +01:00
Guillermo Bonet	41a4fa88ea	Merge pull request 'refs #6232 Regularized config tables' (!2170) from 6232-refactorConfigTables into dev ... Reviewed-on: #2170 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-20 06:31:57 +00:00
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Alex Moreno	fcb3a50640	Merge pull request 'hotFix(debug) varchar to text' (!2174) from hotFix_invoiceDebug_text into master ... Reviewed-on: #2174 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-18 12:28:52 +00:00
Alex Moreno	4f90fb06d8	hotFix(debug) varchar to text	2024-03-18 13:25:23 +01:00
Alex Moreno	fbf798e356	Merge pull request 'hotFix: try to debug closeAll' (!2173) from hotFix_invoiceDebug into master ... Reviewed-on: #2173 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-15 14:58:55 +00:00
Alex Moreno	8119106e69	hotFix: try to debug closeAll	2024-03-15 15:40:54 +01:00
Guillermo Bonet	3aa81d27e7	refs #6875 Packing default 1	2024-03-15 14:53:31 +01:00
Javier Segarra	6e045868c3	Merge pull request '#5858 - zoneCollisions' (!1853) from 5858-zone_Collisions into dev ... Reviewed-on: #1853 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-15 12:36:37 +00:00
Javier Segarra	0f4377ff5d	refs #5858 test: fixtures	2024-03-15 13:31:51 +01:00
Guillermo Bonet	5b546079b0	Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables	2024-03-15 12:38:34 +01:00
Guillermo Bonet	0867211573	refs #6403 Fix model mrwConfig	2024-03-15 12:38:33 +01:00
Javier Segarra	950cce22df	Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:23:02 +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
Guillermo Bonet	158ed9b55c	refs #6232 Regularized config tables	2024-03-15 11:49:33 +01:00
Guillermo Bonet	336d5f0fba	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-15 10:48:42 +00:00
Guillermo Bonet	ea054eafd5	Merge branch 'test' into dev	2024-03-15 10:56:11 +01:00
Guillermo Bonet	aa27eb1922	refs #6948 Fix error	2024-03-15 10:55:39 +01:00
Jorge Penadés	5341818473	Merge pull request '#6744 fix worker setPassword' (!2027) from 6744-fixWorkerSetPassword into dev ... Reviewed-on: #2027 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-15 09:48:13 +00: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
Carlos Satorres	779c075102	Merge pull request 'refs #6842 sql mod sage' (!2050) from 6842-sageMod into dev ... Reviewed-on: #2050 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-15 08:45:05 +00:00
Carlos Satorres	1c523d8d22	Merge branch 'dev' into 6842-sageMod	2024-03-15 08:43:41 +00:00
Javier Segarra	275e53f79c	Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!2094) from 6930_scopedToken_Multimedia into dev ... Reviewed-on: #2094 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-15 08:28:05 +00:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Carlos Andrés	160d72e755	hotfix upload invoiceIn_add.sql error	2024-03-14 17:02:07 +01:00
Javier Segarra	a7faf4e325	refs #6930 perf: logout update	2024-03-14 13:05:39 +00:00
Alex Moreno	9c76a5d196	Merge pull request '6960-restricciones-AWB' (!2167) from 6960-restricciones-AWB into test ... Reviewed-on: #2167 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 10:55:06 +00:00
Carlos Andrés	3999533707	Merge branch 'test' into 6960-restricciones-AWB	2024-03-14 11:33:14 +01:00
Carlos Andrés	1e29b6c1ed	merge test	2024-03-14 11:30:07 +01:00
Guillermo Bonet	184a3a3c7a	refs #6395 Requested changes	2024-03-14 10:05:25 +01:00
Guillermo Bonet	166b74c70d	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-14 08:59:22 +00:00
Carlos Satorres	7e37a2b376	Merge pull request '6755-restoreRefactor' (!2158) from 6755-restoreRefactor into dev ... Reviewed-on: #2158 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 08:56:09 +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
Guillermo Bonet	fbeb9b058d	hotfix: itemProposal added optimizer_search_depth	2024-03-14 09:34:37 +01:00