18995 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Carlos Satorres	04f1a03d4d	refs #6397 fix back	2024-01-29 14:08:43 +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
Robert Ferrús	eb208edacc	feat: refs #6371 pasar vn2008 a vn part1	2024-01-29 12:35:49 +01: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
Jorge Penadés	4fc780967f	fix: refs #6703 tests	2024-01-26 15:32:50 +01:00
Jorge Penadés	ab3fdf4fe4	fix: refs #6703 remove console log	2024-01-26 12:33:04 +01:00
Jorge Penadés	e33861a80d	fix: refs #6703 filter	2024-01-26 12:15:53 +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
Jorge Penadés	53f37bb0eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-26 09:32:08 +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
Jorge Penadés	e5d466b697	fix: refs #6703 drop & replace sale refund by clone	2024-01-26 08:30:43 +01:00
Guillermo Bonet	6488ea2f6c	Merge pull request 'fix: #6634 Line count previa collection-label' (!1956) from 6634-hotfixColectionLabel into master ... Reviewed-on: #1956 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-26 07:14:38 +00:00
Guillermo Bonet	0c5225e3d0	fix: #6634 Line count previa collection-label	2024-01-26 07:42:53 +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
Jorge Penadés	ed77347fe1	fix: #6557 replace procedure	2024-01-25 15:41:55 +01: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	66936d8983	hotFix: saveSign	2024-01-25 11:37:25 +01:00
Juan Ferrer	381f04ac6a	fix: refs #6745 debug disabled	2024-01-25 11:28:58 +01:00
Alex Moreno	17d2e0750a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-25 11:09:59 +01:00
Alex Moreno	578bcd3cce	hotFix: saveSign	2024-01-25 11:09:56 +01:00
Juan Ferrer	1955f891d8	fix: refs #6745 temp enable strong-remoting debug	2024-01-25 10:44:58 +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
Sergio De la torre	bf789b1fa8	Merge pull request 'refs #6028 hotFix : getByWorker days to show' (!1949) from 6028_hotFix_getRoutes into master ... Reviewed-on: #1949 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-24 19:26:13 +00:00
Javier Segarra	523301b280	Merge branch 'dev' into 6694_postcode_location_filter	2024-01-24 18:34:55 +00:00
Carlos Satorres	1cf9171e19	Merge pull request 'refs #6313 remove restriction' (!1936) from 6313-removecanForceQuantity into dev ... Reviewed-on: #1936 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-24 13:55:30 +00:00
Alex Moreno	ece0c926dd	refs #6745 fix: duplicate fixtures	2024-01-24 14:52:49 +01:00
Carlos Satorres	a594fda704	Merge branch 'dev' into 6313-removecanForceQuantity	2024-01-24 12:50:03 +00:00