5725 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	f02ca7437c	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 10:27:12 +00:00
Jorge Penadés	aa5ef76dcf	Merge pull request '#7663 ticket setWeight' (!612) from 7663-setWeight into dev ... Reviewed-on: #612 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 07:42:17 +00:00
Jorge Penadés	2d5602e784	Merge branch 'dev' into 7663-setWeight	2024-09-11 07:40:36 +00:00
Alex Moreno	3781ee97cb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-11 08:33:32 +02:00
Alex Moreno	97da106522	hotFix: keyBinding toUpperCase if is null	2024-09-11 08:33:25 +02:00
Alex Moreno	e7fb6a7963	hotFix: keyBinding toUpperCase if is null	2024-09-11 08:32:59 +02:00
Javier Segarra	a0eea16c35	Merge pull request '#5938 Fix & Fine Advance Tickets' (!690) from 5938_fine_ticketAdvance into dev ... Reviewed-on: #690 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 06:30:11 +00:00
Javier Segarra	b2535dedcf	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-11 06:29:27 +00:00
Jorge Penadés	a8d4457365	Merge pull request '#4074 useAcls' (!584) from 4074-useAcls into dev ... Reviewed-on: #584 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-10 11:50:43 +00:00
Jorge Penadés	05c91e2a29	Merge branch 'dev' into 4074-useAcls	2024-09-10 11:45:15 +00:00
Javier Segarra	113ebd23a6	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 09:49:23 +00:00
Alex Moreno	6d017d8c99	build: init version 2440	2024-09-10 10:33:55 +02:00
Alex Moreno	1094daf530	Merge pull request '7953-devToTest_2438' (!693) from 7953-devToTest_2438 into test ... Reviewed-on: #693 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-10 08:31:28 +00:00
Jorge Penadés	5cc1d0cec4	chore: refs #7663 drop useless code	2024-09-10 10:04:40 +02:00
Jorge Penadés	f9adc49284	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-10 09:41:34 +02:00
Jorge Penadés	3fafb15eb8	refactor: refs #4074 use fn	2024-09-10 09:18:57 +02:00
Jorge Penadés	f7975069d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-10 08:59:01 +02:00
Alex Moreno	3164209bef	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-10 08:13:56 +02:00
Alex Moreno	cc6e898830	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-10 08:11:25 +02:00
Javier Segarra	f4f8e83fea	Merge pull request '#7671 - Fix minor bugs ItemFixedPrices' (!692) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #692 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-10 05:19:47 +00:00
Javier Segarra	d347a81d74	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-10 05:19:02 +00:00
Jon Elias	24426c5d38	Merge pull request 'feat: refs #7889 added shortcuts to modules' (!682) from 7889-KeyShortcuts into dev ... Reviewed-on: #682 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-10 04:46:52 +00:00
Jon Elias	4786a0e277	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-10 04:45:24 +00:00
Javier Segarra	7e74123459	Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-10 00:18:12 +02:00
Javier Segarra	d734674eb6	fix: minor changes	2024-09-10 00:18:09 +02:00
Javier Segarra	b4b65ad0fd	fix: minor error whit dates	2024-09-10 00:17:59 +02:00
Javier Segarra	41939315be	style: show subName value	2024-09-10 00:17:39 +02:00
Javier Segarra	9c86fd0ed5	perf: order by	2024-09-10 00:17:13 +02:00
Javier Segarra	7358dab1d0	fix: call upsert when crudModel haschanges	2024-09-10 00:16:01 +02:00
Jorge Penadés	f3471fe5ab	fix: refs #4074 await to watch	2024-09-09 17:20:16 +02:00
Jorge Penadés	f8cbb0a762	chore: refs #4074 fix tests	2024-09-09 17:10:35 +02:00
Jorge Penadés	04aa96b798	chore: refs #4074 fix tests	2024-09-09 17:01:36 +02:00
Jorge Penadés	26c7dfde35	chore: refs #4074 fix tests	2024-09-09 16:44:43 +02:00
Javier Segarra	67b2cd3a0b	feat: stateGroupedFilter	2024-09-09 14:58:26 +02:00
Javier Segarra	eed844aeb5	Merge pull request '#7671 - ItemFixedPrices dense rows' (!527) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #527 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 12:33:11 +00:00
Javier Segarra	b3f305a3fd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:17:59 +00:00
Jorge Penadés	bd00f86d74	chore: refs #4074 fix tests	2024-09-09 14:09:29 +02:00
Jorge Penadés	ee62f85250	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-09 13:59:13 +02:00
Jorge Penadés	7fe5923ee2	Merge pull request 'fix: refs #7909 add originFk' (!691) from 7909-hotfix-rollbackScroll into master ... Reviewed-on: #691 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 11:44:40 +00:00
Jorge Penadés	ac421344d0	fix: refs #7909 add originFk	2024-09-09 13:41:04 +02:00
Jorge Penadés	28b4bac761	Merge branch '7909-hotfix-rollbackScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-rollbackScroll	2024-09-09 13:38:51 +02:00
Jorge Penadés	803c02b80d	fix: refs #7909 rollback scroll	2024-09-09 13:38:27 +02:00
Javi Gallego	7c22a5d0ac	feat: fix refund parameters	2024-09-09 13:18:51 +02:00
Jorge Penadés	9506ed695b	fix: refs #7909 rollback scroll	2024-09-09 13:17:38 +02:00
Javier Segarra	52d8ff8ae2	fix: isFullMovable checkbox	2024-09-09 13:15:45 +02:00
Javier Segarra	7bc288ad71	fix: state cell	2024-09-09 13:15:37 +02:00
Jorge Penadés	132501e4a4	Merge pull request 'feat: refs #7909 add scroll' (!659) from 7909-hotfix-addScroll into master ... Reviewed-on: #659 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 11:11:26 +00:00
Alex Moreno	9e94cb2d36	Merge pull request 'feat(AccountConnections): use VnToken' (!471) from 7547-accessToken-security into dev ... Reviewed-on: #471 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-09 11:05:07 +00:00
Jorge Penadés	6f2018271e	Merge branch '7909-hotfix-addScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll	2024-09-09 13:04:11 +02:00
Jorge Penadés	5ce3ef8bea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll	2024-09-09 13:03:39 +02:00