23519 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Jorge Penadés	c1018d465a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 11:01:59 +01: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
Jon Elias	67c572f187	fixed dropped test	2024-03-15 10:48:24 +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	a38f93b0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 10:44:37 +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	690d935429	refactor: refs #6951 cloneAll	2024-03-15 10:00:24 +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
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	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
Jorge Penadés	4c6def5a52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked	2024-03-14 16:26:24 +01:00
Jon Elias	c6f7a8bdb0	refactor: #6556 drop useless test	2024-03-14 15:49:36 +01:00
Jon Elias	82001d8352	Merge branch 'dev' into 6556-ChangeImages	2024-03-14 14:11:06 +00:00
Jon Elias	d8a5bf8c84	style: #6556 set default user image, set users image	2024-03-14 15:04:35 +01:00
Javier Segarra	a7faf4e325	refs #6930 perf: logout update	2024-03-14 13:05:39 +00:00
Jorge Penadés	d7115e40c1	feat: refs #6492 dropping vn2008 procedures	2024-03-14 12:10:08 +01: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
Jorge Penadés	46b7acb52a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 11:54:35 +01:00
Jorge Penadés	ff130b773d	fix: refs #6492 drop useless insert	2024-03-14 11:49:21 +01:00
Robert Ferrús	0f57931b3a	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 10:43:14 +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
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00: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
Sergio De la torre	06b33fc59d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 09:50:07 +01:00
Jorge Penadés	3e458281e6	fix: refs #6492 boxes alias	2024-03-14 09:42:54 +01:00
Guillermo Bonet	fbeb9b058d	hotfix: itemProposal added optimizer_search_depth	2024-03-14 09:34:37 +01:00
Guillermo Bonet	ad7b7be661	refs #6875 Fix version	2024-03-14 09:15:19 +01:00
Alex Moreno	4ad562a4da	fix: refs #6925 transalation	2024-03-14 09:12:19 +01:00
Jorge Penadés	7a94ae3551	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 09:10:44 +01:00
Alex Moreno	fbfc3eaa75	Merge pull request 'fix: refs #6925 refund invoice transaltions' (!2155) from 6925-fix_translations into dev ... Reviewed-on: #2155 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:10:29 +00:00
Guillermo Bonet	08359cdfe0	Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev ... Reviewed-on: #2047 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:05:11 +00:00
Alex Moreno	974c95b961	Merge branch 'dev' into 6925-fix_translations	2024-03-14 08:00:29 +00:00
Alex Moreno	a13299d66a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-14 08:40:26 +01:00
Alex Moreno	a00e363fd5	refs #7033 deploy: init version 2414	2024-03-14 08:40:25 +01:00
Alex Moreno	cb299617cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-14 08:38:52 +01:00