24791 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +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
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
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
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
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	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
Sergio De la torre	06b7d56837	fix: refs #6861 assignCollection&isOnReservationMode	2024-10-14 13:01:30 +02:00
Jorge Penadés	b39a749bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 08:37:58 +02:00
Alex Moreno	d8e0c1debe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 07:27:19 +02:00
Jorge Penadés	295c31a5f0	feat: refs #7874 add finance obs type	2024-10-10 11:01:25 +02:00
Jorge Penadés	2b17e6da4c	Merge branch 'dev' into 7874-createObservationType	2024-10-10 08:16:29 +00:00
Jorge Penadés	9a7aa315e5	Merge pull request 'feat: refs #7207 show queue in worker summary' (!3007) from 7207-showPbx into dev ... Reviewed-on: #3007 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-10 07:20:17 +00:00
Jorge Penadés	f5a43962fd	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:06 +00:00
Pako Natek	714e34e450	Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3090) from 8075-master-itemShelvingMoving into master ... Reviewed-on: #3090 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-10 06:44:00 +00:00
Pako Natek	3347cde109	Merge branch 'master' into 8075-master-itemShelvingMoving	2024-10-10 06:33:13 +00:00
Pako Natek	32c01f22d5	Merge pull request '8069-hotFix-oversTocking' (!3088) from 8069-hotFix-oversTocking into master ... Reviewed-on: #3088 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-10 06:25:20 +00:00
Pako Natek	208869bd30	fix: refs #8069 removed obsolete variables	2024-10-10 08:20:41 +02:00
Pako Natek	209e65180e	Merge pull request 'feat: refs #8075 itemShelvingMoving' (!3089) from 8075-test-itemShelvingMoving into test ... Reviewed-on: #3089 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-10-10 05:36:06 +00:00
Pako Natek	4eab12dd04	fix: refs #8069 throw message in spanish	2024-10-09 07:41:43 +02:00
Pako Natek	679773b33e	feat: refs #8075 itemShelvingMoving	2024-10-09 07:26:22 +02:00
Pako Natek	5eda0af20f	feat: refs #8075 itemShelvingMoving	2024-10-09 07:24:34 +02:00
Pako Natek	f0ac12d52e	Merge branch 'master' into 8069-hotFix-oversTocking	2024-10-09 05:21:02 +00:00
Alex Moreno	040304d04f	fix: merge	2024-10-08 17:10:19 +02:00
Alex Moreno	0c6541372e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-08 17:09:26 +02:00
Alex Moreno	087818e39d	Merge pull request 'fix(closeAll): not use transaction' (!3087) from hotFix_closure_withoutTransaction into master ... Reviewed-on: #3087 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-08 15:08:52 +00:00
Alex Moreno	3cf7591206	fix(closeAll): not use transaction	2024-10-08 17:03:27 +02:00
Carlos Andrés	d497ffc781	Actualizar modules/ticket/back/methods/ticket/closure.js	2024-10-08 13:32:57 +00:00
Alex Moreno	02adc6473a	fix: duplicate variable	2024-10-08 12:22:47 +02:00