5750 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	a8c96278de	Merge branch 'master' into hotfix_itemFixedPrice	2024-09-25 21:04:13 +00:00
Jorge Penadés	0dec6edc68	Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master ... Reviewed-on: #757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:48:16 +00:00
Jorge Penadés	aab428494e	fix: refs #6898 add role	2024-09-25 12:40:22 +02:00
Javier Segarra	53d5d123c2	feat: i18n	2024-09-25 11:36:44 +02:00
Javier Segarra	fb180f0198	fix: apply order	2024-09-25 11:31:05 +02:00
Javier Segarra	77ad96a58b	fix: itemfixedPrice inputs	2024-09-25 11:30:18 +02: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
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
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	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
Jorge Penadés	ac6d98cd36	fix: refs #7353 horizontal scroll	2024-09-20 11:22:51 +02:00
Jorge Penadés	26f34619c0	Merge pull request 'fix: refs #7524 dynamic fetch' (!734) from 7524-hotfix-tooManyRecords into master ... Reviewed-on: #734 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-20 09:00:07 +00:00
Jorge Penadés	b2cc74d890	fix: refs #7524 use id	2024-09-20 10:27:24 +02:00
Jorge Penadés	075c129036	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-tooManyRecords	2024-09-20 10:05:44 +02:00
Jorge Penadés	3b709c20cf	fix: refs #7524 use id	2024-09-20 10:05:28 +02:00
Jorge Penadés	2537e58ff3	fix: refs #7524 dynamic fetch	2024-09-20 09:56:04 +02:00
Carlos Satorres	28cd15508f	Merge pull request 'refs #6898 fix filter' (!733) from 6898-fixSupplier2 into master ... Reviewed-on: #733 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-20 07:35:27 +00:00
Carlos Satorres	681c72a3d0	Merge branch 'master' into 6898-fixSupplier2	2024-09-20 07:31:21 +00:00
Carlos Satorres	45b5433206	refs #6898 fix filter	2024-09-20 09:14:11 +02:00
Jorge Penadés	489b74fff8	Merge pull request 'feat: refs #7323 use scopes' (!732) from 7323-hotfix-advancedSummary into master ... Reviewed-on: #732 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-19 10:09:03 +00:00
Jorge Penadés	2e8397a34b	feat: refs #7323 use scopes	2024-09-19 09:26:54 +02:00
Alex Moreno	f86525e31d	fix: not null variable	2024-09-18 13:24:21 +02:00
Alex Moreno	3906fc386f	hotFix: supplierDescriptor not use same data-key	2024-09-18 12:49:45 +02:00
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
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
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	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
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
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
Alex Moreno	37b6a03288	fix(itemDescriptor): fix redirection to itemDiary	2024-09-17 09:25:53 +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
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
Alex Moreno	a2f9178832	Merge pull request 'fix(ClaimList): fix summary' (!716) from warmFix_ClaimList_popup into test ... Reviewed-on: #716 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-16 08:06:22 +00:00
Alex Moreno	4c8238455f	fix(ClaimList): fix summary	2024-09-16 10:03:12 +02:00
Alex Moreno	5c3c511568	Merge pull request 'fix(VnSectionMain): add QPage' (!715) from warmFix_VnSectionMain_add_QPage into test ... Reviewed-on: #715 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-16 07:30:38 +00:00
Alex Moreno	8c4e4a16af	fix(VnSectionMain): add QPage	2024-09-16 09:19:08 +02:00
Guillermo Bonet	b6ee1ac2bc	Merge branch 'master' into test	2024-09-16 07:17:12 +02:00