20290 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
Alex Moreno	0b459f4726	Merge pull request 'refs #7033 deploy(2412): dev to test' (!2166) from 7033-devToTest_2412 into test ... Reviewed-on: #2166 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-14 07:37:54 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Carlos Satorres	e7d5d59fa6	Merge pull request 'refs #6913 routeKm' (!2156) from 6913-routeKm into dev ... Reviewed-on: #2156 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 07:33:57 +00:00
Carlos Satorres	24c1ab541d	Merge branch 'dev' into 6913-routeKm	2024-03-14 07:31:31 +00:00
Carlos Satorres	7895f12e3d	Merge branch 'dev' into 6842-sageMod	2024-03-14 07:28:12 +00:00
Alex Moreno	977181f156	Merge branch 'dev' into 6925-fix_translations	2024-03-14 07:27:16 +00:00
Carlos Satorres	2d8f5f5f50	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-14 08:26:52 +01:00
Carlos Satorres	e24eed16c1	refs #6842 fix companyCode	2024-03-14 08:26:50 +01:00
Alex Moreno	346557ed69	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-14 08:20:15 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Guillermo Bonet	4b83d416b2	Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev ... Reviewed-on: #2157 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-14 06:03:32 +00:00
Sergio De la torre	1a2bda7e18	Merge pull request '6078_workerActivty' (!2130) from 6078_workerActivty into dev ... Reviewed-on: #2130 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 05:58:13 +00:00
Carlos Satorres	33bd21d40b	refs #6755 fix model	2024-03-13 16:29:05 +01:00
Javier Segarra	f18e90d6f3	Merge branch 'dev' into 5858-zone_Collisions	2024-03-13 14:45:12 +00:00
Javier Segarra	f09283b9c9	refs #5858 perf: html	2024-03-13 15:44:16 +01:00
Javier Segarra	4012b1756d	refs #5858 add comment	2024-03-13 15:00:12 +01:00
Juan Ferrer	07f96a864d	Merge branch 'dev' into 6925-fix_translations	2024-03-13 13:22:41 +00:00
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Pako Natek	67b55ae845	fixtures local	2024-03-13 14:16:27 +01:00
Pako Natek	25f979156a	nuevo url para catalogue y sliders_get	2024-03-13 14:00:59 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Satorres	41fbae7eec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-13 13:37:38 +01:00
Sergio De la torre	b4fe00a028	Merge branch 'dev' into 6078_workerActivty	2024-03-13 11:36:59 +00:00
Javier Segarra	172e7566b5	refs #5858 perf: improve insert	2024-03-13 11:58:25 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Carlos Satorres	92cf8fc5e1	refs #6755 remove console	2024-03-13 11:46:43 +01:00
Carlos Satorres	f79d1320d8	Merge branch 'dev' into 6842-sageMod	2024-03-13 10:29:07 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00