7606 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	f16c45b01a	Merge branch 'dev' into performance_mixins	2024-12-09 11:37:52 +00:00
Guillermo Bonet	dcbaa7529d	Merge branch 'test' into dev	2024-12-05 09:24:45 +01:00
Guillermo Bonet	407b81f4b7	Merge branch 'master' into test	2024-12-05 09:24:35 +01:00
Carlos Satorres	3d0245553e	Merge pull request 'fix-7355AccountCreate' (!1051) from fix-7355AccountCreate into dev ... Reviewed-on: #1051 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-05 08:17:23 +00:00
Carlos Satorres	c3c10b2238	fix: account create	2024-12-05 09:03:13 +01:00
Guillermo Bonet	ebf5b74660	Merge pull request 'feat: refs #8248 Added beta in jenkinsfile' (!1050) from 8248-addBetaJenskinsfile into beta ... Reviewed-on: #1050 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-05 07:55:41 +00:00
Guillermo Bonet	b6844a517f	feat: refs #8248 Added beta in jenkinsfile	2024-12-05 08:50:06 +01:00
Carlos Satorres	95551d9f99	fix: account	2024-12-05 06:03:10 +01:00
Javier Segarra	0198a25972	Merge pull request 'fix: use right variable instead item.name' (!1048) from hotfix_ticketSale_concept into master ... Reviewed-on: #1048 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 14:06:21 +00:00
Javier Segarra	ad176f3f95	fix: use right variable instead item.name	2024-12-04 13:45:12 +00:00
Carlos Satorres	f5c6810d9e	fix: accountList create	2024-12-04 13:58:59 +01:00
Jorge Penadés	e0090c29c9	Merge branch 'dev' into performance_mixins	2024-12-04 12:22:09 +00:00
Jorge Penadés	559ee5416a	Merge pull request 'fix: refs #6238 enhance ui' (!1047) from 6238-hotfix-wideCol into master ... Reviewed-on: #1047 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 11:33:19 +00:00
Jorge Penadés	dc801489b3	Merge branch 'master' into 6238-hotfix-wideCol	2024-12-04 11:26:48 +00:00
Jorge Penadés	26b6157f65	fix: refs #6238 drop important	2024-12-04 12:18:31 +01:00
Javier Segarra	228c6e50f2	Merge pull request 'HOTFIX: vnLocation change value' (!1046) from hotfix_vnLocation_change_value into master ... Reviewed-on: #1046 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 11:14:04 +00:00
Jorge Penadés	a661f938b7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-hotfix-wideCol	2024-12-04 12:13:46 +01:00
Jorge Penadés	4c9b8a339e	fix: refs #6238 enhance ui	2024-12-04 12:12:01 +01:00
Javier Segarra	17751323b3	fix: vnLocation change value	2024-12-04 10:53:46 +00:00
Alex Moreno	6b28f39720	fix(CustomerWebAccess): hotFix use .account to save	2024-12-04 11:32:19 +01:00
Carlos Satorres	a6a21f3925	Merge pull request 'remove autocomplete address' (!935) from 8114-removeAutoAddress into dev ... Reviewed-on: #935 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 09:43:24 +00:00
Carlos Satorres	fc3c80d60d	fix: refs #8114 fix lifeCycle hooks	2024-12-04 10:35:33 +01:00
Carlos Satorres	e55d116398	fix: refs #8114 fix pr	2024-12-04 10:31:59 +01:00
Carlos Satorres	41292e467b	Merge branch '8114-removeAutoAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress	2024-12-04 09:27:24 +01:00
Carlos Satorres	55627a5b47	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress	2024-12-04 09:24:35 +01:00
Carlos Satorres	29b923130f	Merge branch 'dev' into 8114-removeAutoAddress	2024-12-04 08:22:58 +00:00
Carlos Satorres	32a17738eb	Merge pull request 'fix: fix invoiceOut filter' (!1038) from hotfix-6899invoiceOut into master ... Reviewed-on: #1038 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 08:21:58 +00:00
Carlos Satorres	0da4591da8	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:20:14 +00:00
Jorge Penadés	7c71becb64	Merge pull request 'feat: add country filter & fix userParams' (!1040) from hotfix-addCountryFilter into master ... Reviewed-on: #1040 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 14:18:26 +00:00
Jorge Penadés	94c0177f1b	feat: mock validations	2024-12-03 14:37:45 +01:00
Alex Moreno	b4a4c4a0a4	build: new version	2024-12-03 14:34:01 +01:00
Alex Moreno	e35fe20a10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-12-03 14:32:21 +01:00
Alex Moreno	f045b37b55	Merge pull request '8267-devToTest' (!1036) from 8267-devToTest into test ... Reviewed-on: #1036 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-12-03 13:32:09 +00:00
Jorge Penadés	4b1a4adfe3	feat: add country filter & fix userParams	2024-12-03 14:01:17 +01:00
Alex Moreno	b698098823	fix: hotfix correct path "log"	2024-12-03 11:03:40 +01:00
Carlos Satorres	ce83879960	Merge branch 'dev' of https: refs #8114//gitea.verdnatura.es/verdnatura/salix-front into 8114-removeAutoAddress	2024-12-03 10:33:48 +01:00
Carlos Satorres	2afaa48c25	fix: fix invoiceOut filter	2024-12-03 10:25:33 +01:00
Carlos Satorres	d832d958ef	Merge pull request 'fix: due date' (!1037) from hotfix-6896OrderTranslat into master ... Reviewed-on: #1037 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-03 08:37:21 +00:00
Carlos Satorres	b536cfe0af	fix: due date	2024-12-03 09:35:19 +01:00
Alex Moreno	ad3894e6b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest	2024-12-03 08:37:05 +01:00
Alex Moreno	a36287d8fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8267-devToTest	2024-12-03 08:31:18 +01:00
Alex Moreno	4bc8c948b6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-12-03 08:29:40 +01:00
Jorge Penadés	4d6ee25aeb	Merge pull request 'fix: refs #6818 get default prefix on err' (!1034) from 6818-hotfix-getDefaultPrefix into master ... Reviewed-on: #1034 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-02 15:08:04 +00:00
Jorge Penadés	baf76cf633	test: refs #6818 update description	2024-12-02 14:43:58 +01:00
Jorge Penadés	07b2be14ae	fix: refs #6818 get default prefix on err	2024-12-02 14:39:55 +01:00
Robert Ferrús	fcee9a4351	Merge pull request 'fix: refs #8263 itemTags order' (!1033) from 8263-itemTagsOrder into master ... Reviewed-on: #1033 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-02 12:57:58 +00:00
Robert Ferrús	7c2933893f	Merge branch 'master' into 8263-itemTagsOrder	2024-12-02 12:41:01 +00:00
Javier Segarra	46e4727f68	Merge pull request 'fix: HOTFIX Sage input required' (!1024) from hotfix_required_sage into master ... Reviewed-on: #1024 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-02 12:34:28 +00:00
Javier Segarra	92cd707ec8	Merge branch 'master' into hotfix_required_sage	2024-12-02 12:33:49 +00:00
Carlos Satorres	1291dc1723	fix: refs #8114 clean	2024-12-02 13:28:13 +01:00