26683 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
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
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
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
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
Javier Segarra	35bf9abcf4	Merge branch 'dev' into 7601_futureAgency	2025-02-06 16:15:27 +00:00
Javier Segarra	8398a30e4f	Merge branch 'dev' into 6321_negative_tickets	2025-02-06 14:58:55 +00:00
Javier Segarra	4e4d6c3b6a	fix: refs #6321 fixtures	2025-02-06 15:20:44 +01:00
Javier Segarra	9626b6c0ff	feat: refs #6321 update itemLackDetail	2025-02-06 15:19:39 +01:00
Javier Segarra	338e833c0b	feat: refs #6321 i18n	2025-02-06 15:19:23 +01:00
Javier Segarra	8170eafa36	feat: refs #6321 remove ticketConfig var	2025-02-06 15:19:07 +01:00
Robert Ferrús	aa44d0e727	Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-02-06 14:31:37 +01:00
Guillermo Bonet	9f302fac24	Merge branch 'test' into dev	2025-02-06 13:47:36 +01:00
Guillermo Bonet	92ca3a2582	Merge branch 'master' into test	2025-02-06 13:47:17 +01:00
Carlos Andrés	2e8e2329ec	fix: refs #8535 deploy	2025-02-06 13:44:22 +01:00
Robert Ferrús	73a7a4cbd3	Merge pull request 'feat: refs #8487 delete appointment from travel view' (!3421) from 8487-modifyTravelView into test ... Reviewed-on: #3421 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-02-06 12:32:12 +00:00
Javier Segarra	ab0667f85c	feat: retrive requested fields	2025-02-06 12:31:46 +00:00
Ivan Mas	f12a690bef	feat: refs #8487 delete appointment from travel view	2025-02-06 13:28:44 +01:00
Guillermo Bonet	beed658f61	fix: refs #8535 deploy	2025-02-06 13:21:32 +01:00
Guillermo Bonet	110a5212c0	fix: refs #8535 deploy	2025-02-06 12:55:01 +01:00
Javier Segarra	4c786be3af	Merge branch 'dev' into 6321_negative_tickets	2025-02-06 12:34:41 +01:00
Javier Segarra	4c7b8212da	feat: refs #6321 changes	2025-02-06 12:27:59 +01:00