24932 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	a989bef78c	Merge pull request 'master' (!3108) from master into test ... Reviewed-on: #3108 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-16 06:16:36 +00:00
Sergio De la torre	15622a3e68	Merge pull request 'fix: refs #6861 getTickets' (!3106) from 6861-itemShelvingSaleTickets into master ... Reviewed-on: #3106 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-16 05:58:52 +00:00
Sergio De la torre	12abca0a2d	fix: refs #6861 getTickets	2024-10-15 18:12:07 +02:00
Jorge Penadés	d57f4fc44a	chore: refs #7919 refactor, drop relation on back	2024-10-15 17:24:14 +02:00
Sergio De la torre	2adc424ccb	fix: refs #6861 getTickets	2024-10-15 17:07:35 +02:00
Jorge Penadés	6f8a005726	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-15 17:01:29 +02:00
Sergio De la torre	b592ccc162	fix: refs #6861 getTickets	2024-10-15 17:01:09 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Carlos Satorres	099fe8f950	fix: refs #7986 fix model	2024-10-15 14:42:35 +02:00
Guillermo Bonet	5a2058865d	Merge branch 'test' into dev	2024-10-15 14:02:39 +02:00
Ivan Mas	6cb8bea783	Merge pull request 'feat: refs #7994 update sale.originalQuantity' (!3104) from 7994-sale.originalQuantity into test ... Reviewed-on: #3104 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-15 12:01:02 +00:00
Ivan Mas	536c2fa5b5	feat: refs #7994 update sale.originalQuantity	2024-10-15 13:54:02 +02:00
Robert Ferrús	8da005f08a	feat: refs #8108 refs #9108	2024-10-15 11:19:08 +02:00
Robert Ferrús	da55fffef0	feat: refs #8108 addMoreTablesTag	2024-10-15 11:18:04 +02:00
Alex Moreno	b1b36a33a0	chore(docuware_core): refs #8066 add returns	2024-10-15 09:47:39 +02:00
Carlos Satorres	c73fd51a9c	fix: refs #7986 add acl	2024-10-15 09:45:14 +02:00
Alex Moreno	85f8b6fd20	build: init version 24.44	2024-10-15 09:29:38 +02:00
Alex Moreno	6eab66340f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 09:21:31 +02:00
Javi Gallego	36bf2f89c7	Merge pull request '8098-closureTransation' (!3101) from 8098-closureTransation into dev ... Reviewed-on: #3101 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-15 07:20:06 +00:00
Alex Moreno	cf78a12f3a	fix(sql): addClientObservationType	2024-10-15 09:18:20 +02:00
Alex Moreno	8ff06d63c5	fix(sql): addClientObservationType	2024-10-15 09:16:07 +02:00
Jon Elias	e334152acc	refactor: deleted comment	2024-10-15 09:03:15 +02:00
Alex Moreno	a2b9a59eb5	fix(sql): addClientObservationType	2024-10-15 08:58:57 +02:00
Alex Moreno	f61c2fa083	Merge pull request '8093-devToTest_2442_3' (!3100) from 8093-devToTest_2442_3 into test ... Reviewed-on: #3100 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-15 06:51:41 +00:00
Robert Ferrús	52e573501a	feat: refs #8108 create tables itemTag	2024-10-15 08:46:43 +02:00
Javi Gallego	c5f987d04c	fix: refs #8098 renew token test fixed	2024-10-15 08:44:08 +02:00
Javi Gallego	976e50b566	feat: refs #8098 identation	2024-10-15 08:25:53 +02:00
Javi Gallego	4526873bbe	feat: refs #8098 without Date	2024-10-15 08:24:13 +02:00
Javi Gallego	5e2edad6de	Merge branch 'dev' into 8098-closureTransation	2024-10-15 08:21:40 +02:00
Alex Moreno	63f062a069	fix(renewToken): refs #8093 test & fix(sql) addClientObservationType	2024-10-15 08:19:35 +02:00
Javi Gallego	f2d1aa5f16	feat: refs #8098 closureDaysAgo	2024-10-15 08:17:03 +02:00
Alex Moreno	5b938a6f78	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 08:00:39 +02:00
Alex Moreno	3c881d5e48	refactor(docuware): refs #8066 use Authorization	2024-10-15 08:00:19 +02:00
Sergio De la torre	f27566ac0f	Merge pull request 'master' (!3098) from master into test ... Reviewed-on: #3098 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-15 05:18:30 +00:00
Sergio De la torre	5e94d95ea3	Merge pull request 'fix: refs #6861 assignCollection' (!3083) from 6861-ItemShelvingSaleReserve into master ... Reviewed-on: #3083 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-15 05:00:26 +00:00
Jorge Penadés	6d4c71d465	feat: refs #7919 test	2024-10-14 17:14:40 +02:00
Jorge Penadés	a35208d903	feat: refs #7919 test	2024-10-14 17:14:01 +02:00
Jorge Penadés	ccf9dbde8e	feat: refs #7919 test	2024-10-14 17:11:12 +02:00
Jorge Penadés	32756dabae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-14 16:49:11 +02:00
Jorge Penadés	48e4c68561	Merge pull request '#7874 clientObservationType' (!2960) from 7874-createObservationType into dev ... Reviewed-on: #2960 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-14 14:16:40 +00:00
Sergio De la torre	13c7b34c98	Merge branch 'master' into 6861-ItemShelvingSaleReserve	2024-10-14 14:15:51 +00:00
Jorge Penadés	0549e22720	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 15:38:30 +02:00
Jorge Penadés	d02e942dd2	Merge pull request 'feat: refs #7323 show right error' (!3096) from 7323-showRightError into dev ... Reviewed-on: #3096 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 13:31:59 +00:00
Jorge Penadés	cedb1b570d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-showRightError	2024-10-14 14:42:37 +02:00
Jorge Penadés	f3b5a70b67	feat: refs #7323 show right error	2024-10-14 14:41:25 +02:00
Alex Moreno	e0b252e6bb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 14:12:16 +02:00
Alex Moreno	0063591089	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-14 14:11:57 +02:00
Carlos Satorres	68469e2ba8	Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto	2024-10-14 13:52:08 +02:00
Jon Elias	07849ebeb8	fix: myTeam param	2024-10-14 13:25:09 +02:00
Sergio De la torre	06b7d56837	fix: refs #6861 assignCollection&isOnReservationMode	2024-10-14 13:01:30 +02:00