18647 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	ee6fe5a6e1	Merge branch 'dev' into 6667-searchFilter	2024-01-22 07:02:51 +00:00
Alex Moreno	51f7fcf439	Merge branch 'dev' into 6694_postcode_location_filter	2024-01-22 06:41:31 +00:00
Javier Segarra	6904b021aa	Merge pull request '#6613 - Translations should be in back' (!1908) from 6613_translations_in_back into dev ... Reviewed-on: #1908 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-19 12:31:29 +00:00
Javier Segarra	b867bfe69c	Merge branch 'dev' into 6613_translations_in_back	2024-01-19 11:51:12 +00:00
Carlos Satorres	0f104e5410	refs #6667 view workerDepartment	2024-01-19 10:11:33 +01:00
Carlos Satorres	05f5b44f88	Merge pull request 'fix expense' (!1944) from test-fixExpense into test ... Reviewed-on: #1944 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-19 08:51:38 +00:00
Carlos Satorres	3be194356f	fix expense	2024-01-19 09:31:25 +01:00
Carlos Satorres	f42ce39112	Merge pull request '6296-countryAddress' (!1935) from 6296-countryAddress into dev ... Reviewed-on: #1935 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-19 08:10:06 +00:00
Carlos Satorres	882dd04adb	Merge branch 'dev' into 6296-countryAddress	2024-01-19 07:55:00 +00:00
Alex Moreno	2415e22258	refs #6222 fix: apply sql	2024-01-18 14:25:48 +01:00
Alex Moreno	0a98cd7b23	refs #6718 deploy: init version 24.06	2024-01-18 10:43:58 +01:00
Alex Moreno	dfee2b0ce4	refs #6718 fix: loggable and sql	2024-01-18 10:39:12 +01:00
Alex Moreno	ef2b156b55	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-18 08:07:47 +01:00
Alex Moreno	82526d56f5	Merge pull request 'refs #6222 refactor: sale_calculateComponent' (!1920) from 6222-test-saleCcomponentUpdate into test ... Reviewed-on: #1920 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-17 14:06:33 +00:00
Javier Segarra	145e72022a	refs #6694 perf: handle minor errors	2024-01-17 14:58:55 +01:00
Javier Segarra	38c93e8c76	refs #6694 test: add test	2024-01-17 14:49:35 +01:00
Carlos Satorres	ccdef0458a	refs #6667 fix groupBy	2024-01-17 14:39:11 +01:00
Robert Ferrús	0f6718850f	Merge branch '6222-test-saleCcomponentUpdate' of https://gitea.verdnatura.es/verdnatura/salix into 6222-test-saleCcomponentUpdate	2024-01-17 14:24:10 +01:00
Robert Ferrús	41aa5ff2f7	refs #6222	2024-01-17 14:24:07 +01:00
Alex Moreno	3c778216a4	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-17 13:19:18 +00:00
Javier Segarra	d2db0661e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6694_postcode_location_filter	2024-01-17 14:16:50 +01:00
Javier Segarra	92a3e841ed	refs #6694 perf: change let to const	2024-01-17 14:16:09 +01:00
Javier Segarra	71f387f626	refs #6694 feat: move filter remote method to own file	2024-01-17 14:15:21 +01:00
Carlos Satorres	7525998477	refs #6296 postal code	2024-01-17 14:13:09 +01:00
Carlos Satorres	d1a3c67d2e	refs #6667 fix limit	2024-01-17 14:07:04 +01:00
Carlos Satorres	1458a803bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-17 13:49:05 +01:00
Javier Segarra	3564a77043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-17 11:12:04 +01:00
Javier Segarra	21ce57d217	refs #6174 feat: update back to separate invoice and pdf	2024-01-17 10:31:07 +01:00
Carlos Satorres	d47429b4a7	refs #6667 sql	2024-01-17 10:01:38 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Javier Segarra	30b505aa8f	refs #6694 feat: add filter for postcodes	2024-01-17 08:34:15 +01:00
Carlos Satorres	f75362a6d7	Merge pull request 'refs #6230 remove basic-data columns' (!1937) from 6230-basicItem into dev ... Reviewed-on: #1937 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-16 13:55:02 +00:00
Alex Moreno	858912021b	Delete db/changes/240201/00-saleComponent.sql	2024-01-16 13:46:24 +00:00
Alex Moreno	aac3e17d3c	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-16 13:40:37 +00:00
Alex Moreno	9283173898	refs #6222 fix: correct sql folder	2024-01-16 14:40:50 +01:00
Guillermo Bonet	710995b080	Merge pull request 'feat: refs #4734 Added viaexpress interdia' (!1938) from 4734-viaExpressInterdia into master ... Reviewed-on: #1938 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-16 13:36:53 +00:00
Alex Moreno	9452aacb49	Merge branch 'dev' into 6230-basicItem	2024-01-16 13:25:28 +00:00
Guillermo Bonet	ed8210d5da	feat: refs #4734 Requested changes	2024-01-16 14:16:11 +01:00
Carlos Satorres	49e915f5d1	Merge pull request 'refs #5525 mod yml y sql' (!1491) from 5525-ibanSEPA-CORE into dev ... Reviewed-on: #1491 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-16 13:14:37 +00:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Carlos Satorres	8095b02835	refs #5525 move version	2024-01-16 12:48:40 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	84134d671f	refs #5525 remove as	2024-01-16 12:47:58 +01:00
Carlos Satorres	ce2bfc7cf1	refs #5525 insert	2024-01-16 12:46:53 +01:00
Carlos Satorres	037a178717	refs #6230 fix test back	2024-01-16 12:14:47 +01:00
Carlos Satorres	3ebeebc159	refs #6230 remove basic-data columns	2024-01-16 11:47:45 +01:00
Carlos Satorres	b3e1c58918	refs #6313 remove restriction	2024-01-15 14:50:08 +01:00
Carlos Satorres	371cc1e0a9	Merge pull request 'fixe2e' (!1934) from fixe2e into dev ... Reviewed-on: #1934 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-15 13:34:07 +00:00
Carlos Satorres	492c15eb73	Merge branch 'dev' into fixe2e	2024-01-15 12:57:23 +00:00
Carlos Satorres	f324ff5070	Merge pull request 'refs #6489 remove auth' (!1864) from 6489-authSupport into dev ... Reviewed-on: #1864 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-15 12:55:50 +00:00