5716 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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	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
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
Alex Moreno	070f0da757	Merge branch 'dev' into 7547-accessToken-security	2024-09-09 10:55:22 +00:00
Carlos Satorres	9be8accb27	Merge pull request '#7283 - fixItemDescriptor' (!680) from 7283-fixItemDescriptor into dev ... Reviewed-on: #680 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-09 10:40:41 +00:00
Carlos Satorres	15a764d1cf	refs #7283 fix	2024-09-09 12:35:47 +02:00
Carlos Satorres	49071e52ef	Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor	2024-09-09 12:35:39 +02:00
Carlos Satorres	92afbc5c86	Merge branch 'dev' into 7283-fixItemDescriptor	2024-09-09 10:06:10 +00:00
Carlos Satorres	6c78fb1bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor	2024-09-09 12:06:01 +02:00
Carlos Satorres	3004d77d34	refs #7283 fix ItemDescriptor warehouse	2024-09-09 12:05:08 +02:00
Jon Elias	6a96b252b4	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-09 07:47:40 +00:00
Jon Elias	2bd80b2ee7	perf: refs #7889 perf shortcut test	2024-09-09 09:45:30 +02:00
Jorge Penadés	b4ef1e297a	Merge pull request 'refactor: refs #7323 drop useless code' (!687) from 7323-fixWorkerDescritor into dev ... Reviewed-on: #687 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 07:05:08 +00:00
Jon Elias	de08ae81a3	Merge branch '7889-KeyShortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889-KeyShortcuts	2024-09-09 08:47:47 +02:00
Jon Elias	ba7497f055	fix: refs #7889 fixed shortcut test	2024-09-09 08:47:44 +02:00
Jon Elias	459551b16e	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-09 05:30:14 +00:00
Javier Segarra	6de4d5f123	Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-08 12:56:47 +02:00
Javier Segarra	53e6c67ff9	perf: minor clean code	2024-09-08 12:56:40 +02:00
Javier Segarra	754f047943	perf: order components	2024-09-07 21:55:08 +02:00
Javier Segarra	0c1cd47d38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-07 16:38:06 +02:00
Jorge Penadés	18c952c0fc	refactor: refs #7323 drop useless code	2024-09-06 17:51:13 +02:00
Javier Segarra	a5bbc4c9d2	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-06 13:04:14 +00:00
Carlos Satorres	27f25f611f	refs #7283 fix ItemDescriptor warehouse	2024-09-06 14:57:10 +02:00
Javier Segarra	3276548f88	fix: editTableOptions	2024-09-06 14:47:29 +02:00
Javier Segarra	31b8088b5f	perf: improve ItemFixedPricefilterPanel	2024-09-06 14:41:38 +02:00
Javier Segarra	a8057b47dc	feat: updates	2024-09-06 14:06:30 +02:00
Jorge Penadés	1f8ebf0127	Merge pull request 'chore: refs #7323 worker changes' (!681) from 7323-fetchFromScope into dev ... Reviewed-on: #681 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-06 12:03:24 +00:00
Jorge Penadés	635cc94652	Merge branch 'dev' into 7323-fetchFromScope	2024-09-06 12:01:24 +00:00