7721 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	41fb880c0e	fix: refs #7266 Minor fixes	2024-11-28 08:59:13 +01:00
Alex Moreno	1ae53791bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-28 08:41:58 +01:00
Alex Moreno	a251e348a8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-28 08:41:56 +01:00
Guillermo Bonet	4af309ce8d	Merge branch 'test' into dev	2024-11-28 08:36:36 +01:00
Javier Segarra	8daa08b99c	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-28 07:35:46 +00:00
Alex Moreno	fe34eefc55	Merge pull request 'fix: not fetch on mounted' (!1015) from hotfix-notRedirectOnLoad into master ... Reviewed-on: #1015 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-28 07:34:21 +00:00
Alex Moreno	118e346a07	Merge branch 'master' into hotfix-notRedirectOnLoad	2024-11-28 07:32:52 +00:00
Guillermo Bonet	55b9e3ddcd	fix: refs #7266 Bad report	2024-11-28 08:21:09 +01:00
Jon Elias	aaab41fe97	fix: translations	2024-11-28 07:37:50 +01:00
Jon Elias	b2e99230b3	Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion	2024-11-28 07:21:04 +01:00
Jon Elias	1a0406b5b1	fix: fixed exclusionCreate when excluding an event already excluded	2024-11-28 07:21:02 +01:00
Javier Segarra	c287c04894	Merge pull request '#8061 Improve_newCP' (!1016) from 8061_improve_newCP into dev ... Reviewed-on: #1016 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-11-28 05:52:26 +00:00
Javier Segarra	89a2486f62	fix: refs #8061 improve code dependencies	2024-11-27 23:33:39 +01:00
Javier Segarra	3a695bdfe1	perf: refs #8061 use opts from VnSelect	2024-11-27 22:42:18 +01:00
Javier Segarra	507b78f5e8	perf: refs #8061 filter autonomy	2024-11-27 22:33:00 +01:00
Javier Segarra	827f6032b6	Merge pull request 'test: Order catalog tests' (!1008) from wbuezas/salix-front-mindshore-fork2:feature/CatalogTests into dev ... Reviewed-on: #1008 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-27 20:02:34 +00:00
William Buezas	63f0db459c	test: change file name and path	2024-11-27 16:17:37 -03:00
Javier Segarra	38d8dbab8e	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-27 18:28:20 +00:00
Javier Segarra	e23c6bc144	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-27 18:19:59 +00:00
Javier Segarra	a7f5c13acf	Merge branch 'master' into Hotfix-ZoneEventsExclusion	2024-11-27 18:15:05 +00:00
Jorge Penadés	33de645e37	fix: not fetch on mounted	2024-11-27 17:02:41 +01:00
Jon Elias	5889dbf3de	Merge pull request 'Hotfix: fixed ref filter in InvoiceOutList' (!1014) from Hotfix-InvoiceOutRefFilter into master ... Reviewed-on: #1014 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-27 13:16:30 +00:00
Jon Elias	d2cee10141	Merge branch 'master' into Hotfix-InvoiceOutRefFilter	2024-11-27 13:13:57 +00:00
Jon Elias	7d28037c29	fix: fixed ref filter in InvoiceOutList	2024-11-27 14:09:37 +01:00
Jorge Penadés	25b8535f19	refactor: refs #6818 check prefix	2024-11-27 12:54:11 +01:00
Carlos Satorres	8b69940d41	Merge branch 'dev' into 7304-warningCustomerBasicData	2024-11-27 11:54:05 +00:00
Jon Elias	e94c99662d	Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion	2024-11-27 12:53:08 +01:00
Jon Elias	e764f4066f	fix: ticket notes translation and deleted useless code	2024-11-27 12:53:07 +01:00
Carlos Satorres	a531973421	fix: hotfix search	2024-11-27 10:18:32 +01:00
Javier Segarra	dc156e44b6	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-27 07:40:24 +00:00
Jon Elias	6b95df0202	Merge branch 'master' into Hotfix-ZoneEventsExclusion	2024-11-27 07:13:18 +00:00
Jon Elias	07ba02aec8	fix: fixed delete event and dated value when excluding a day	2024-11-27 08:02:18 +01:00
Javier Segarra	bfb0915da0	Merge pull request 'feat: remove More options separator' (!1007) from hotfix_remove_moreOptions into master ... Reviewed-on: #1007 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-27 06:58:06 +00:00
Javier Segarra	13ee4625be	Merge branch 'master' into hotfix_remove_moreOptions	2024-11-27 06:57:23 +00:00
Javier Segarra	1f752e19f2	Merge pull request 'HOTFIX SaySimple redirect' (!1005) from hotfix_saySimple into master ... Reviewed-on: #1005 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-27 06:56:29 +00:00
Javier Segarra	abec8035a9	Merge branch 'master' into hotfix_saySimple	2024-11-27 06:55:22 +00:00
Javier Segarra	fd9dd7ae55	Merge pull request 'HOTFIX Agency list should be ordered' (!1006) from hotfix_agencySelect_ordered into master ... Reviewed-on: #1006 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-27 06:53:53 +00:00
Carlos Satorres	59648d14f0	fix: refs #8114 orderList	2024-11-27 06:18:41 +01:00
William Buezas	4a562acd92	test: change selector	2024-11-26 21:58:30 -03:00
Javier Segarra	72a481ae5b	test: remove only	2024-11-27 01:30:42 +01:00
Javier Segarra	b61d6e6cbe	Merge branch 'dev' into feature/CatalogTests	2024-11-27 01:22:45 +01:00
Javier Segarra	e3bdea2197	fix: ticketSale keyup.enter	2024-11-27 01:15:16 +01:00
William Buezas	a2d84c48c0	refactor: remove unnecesary things	2024-11-26 21:05:47 -03:00
Javier Segarra	ff91ca2dfe	feat: remove More options separator	2024-11-26 23:57:10 +01:00
Javier Segarra	bc0d7f110d	fix: apply dataByOrder	2024-11-26 23:48:47 +01:00
Javier Segarra	4539a73efc	test: improve clientList	2024-11-26 23:34:57 +01:00
Javier Segarra	cf34204f82	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-26 23:21:05 +01:00
Javier Segarra	1b3500bbce	test: add vitest VnLinkPhone filter	2024-11-26 22:58:36 +01:00
Javier Segarra	21eda340a8	fix: #6818 VnLinkPhone using spanish prefix	2024-11-26 22:57:47 +01:00
Javier Segarra	511a5bc614	Merge pull request 'feat: add Options Style in AddressList from TicketCrete' (!999) from hotfix_addressSelect_optionFormat into master ... Reviewed-on: #999 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-26 14:09:46 +00:00