5977 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	35e89591ff	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-19 08:25:49 +00:00
Javier Segarra	297596fe38	Merge pull request 'Apply color for today' (!730) from highlight_today_qDate into dev ... Reviewed-on: #730 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-19 07:32:36 +00:00
Javier Segarra	1425ec268c	Merge branch 'dev' into highlight_today_qDate	2024-09-19 07:31:37 +00:00
Javier Segarra	aa97ac2810	Merge pull request 'More sections with 'add_circle' icon' (!731) from add_shortcut_add_subSections into dev ... Reviewed-on: #731 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-19 07:29:07 +00:00
Javier Segarra	1550d79160	feat: add shortcut more buttons	2024-09-19 00:10:28 +02:00
Javier Segarra	08bec59a37	add_circle	2024-09-19 00:04:58 +02:00
Javier Segarra	1cb2981f97	feat: apply color when today	2024-09-18 16:26:56 +00:00
Javi Gallego	b3f27d9a84	feat: translations fixed	2024-09-18 17:51:49 +02:00
Javier Segarra	3de08826ac	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-18 15:41:35 +00:00
Javier Segarra	b59e7174df	Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll	2024-09-18 14:30:53 +02:00
Alex Moreno	7b70734eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-18 14:29:29 +02:00
Javier Segarra	d76250f56f	fix: reset VnTable scroll properties	2024-09-18 12:27:48 +00:00
Javier Segarra	ee0f4037ed	Merge pull request 'Add shortcut for few sub sections' (!726) from add_shortcut_add_subSections into dev ... Reviewed-on: #726 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-18 12:26:44 +00:00
Javier Segarra	98411d3c29	Merge branch 'dev' into add_shortcut_add_subSections	2024-09-18 12:25:23 +00:00
Carlos Satorres	a302050494	Merge pull request 'refs #7155 scopeDays' (!710) from 7155-scopeDays into dev ... Reviewed-on: #710 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 12:09:18 +00:00
Carlos Satorres	364ce63545	Merge branch 'dev' into 7155-scopeDays	2024-09-18 12:01:43 +00:00
Javier Segarra	37329a7391	feat: add shortcut add event in some subSections	2024-09-18 13:30:51 +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
Alex Moreno	cba8647ac2	Merge pull request 'feat(AccountBasicData): add twoFactorFk' (!689) from 7792-accountBasicData_twoFactorFk into dev ... Reviewed-on: #689 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-18 10:41:56 +00:00
Alex Moreno	8abd375985	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk	2024-09-18 10:14:54 +02:00
Alex Moreno	21a7fafba5	feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData	2024-09-18 09:57:21 +02:00
Javier Segarra	9d210ace84	Merge pull request 'fix: SupplierFiscalData VnLocation' (!725) from fix_supplierFD_location into dev ... Reviewed-on: #725 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 07:54:42 +00:00
Javier Segarra	aa6dac3944	fix: SupplierFiscalData VnLocation	2024-09-18 07:28:10 +00: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
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
Alex Moreno	fb1a94604b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-18 08:20:45 +02:00
Carlos Satorres	4f662375cd	fix(VnTable): sanitizer value is defined	2024-09-17 15:04:58 +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
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	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
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	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
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