26857 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	4d5d38592f	Merge pull request 'feat(catalog_calculate): refs #8408 new concept availabled' (!3425) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-10 06:47:01 +00:00
Pako Natek	f7f221e2bc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-10 06:36:15 +00:00
Pako Natek	17749b0ced	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-10 07:34:19 +01:00
Pako Natek	b60f251c56	fix(catalog_calculate): refs #8408 remove comments ... resf#8408	2025-02-10 07:34:15 +01:00
Guillermo Bonet	0ecf1f281a	Merge branch 'test' into dev	2025-02-10 07:27:04 +01:00
Guillermo Bonet	a002168f61	Merge branch 'master' into test	2025-02-10 07:26:53 +01:00
Guillermo Bonet	50a295d495	fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr	2025-02-10 07:25:39 +01:00
Pablo Natek	2f0cd27ed8	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-09 18:26:52 +01:00
Pablo Natek	6ea4e3096e	feat: refs #6897 add maxLockTime parameter to entryConfig insert statement	2025-02-09 18:24:39 +01:00
Javier Segarra	e748c3ea68	feat: refs #6321 minor changes	2025-02-07 22:40:00 +01:00
Javier Segarra	fce6b13d2d	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 16:19:58 +01:00
Javier Segarra	9bb273807d	feat: refs #6321 i18n negativeReplaced	2025-02-07 16:18:26 +01:00
Guillermo Bonet	08140894a8	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-07 14:06:28 +00:00
Guillermo Bonet	d7a25b06bf	Merge branch 'test' into dev	2025-02-07 15:05:41 +01:00
Guillermo Bonet	8261b35559	Merge branch 'master' into test	2025-02-07 15:05:20 +01:00
Guillermo Bonet	b56468d3aa	fix: refs #7024 Test	2025-02-07 15:05:04 +01:00
Pako Natek	e22a21290b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-07 14:37:20 +01:00
Pako Natek	adf416a086	fix: refs #8408 hour time on catalog_calculate	2025-02-07 14:29:50 +01:00
Guillermo Bonet	ec3210a5c0	Merge branch 'test' into dev	2025-02-07 14:28:28 +01:00
Guillermo Bonet	b1d2441d2e	Merge branch 'master' into test	2025-02-07 14:27:56 +01:00
Guillermo Bonet	95d2823666	fix: refs #7024 Deleted dated check	2025-02-07 14:27:27 +01:00
Pako Natek	ca39edd010	fix: refs #8408 test	2025-02-07 14:04:17 +01:00
Jon Elias	f04933a9c1	Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!3427) from Hotfix-FixedPriceNameFilter into dev ... Reviewed-on: #3427 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 12:44:42 +00:00
Jon Elias	516f409ae5	Merge branch 'dev' into Hotfix-FixedPriceNameFilter	2025-02-07 12:42:20 +00:00
Jon Elias	d76db10e67	fix: fixed item name filter	2025-02-07 13:39:53 +01:00
Pako Natek	466a0a58d9	fix(catalog_calculate): refs #8408 delete commented lines ... refs#8408	2025-02-07 12:59:41 +01:00
Pako Natek	74583d899a	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-07 11:53:30 +00:00
Pako Natek	ba323bb7bf	fix(fixtures.before): refs #8408 rollback changes ... refs#8408	2025-02-07 12:53:15 +01:00
Carlos Andrés	f851a0b73b	Merge pull request 'HOTFIX: before save checkAccessAcl' (!3426) from hotfix_client_beforeSave_ACL into master ... Reviewed-on: #3426 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 10:18:43 +00:00
Javier Segarra	23134deab5	fix: before save checkAccessAcl	2025-02-07 11:11:22 +01:00
Guillermo Bonet	21d9369250	fix: refs #8172 Version fix	2025-02-07 11:04:10 +01:00
Pako Natek	a4f3975340	feat(catalog_calculate): refs #8408 new concept availabled ... Refs: #8408	2025-02-07 10:40:00 +01:00
Guillermo Bonet	1a274648a7	Merge pull request 'refactor: refs #8172 Created table parkingCoordinates' (!3320) from 8172-parkingCoordinates into dev ... Reviewed-on: #3320 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-07 09:38:55 +00:00
Guillermo Bonet	6fd1c35819	Merge branch 'dev' into 8172-parkingCoordinates	2025-02-07 10:36:35 +01:00
Javier Segarra	f4dbddbe15	fix: refs #6321 dates in fixtures.before	2025-02-07 09:54:55 +01:00
Javier Segarra	ef4d639499	Merge pull request '#7601 - Different agency fot future tickets' (!3420) from 7601_futureAgency into dev ... Reviewed-on: #3420 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 08:32:47 +00:00
Javier Segarra	9322360979	fix: refs #6321 dates in fixtures.before	2025-02-07 08:41:49 +01:00
Jon Elias	18fe468623	Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!3424) from Hotfix-InvoiceOutCompanyFilter into master ... Reviewed-on: #3424 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:12:33 +00:00
Javier Segarra	47c3878a74	Merge branch 'dev' into 7601_futureAgency	2025-02-07 07:06:54 +00:00
Javier Segarra	e035a73e06	feat: refs #6321 i18n es negativeReplaced	2025-02-07 07:57:10 +01:00
Jon Elias	a6de493271	Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter	2025-02-07 06:56:49 +00:00
Javier Segarra	d185530839	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 07:56:05 +01:00
Jon Elias	200f159c6b	fix: style	2025-02-07 07:55:08 +01:00
Javier Segarra	9390c0efed	test: refs #6321 getSimilar.spec.js	2025-02-07 07:53:00 +01:00
Jon Elias	ec01c6b0c2	fix: fixed company filter	2025-02-07 07:51:18 +01:00
Robert Ferrús	860d86d19e	Merge pull request '6702-missageSaleCloned' (!3404) from 6702-missageSaleCloned into dev ... Reviewed-on: #3404 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 06:51:05 +00:00
Javier Segarra	c4e64db9b9	Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-06 23:23:00 +01:00
Javier Segarra	ba58746a03	fix: refs #6321 test	2025-02-06 23:22:58 +01:00
Jorge Penadés	fa098661b6	Merge pull request 'fix: add await' (!3422) from hotfix-addAwait into master ... Reviewed-on: #3422 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-06 16:53:52 +00:00
Jorge Penadés	6a83cec33f	fix: add await	2025-02-06 17:43:58 +01:00