18630 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	624f61465a	fix: refs #5483 Jenkinsfile fixes	2024-01-30 19:05:55 +01:00
Juan Ferrer	12af757929	refs #5483 Jenkinsfile fix	2024-01-30 19:01:14 +01:00
Juan Ferrer	79f509ca46	fix: refs #5483 Jenkinsfile code fix	2024-01-30 18:54:41 +01:00
Juan Ferrer	56ac47dc16	build: refs #5483 send rocket message, skip steps when run source isn't git	2024-01-30 18:52:31 +01:00
Juan Ferrer	acf47468c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-30 10:23:34 +01:00
Juan Ferrer	c1726f9390	fix: refs #5483 Remove DB container when back tests end	2024-01-30 10:23:32 +01:00
Guillermo Bonet	c80c8a5678	fix: refs #5483 No apply changes of db in dev	2024-01-30 10:00:35 +01:00
Jorge Penadés	c96e380ba6	Merge pull request 'fix: refs #6761 fixtures' (!1962) from 6761-fixE2e into dev ... Reviewed-on: #1962 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-30 08:17:58 +00:00
Jorge Penadés	8ea1600f4a	fix: refs #6276 test title	2024-01-30 08:11:21 +01:00
Jorge Penadés	3190e14112	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6761-fixE2e	2024-01-30 08:01:54 +01:00
Guillermo Bonet	becabfa358	Merge pull request 'refactor: #6725 Deleted originFk from log tables' (!1961) from 6725-deletedFkLogs into dev ... Reviewed-on: #1961 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-30 06:09:51 +00:00
Guillermo Bonet	7a6d2ce984	Merge branch 'dev' into 6725-deletedFkLogs	2024-01-30 06:01:31 +00:00
Juan Ferrer	c63a323c12	fix: refs #5483 Myt updated	2024-01-29 20:23:51 +01:00
Juan Ferrer	bba48a5f5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-29 20:16:04 +01:00
Juan Ferrer	7c18e22c38	feat: refs #5483 myt updated, back tests now use tmpfs for DB	2024-01-29 20:16:03 +01:00
Jorge Penadés	a3442d4887	fix: refs #6276 fixtures	2024-01-29 15:47:46 +01:00
Javier Segarra	89a5f3dff8	Merge pull request '#6147 - Refactor Invoice make PDF and notify' (!1933) from 6174_refactor_invoicePdfNotify into dev ... Reviewed-on: #1933 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-29 14:10:29 +00:00
Javier Segarra	2e0da0881b	refs #6174 test: fix method	2024-01-29 14:54:19 +01:00
Guillermo Bonet	8484afe2ea	refactor: #6725 Deleted originFk from log tables	2024-01-29 14:29:10 +01:00
Javier Segarra	7880f41d1c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-29 14:11:08 +01:00
Javier Segarra	5396b402a5	refs #6174 feat: acl	2024-01-29 14:10:30 +01:00
Javier Segarra	9bf08f31ae	refs #6174 feat: replace method in salix-front	2024-01-29 14:10:22 +01:00
Guillermo Bonet	170d09b8b8	Merge pull request 'feat: refs #6625 Changed default values operator' (!1958) from 6625-defaultValueOperator into dev ... Reviewed-on: #1958 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-29 12:46:23 +00:00
Guillermo Bonet	2268ef377f	feat: #6625 Changed version to myt	2024-01-29 12:32:50 +01:00
Guillermo Bonet	646f617de0	Merge branch 'dev' into 6625-defaultValueOperator	2024-01-29 11:15:17 +01:00
Guillermo Bonet	c91cf660be	feat: #6625 Changed version to myt	2024-01-29 11:14:02 +01:00
Javier Segarra	9b1f76173b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-29 11:11:48 +01:00
Alex Moreno	149c2b0293	refs #5483 fix: zoneEstimatedDelivery in salix	2024-01-29 07:39:39 +01:00
Alex Moreno	a35db0cefd	Merge pull request 'feat: refs #5483 unify DB' (!1955) from 5483-unifyDb into dev ... Reviewed-on: #1955 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-29 05:58:48 +00:00
Juan Ferrer	52cb1c496a	fix: refs #5483 myt updated, front test workers increased to 4	2024-01-28 14:34:53 +01:00
Juan Ferrer	04091353e2	fix: refs #5483 myt updated	2024-01-28 12:58:10 +01:00
Juan Ferrer	49f2a66b09	fix: refs #5483 myt updated	2024-01-28 12:49:43 +01:00
Juan Ferrer	ce0684e6ff	fix: refs #5483 myt updated, jenkins tests and fixtures fixes	2024-01-28 12:40:13 +01:00
Guillermo Bonet	38c57595d1	feat: refs #6625 Changed default values operator	2024-01-26 10:50:33 +01:00
Javier Segarra	0afc9ab109	refs #6174 test: fix test bug	2024-01-26 09:55:21 +01:00
Javier Segarra	f1cbb6aab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-26 08:48:05 +01:00
Juan Ferrer	81639726b2	feat: refs #5483 final merge	2024-01-26 00:09:24 +01:00
Juan Ferrer	1ad1e53970	feat: refs #5483 update db files	2024-01-25 17:33:54 +01:00
Juan Ferrer	a5cd4a671c	Merge branch 'dev' into 5483-unifyDb	2024-01-25 17:31:19 +01:00
Juan Ferrer	4e5893daa3	Merge pull request '6743-exportDb' (!1953) from 6743-exportDb into dev ... Reviewed-on: #1953 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-25 15:47:26 +00:00
Pablo Natek	9981c0bef9	fix(test): refs #6743 fix test	2024-01-25 15:09:48 +01:00
Pablo Natek	a7faac3ef6	fix. refs #6743 remove consoleLog	2024-01-25 15:07:19 +01:00
Pablo Natek	2e1b55448a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 15:04:32 +01:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Alex Moreno	d305de2438	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-25 09:00:48 +01:00
Alex Moreno	bfbe8302b6	Merge pull request '6745-2404_testToMaster' (!1950) from 6745-2404_testToMaster into master ... Reviewed-on: #1950 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-25 07:39:10 +00:00
Pablo Natek	36fc55180a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:30:28 +01:00
Pablo Natek	01c21baa65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb	2024-01-25 08:25:08 +01:00
Javier Segarra	74e6e62961	Merge pull request '#6694 - Improve filter method' (!1947) from 6694_postcode_location_filter into dev ... Reviewed-on: #1947 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-25 07:10:55 +00:00
Alex Moreno	dec625d2df	Merge branch 'master' into 6745-2404_testToMaster	2024-01-25 06:23:29 +00:00