7342 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Jon Elias	2c15f79a2d	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-20 09:08:13 +02:00
Jon Elias	44d98865fe	fix: refs #7553 requested changes	2024-09-20 09:04:31 +02:00
Javier Segarra	650e801433	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 11:10:28 +00:00
Alex Moreno	1150739de7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-19 12:59:51 +02:00
Alex Moreno	f03a2aebee	Merge pull request 'feat: global handler' (!729) from fix_global_handler into dev ... Reviewed-on: #729 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-19 10:56:11 +00:00
Alex Moreno	4f442a1f5a	Merge branch 'dev' into fix_global_handler	2024-09-19 10:54:45 +00:00
Javier Segarra	8e96265106	fix: CustomerFilter	2024-09-19 12:51:49 +02:00
Jon Elias	a012660518	Merge pull request 'Fix: Wagon section reload' (!727) from FixWagonRedirect into dev ... Reviewed-on: #727 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-19 10:45:31 +00: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
Jon Elias	c0dab66a24	Merge branch 'dev' into FixWagonRedirect	2024-09-19 10:08:18 +00:00
Javier Segarra	88e2ea48c2	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 10:07:46 +00:00
Javier Segarra	8b379faa52	perf: imrpove exprBuilder	2024-09-19 12:06:00 +02:00
Jon Elias	8fa11263e8	fix: fix wagon list reload	2024-09-19 12:05:08 +02:00
Javier Segarra	cc4f7de966	Merge pull request 'Fix VnTable InfiniteScroll' (!728) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #728 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-19 08:27:52 +00:00
Javier Segarra	35e89591ff	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-19 08:25:49 +00:00
Javier Segarra	46dbab4757	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 09:35:34 +02: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
Jorge Penadés	2e8397a34b	feat: refs #7323 use scopes	2024-09-19 09:26:54 +02:00
Javier Segarra	c21133ebd4	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 01:10:23 +02:00
Javier Segarra	ccfe61d777	feat: vnSelect exprBuilder	2024-09-19 01:10:14 +02: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
Alex Moreno	5ca38ca825	feat: global handler	2024-09-18 14:48:15 +02: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
Jon Elias	9db12a8dee	fix: wagon reload	2024-09-18 13:46:37 +02:00
Carlos Satorres	fc26fa12be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-18 13:34:14 +02: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
Jon Elias	34f70d026e	feat: refs #7553 added new field in list and translations	2024-09-18 11:50:00 +02: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
Jorge Penadés	5625ef4ce1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-18 09:41:26 +02:00
Javier Segarra	aa6dac3944	fix: SupplierFiscalData VnLocation	2024-09-18 07:28:10 +00:00