6600 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	0c1114e89e	Merge pull request '6156 i18n' (!742) from 6156_i18n into dev ... Reviewed-on: #742 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 12:22:17 +00:00
Javier Segarra	ac8aa6bcc1	fix: table order	2024-09-23 14:21:41 +02:00
Javier Segarra	e651b7ad82	Merge branch 'dev' into 6156_i18n	2024-09-23 12:07:05 +00:00
Jon Elias	4fc3f08f77	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 11:52:31 +00:00
Jon Elias	b728b7c5bd	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-23 13:51:22 +02:00
Jon Elias	3716507f93	perf: refs #7553 removeSales function	2024-09-23 13:51:20 +02:00
Alex Moreno	d3b45af7e5	Merge pull request 'fix: VnLocation test' (!744) from fix_test_vnLocation into dev ... Reviewed-on: #744 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:45:24 +00:00
Robert Ferrús	d13cab0a24	Merge pull request 'feat: refs #8000 add column into zoneBasicData' (!741) from 8000-zoneBasicDataAddcolumn into master ... Reviewed-on: #741 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:43:14 +00:00
Javier Segarra	0829b6d0d2	fix: i18n en preparation label	2024-09-23 11:42:47 +00:00
Javier Segarra	6a8ed89a71	fix: VnLocation test	2024-09-23 11:41:30 +00:00
Pablo Natek	b04564d5a8	fix: refs #7404 style non center pop up	2024-09-23 13:23:25 +02:00
Pablo Natek	e700f6f4a8	feat: refs #7404 style dynamic text color	2024-09-23 13:14:25 +02:00
Jorge Penadés	f809e0fb31	fix: refs #7323 show prev month week color	2024-09-23 12:55:39 +02:00
Javier Segarra	279a100f8b	fix: i18n en preparation label	2024-09-23 10:25:44 +00:00
Javier Segarra	a52cdf8f94	fix: i18n en preparation label	2024-09-23 10:25:11 +00:00
Robert Ferrús	5ebbb1cf73	feat: refs #8000 fix	2024-09-23 12:24:19 +02:00
Robert Ferrús	1ae20202cc	feat: refs #8000 add column into zoneBasicData	2024-09-23 11:56:20 +02:00
Javier Segarra	7713e33c67	Merge branch 'dev' into 8018_location_label	2024-09-23 09:48:19 +00:00
Javier Segarra	013a76cbce	test: VnLocation	2024-09-23 11:48:00 +02:00
Javier Segarra	f06723a919	test: VnLocation	2024-09-23 11:39:10 +02:00
Jorge Penadés	7bbad14f53	feat: refs #7323 delete btn	2024-09-23 11:38:27 +02:00
Alex Moreno	29cc14673a	warmFix: e2e claimDevelopment	2024-09-23 11:15:17 +02:00
Alex Moreno	951b8fc1fa	warmFix: e2e claimDevelopment	2024-09-23 11:15:11 +02:00
Javier Segarra	66cb069109	perf: CustomerBalance	2024-09-23 11:06:08 +02:00
Javier Segarra	88fd40eae6	feat: minor changes	2024-09-23 11:05:58 +02:00
Jon Elias	0dd79ed708	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 08:22:21 +00:00
Jon Elias	f025b4361e	refactor: refs #7553 last requested changes	2024-09-23 10:21:30 +02:00
Pablo Natek	17bb144bce	fix: refs #7404 translates and some minor style fixes	2024-09-23 10:04:45 +02:00
Javier Segarra	8bbea9c903	feat: change order	2024-09-23 09:47:54 +02:00
Jorge Penadés	37545b4cab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-23 09:29:26 +02:00
Jon Elias	4c071aea8b	Merge branch 'dev' into 7884-AddLabelerField	2024-09-23 06:51:07 +00:00
Javier Segarra	2a97f35dd9	Merge branch 'dev' into 6943_fix_customer_module	2024-09-21 01:32:45 +02:00
Javier Segarra	d81d562edf	feat: goToSupplier	2024-09-21 01:30:37 +02:00
Javier Segarra	f5c50e842e	Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-21 01:22:30 +02:00
Javier Segarra	f84444d894	feat: add tooltip CustomerNewCustomAgent	2024-09-21 01:22:25 +02:00
Jorge Penadés	6cc8ca6731	chore: refs #7702 add tests	2024-09-20 17:38:02 +02:00
Jorge Penadés	fc23f9a8dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-09-20 16:22:48 +02:00
Jorge Penadés	e8beebff32	Merge pull request 'fix: refs #7353 horizontal scroll' (!735) from 7353-hotfix-fixUI into master ... Reviewed-on: #735 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-20 13:49:03 +00:00
Jorge Penadés	df56eefe2f	fix: refs #7353 fine tunning ui	2024-09-20 15:46:54 +02:00
Jorge Penadés	cf11573713	Merge pull request 'feat: hide menus on small view' (!739) from hideMenu into dev ... Reviewed-on: #739 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-20 13:05:47 +00:00
Jon Elias	edea17340d	refactor: refs #7553 adjust ticket notes view in summary	2024-09-20 14:33:59 +02:00
Jorge Penadés	deff8a1cf4	feat: hide menus on small view	2024-09-20 13:58:26 +02:00
Javier Segarra	ddf42d9659	feat: update VnLocation instances	2024-09-20 13:46:07 +02:00
Javier Segarra	b822c7722b	feat: formatLocation when field is null	2024-09-20 13:45:43 +02:00
Jorge Penadés	6216eedd88	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixUI	2024-09-20 13:22:30 +02:00
Jorge Penadés	7a253d314c	chore: refs #7353 drop useless code	2024-09-20 13:22:15 +02:00
Jorge Penadés	3e101242f6	chore: refs #7353 drop useless code	2024-09-20 13:20:40 +02:00
Jorge Penadés	87efc2f355	fix: refs #7353 responsive filters	2024-09-20 13:00:34 +02:00
Jorge Penadés	e1f3589110	fix: refs #7353 horizontal scroll	2024-09-20 12:17:10 +02:00
Javier Segarra	271e33a999	feat: formatLocation when field is null	2024-09-20 11:57:15 +02:00