5290 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	68e4831ea5	refs #7355 fix conflicts	2024-08-01 09:56:54 +02:00
Carlos Satorres	2d467016b2	refs #7355 fix roles	2024-08-01 09:51:18 +02:00
Alex Moreno	d9fb0d9186	nullishToTrue fn	2024-08-01 09:47:38 +02:00
Alex Moreno	5233c1455a	refactor: refs #7679 better way to update model	2024-07-31 14:57:25 +02:00
Guillermo Bonet	f09308d956	fix: refs #7413 No id tag	2024-07-31 12:50:34 +02:00
Carlos Satorres	ed032badac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration	2024-07-31 09:37:20 +02:00
Carlos Satorres	e41078b973	refs #7355 traduccions	2024-07-31 08:34:31 +02:00
Alex Moreno	287abcf90c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-31 08:10:30 +02:00
Alex Moreno	2ad72c3209	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-07-31 08:01:44 +02:00
Alex Moreno	7f4676f406	Merge pull request 'fix: vnLocation' (!577) from 7679-hotFix_vnLocation into master ... Reviewed-on: #577 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-31 05:45:24 +00:00
Jon Elias	b9a0f926ce	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-31 07:36:01 +02:00
Jon Elias	68ce5880dd	refactor: refs #7717 deleted useless code	2024-07-31 07:35:59 +02:00
Carlos Satorres	5b214b58ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration	2024-07-31 07:22:43 +02:00
Jon Elias	cf90007023	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-30 14:33:28 +02:00
Alex Moreno	c10e05396d	Merge pull request '#6943 - customer_migration_subsection' (!570) from 6943-customer_migration_subsection into dev ... Reviewed-on: #570 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 12:02:31 +00:00
Alex Moreno	ed110beda6	Merge branch 'dev' into 6943-customer_migration_subsection	2024-07-30 11:33:11 +00:00
Jon Elias	610e7c150b	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-30 11:32:05 +00:00
Jon Elias	7e3bfce732	fix: refs #7717 fix basic data form & minor errors	2024-07-30 13:31:12 +02:00
Jorge Penadés	3bb261376d	chore: refs #6449 refactor model-value text	2024-07-30 13:16:45 +02:00
Alex Moreno	108ffbe7a8	Merge branch 'master' into 7679-hotFix_vnLocation	2024-07-30 11:12:10 +00:00
Alex Moreno	ecb201edce	delete unnesessary class	2024-07-30 12:45:18 +02:00
Jorge Penadés	df907a7280	fix: refs #6449 fix summaryId	2024-07-30 12:43:26 +02:00
Alex Moreno	d0149d8cbe	empty commit	2024-07-30 12:26:26 +02:00
Carlos Satorres	7ff20f3064	hotFix: supplierList correct filter	2024-07-30 11:50:23 +02:00
Jorge Penadés	c306969f6a	Merge pull request 'fix: refs #6989 show entity name & default time from config table' (!576) from 6989-showClientName into dev ... Reviewed-on: #576 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-30 08:07:27 +00:00
Alex Moreno	f4347411ab	test: add better test to vnLocation	2024-07-30 10:01:16 +02:00
Jorge Penadés	1fe2ba7f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName	2024-07-30 09:52:29 +02:00
Alex Moreno	b16f00b2e9	build: init version 2434	2024-07-30 08:38:14 +02:00
Alex Moreno	eba8523a76	Merge pull request '7806_devToTest_2332' (!578) from 7806_devToTest_2330 into test ... Reviewed-on: #578 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-30 06:14:01 +00:00
Jon Elias	2cd696aeb9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-30 08:03:46 +02:00
Alex Moreno	b5cb28a0cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-30 07:47:46 +02:00
Alex Moreno	9179e13dcd	fix: vnLocation	2024-07-29 15:03:21 +02:00
Jorge Penadés	839af6d50c	fix: refs #6989 show entity name & default time from config table	2024-07-29 13:41:44 +02:00
Jorge Penadés	3741999fae	Merge pull request '#6891 worker tests' (!575) from fixE2e into dev ... Reviewed-on: #575 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-29 08:31:51 +00:00
Jorge Penadés	a7af5d43a2	fix: refs #6891 worker tests	2024-07-29 10:10:34 +02:00
Jorge Penadés	328c54deee	Merge pull request '#7197 fixInvoiceIn' (!466) from 7197-fixInvoiceIn into dev ... Reviewed-on: #466 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-29 07:44:04 +00:00
Jorge Penadés	979b3b2a6c	fix: refs #7197 drop character	2024-07-29 08:46:47 +02:00
Jorge Penadés	5705904e40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-29 08:04:51 +02:00
Jon Elias	be113656ae	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-26 14:56:27 +02:00
Jon Elias	4d7fe0fd86	fix: refs #7717 fix volume and lines redirect	2024-07-26 14:56:26 +02:00
Alex Moreno	f079ba4022	hotFix: twoFactor add required import	2024-07-26 14:51:22 +02:00
Jon Elias	356e7768b7	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-26 12:11:18 +00:00
Jon Elias	4cad7cbced	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-26 14:09:10 +02:00
Jon Elias	d588db05ac	fix: refs #7717 fix OrderList table filters' and summary table style	2024-07-26 14:09:09 +02:00
Robert Ferrús	01c58484e2	Merge pull request 'fix: refs #7039 supplierSummary' (!574) from 7039-hotFixSupplierSummary into master ... Reviewed-on: #574 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 12:00:29 +00:00
Robert Ferrús	bfbe4d64b3	Merge branch 'master' into 7039-hotFixSupplierSummary	2024-07-26 11:59:32 +00:00
Guillermo Bonet	7b13250a16	Merge branch 'test' into dev	2024-07-26 13:57:11 +02:00
Guillermo Bonet	36dd6fbe1e	Merge pull request 'fix: refs #6769 Fixes item diary' (!573) from 6769-itemDiaryFix into master ... Reviewed-on: #573 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 11:18:47 +00:00
Guillermo Bonet	621de11890	fix: refs #6769 Requested changes	2024-07-26 13:14:45 +02:00
Guillermo Bonet	48e133ffc7	fix: refs #6769 Fix worker images	2024-07-26 13:00:55 +02:00