7342 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	aa33e42701	Merge pull request 'fix: refs #7353 sales person filter and locale' (!724) from 7353-hotfix-fixFilter into master ... Reviewed-on: #724 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 07:19:45 +00:00
Jon Elias	07cd9d5aae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-18 08:42:59 +02:00
Jon Elias	98faf22e73	Merge branch 'dev' into 7884-AddLabelerField	2024-09-18 06:24:07 +00:00
Alex Moreno	f1759eca04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk	2024-09-18 08:23:25 +02:00
Jon Elias	3a95cf123e	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-09-18 08:23:18 +02:00
Jon Elias	566d657f70	feat: refs #7884 added default params and chip translations	2024-09-18 08:23:15 +02:00
Alex Moreno	fb1a94604b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-18 08:20:45 +02:00
Jorge Penadés	41c43fde76	feat: refs #7323 hide log section	2024-09-17 16:08:48 +02:00
Jorge Penadés	84cf3bea95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-17 16:02:15 +02:00
Carlos Satorres	4f662375cd	fix(VnTable): sanitizer value is defined	2024-09-17 15:04:58 +02:00
Carlos Satorres	db783e1538	refs #7283 item Descriptor	2024-09-17 15:03:30 +02:00
Carlos Satorres	ae97e32826	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 14:55:48 +02:00
Pablo Natek	6886c18ddc	Merge pull request '7404-stockBought' (!593) from 7404-stockBought into dev ... Reviewed-on: #593 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 11:55:41 +00:00
Javier Segarra	e40f216e33	Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-17 13:48:20 +02:00
Javier Segarra	c7bef79c0a	perf: improve	2024-09-17 13:48:17 +02:00
Pablo Natek	cead2c2b5e	Merge branch 'dev' into 7404-stockBought	2024-09-17 11:40:42 +00:00
Pablo Natek	e559ab43d7	fix: refs #7404 remove some style	2024-09-17 13:40:27 +02:00
Jorge Penadés	47de2caed7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-17 13:26:48 +02:00
Jorge Penadés	eb6f12ae3b	fix: refs #7353 rollback	2024-09-17 12:58:06 +02:00
Jorge Penadés	ed4a4e1e59	fix: refs #7353 rollback	2024-09-17 12:57:43 +02:00
Jorge Penadés	2cb2ce16ef	fix: refs #7353 locale	2024-09-17 12:56:50 +02:00
Jorge Penadés	3f03f0d4e9	fix: refs #7353 show unremovable params	2024-09-17 12:41:57 +02:00
Javier Segarra	29e4c723c9	Merge branch 'dev' into 6943_fix_customer_module	2024-09-17 12:12:41 +02:00
Jorge Penadés	4edcff41f1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixFilter	2024-09-17 11:39:07 +02:00
Jorge Penadés	56f8cbe615	fix: refs #7353 sales person filter and locale	2024-09-17 11:37:44 +02:00
Carlos Satorres	8c91cb42f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 11:11:57 +02:00
Jon Elias	162c7858ff	Merge pull request '#6346 Wagons to VnTable' (!717) from 6346-WagonTypeToCard into dev ... Reviewed-on: #717 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 09:09:50 +00:00
Jon Elias	58cd0b54cf	Merge branch 'dev' into 6346-WagonTypeToCard	2024-09-17 09:08:00 +00:00
Carlos Satorres	3b59dc7fb5	Merge pull request 'hotfix searchbar' (!723) from hotfix-invoiceOutSearchbar into master ... Reviewed-on: #723 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 08:38:28 +00:00
Carlos Satorres	044156356c	hotfix searchbar	2024-09-17 10:37:22 +02:00
Javier Segarra	907e6dbf4f	Merge pull request '#7677 - Improve VnLocation' (!563) from 7677_vnLocation_perf into dev ... Reviewed-on: #563 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 08:29:23 +00:00
Alex Moreno	3d6e9f9600	Merge pull request 'fix(itemDescriptor): fix redirection to itemDiary' (!722) from hotFix_itemDiary_redirect_2 into master ... Reviewed-on: #722 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-17 08:25:36 +00:00
Alex Moreno	3d1bb0c67a	fix(itemDescriptor): fix redirection to itemDiary	2024-09-17 10:20:44 +02:00
Pablo Natek	7faa0c240f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-17 10:10:40 +02:00
Alex Moreno	198c47f0c9	Merge pull request 'fix(itemDescriptor): fix redirection to itemDiary' (!721) from hotFix_itemDiary_redirect into master ... Reviewed-on: #721 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-17 07:37:01 +00:00
Javier Segarra	6dc337e585	Merge branch 'dev' into 6943_fix_customer_module	2024-09-17 07:30:29 +00:00
Javier Segarra	e4adbfa9f7	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 07:29:00 +00:00
Alex Moreno	37b6a03288	fix(itemDescriptor): fix redirection to itemDiary	2024-09-17 09:25:53 +02:00
Jon Elias	6edabd856c	Merge branch 'dev' into 7884-AddLabelerField	2024-09-17 06:32:27 +00:00
Jon Elias	479f2a8e53	feat: refs #7884 added new filter field	2024-09-17 08:31:02 +02:00
Alex Moreno	07010548bf	Merge pull request '7983-testToMaster_2438' (!718) from 7983-testToMaster_2438 into master ... Reviewed-on: #718 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 05:39:38 +00:00
Jorge Penadés	da7d0326c0	fix: refs #7323 workerBalance & arrayData setUserParams	2024-09-16 17:12:48 +02:00
Jorge Penadés	1ff15da8ca	fix: refs #7323 workerList	2024-09-16 16:33:09 +02:00
Alex Moreno	dc047435f5	chore: changelog	2024-09-16 15:17:31 +02:00
Alex Moreno	09cdd2f7e7	chore: changelog	2024-09-16 15:17:05 +02:00
Carlos Satorres	1916c6e4bf	refs #7283 itemFilters	2024-09-16 14:29:39 +02:00
Alex Moreno	b4cee6b02f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-16 14:24:22 +02:00
Javier Segarra	af4756d810	Merge pull request '#7017 Show FormModel Validations' (!469) from 7017_formModel_validations into dev ... Reviewed-on: #469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-16 12:11:52 +00:00
Javier Segarra	603fb1de71	Merge branch 'dev' into 7017_formModel_validations	2024-09-16 11:58:15 +00:00
Javier Segarra	cf95cd7db7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-16 13:33:28 +02:00