7360 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	d00a88a3f4	refactor: refs #7500 deleted useless code	2024-09-12 12:34:54 +02:00
Jon Elias	be389c6736	Merge branch 'dev' into 7500_ChangeEntryDms	2024-09-12 10:32:47 +00:00
Jon Elias	35247007f0	Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-12 12:31:03 +02:00
Jon Elias	e5056c45c0	fix: refs #7500 fixed showing images wrongly	2024-09-12 12:31:00 +02:00
Javier Segarra	058039fd61	Merge branch 'dev' into 5938_filterGrouped	2024-09-12 10:27:36 +00:00
Javier Segarra	856d551503	Merge pull request 'Fix Call back when hasMoreData' (!707) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #707 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-12 10:13:57 +00:00
Javier Segarra	29bd3f0516	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-12 10:12:31 +00:00
Javier Segarra	a3afe790b9	fix: CustomerGreuges	2024-09-12 12:00:07 +02:00
Javier Segarra	c22f8f1069	fix: stop call back event hasMoreData	2024-09-12 09:57:31 +00:00
Javier Segarra	c7adb91912	feat: use disableInifiniteScroll property	2024-09-12 09:56:37 +00:00
Carlos Satorres	050d8ae208	refs #7283 fix items error get images	2024-09-12 11:43:37 +02:00
Carlos Satorres	68a2ac385f	refs #7283 fix items images	2024-09-12 11:36:02 +02:00
Javier Segarra	3892df250c	fix: #5938 grouped filter	2024-09-12 08:53:46 +00:00
Javier Segarra	25b7569791	Merge pull request 'FIX InfiniteScroll when use VnTable' (!704) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #704 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-12 08:22:25 +00:00
Jon Elias	4a1f5e922c	refactor: refs #7553 align ticket sale qdrawer fields	2024-09-12 10:19:21 +02:00
Jon Elias	6a5f31ff1e	fix: refs #7553 fixed conflicts	2024-09-12 10:14:38 +02:00
Javier Segarra	9941975683	fix: infiniteScroll	2024-09-12 08:07:53 +00:00
Alex Moreno	ccbd6fad19	Merge pull request 'fix(ClaimList): attenderFk filter' (!700) from hotFix_claimList_attenderFk into master ... Reviewed-on: #700 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-12 08:04:04 +00:00
Alex Moreno	368e013f54	Merge branch 'master' into hotFix_claimList_attenderFk	2024-09-12 07:59:16 +00:00
Jorge Penadés	1dffa8865e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls	2024-09-12 09:55:30 +02:00
Jorge Penadés	e10ab5863a	Merge pull request 'fix: refs #7323 show user name' (!701) from 7323-hotfix-showUserName into master ... Reviewed-on: #701 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-12 07:44:15 +00:00
Jorge Penadés	59f6913a74	fix: refs #7323 add correct label	2024-09-12 09:43:08 +02:00
Jorge Penadés	d92659289b	fix: refs #7323 add correct label	2024-09-12 09:41:29 +02:00
Jorge Penadés	22bc8f2414	fix: refs #7323 show user name	2024-09-12 09:33:06 +02:00
Carlos Satorres	039a8d1d02	refs #7283 fix items	2024-09-12 09:32:41 +02:00
Alex Moreno	9d055a48c4	Merge branch 'dev' into 7792-accountBasicData_twoFactorFk	2024-09-12 07:29:47 +00:00
Jorge Penadés	6b79d70551	refactor: refs #7828 wip	2024-09-12 09:14:55 +02:00
Alex Moreno	d822bb6f20	fix(ClaimList): attenderFk filter	2024-09-12 09:12:36 +02:00
Pablo Natek	e2dbe0fd38	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-12 09:09:21 +02:00
Alex Moreno	4a234dd875	fix: duplicate code	2024-09-12 08:31:57 +02:00
Alex Moreno	8bf7b729d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-12 08:26:10 +02:00
Alex Moreno	8d04d50a13	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-12 08:26:01 +02:00
Carlos Satorres	b66e66eb0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:44:35 +02:00
Carlos Satorres	04c8481b51	refs #7283 fix itemFixed	2024-09-12 07:43:12 +02:00
Carlos Satorres	04070a5a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:42:55 +02:00
Javier Segarra	233841ad16	Merge pull request '#6943 - FIX Customer module' (!628) from 6943_fix_customerSummaryTable into dev ... Reviewed-on: #628 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-12 05:28:18 +00:00
Jon Elias	05f770e469	Merge pull request '#7903 Warmfix: fixed ticket's search bar and keybinding tooltip' (!699) from 7903-WarmfixTicketSearchbar into test ... Reviewed-on: #699 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-12 04:41:21 +00:00
Jon Elias	18fc5e241c	fix: refs #7903 fixed ticket's search bar and keybinding tooltip	2024-09-11 14:07:31 +02:00
Javier Segarra	8d96539b24	perf: solve reload CardSummary component	2024-09-11 13:18:54 +02:00
Javier Segarra	c3108b4335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-11 12:48:38 +02:00
Javier Segarra	d072a11c1b	Merge pull request 'refs #6156 new field' (!688) from 6156-advanceTicketsNewField into dev ... Reviewed-on: #688 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 10:34:47 +00:00
Javier Segarra	f02ca7437c	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 10:27:12 +00:00
Carlos Satorres	98056b2bcb	Merge pull request 'refs #7962 fix claimSummary' (!698) from 7962-hotfixClaimLines into master ... Reviewed-on: #698 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 09:34:32 +00:00
Jorge Penadés	9219fa07f5	fix: refs #7353 hide search param	2024-09-11 11:23:14 +02:00
Jon Elias	422907447b	refactor: refs #7553 merge conflicts	2024-09-11 10:27:08 +02:00
Jon Elias	d1138529b2	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-11 10:26:52 +02:00
Carlos Satorres	1c9e13fe15	refs #7962 fix claimSummary	2024-09-11 10:23:27 +02:00
Jorge Penadés	b559f2f18c	refactor: refs #7353 use global locales	2024-09-11 10:18:11 +02:00
Jon Elias	ff7bcfb00a	refactor: refs #7553 modified ticket sale to create a row in the table	2024-09-11 10:16:42 +02:00
Jorge Penadés	2b012d2de4	fix: refs #7353 use same datakey	2024-09-11 10:04:40 +02:00