18582 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	e5d466b697	fix: refs #6703 drop & replace sale refund by clone	2024-01-26 08:30:43 +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
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
Alex Moreno	1c0f8acb87	refs #5871 fix: awb	2024-01-24 13:37:29 +01:00
Alex Moreno	f5de7a0212	Merge branch 'dev' into 6694_postcode_location_filter	2024-01-24 12:35:45 +00:00
Sergio De la torre	48e4e21aa8	refs #6028 hotFix : getByWorker days to show	2024-01-24 12:55:51 +01:00
Javier Segarra	05aaed5565	Merge pull request '#2687 - Travel CloneWithEntries' (!1887) from 2687_travel_cloneWithEntries into dev ... Reviewed-on: #1887 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-24 10:55:17 +00:00
Sergio De la torre	fc53e98bb5	refs #6028 hotFix : getByWorker days to show	2024-01-24 10:48:01 +01:00
Robert Ferrús	c61105e356	Merge pull request 'refs #6222 fix(ticket): step-two' (!1948) from 6222-test-ticketStepTwo into test ... Reviewed-on: #1948 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-24 09:11:27 +00:00
Robert Ferrús	2ee48a53e2	refs #6222 fix(ticket): step-two	2024-01-24 09:59:27 +01:00
Javier Segarra	40d5e8662b	refs #6694 perf: remove unused imports	2024-01-24 08:38:34 +01:00
Javier Segarra	5b2b6a15ad	refs #6694 perf: improve filter	2024-01-24 08:36:08 +01:00
Alex Moreno	701b039e97	refs #6743 feat: import db	2024-01-24 08:23:17 +01:00
Javier Segarra	cddd8f7d94	refs #2687 perf: improve comments	2024-01-23 16:36:53 +01:00
Javier Segarra	5d53d69754	refs #6694 perf: update postCode/filter method	2024-01-23 12:52:35 +01:00
Javier Segarra	b5d883cdbe	refs #2687 feat: add grant privileges for guest	2024-01-23 11:53:12 +01:00
Javier Segarra	056dddd212	refs #2687 perf: generate comments	2024-01-23 11:22:59 +01:00
Javier Segarra	fe714aef22	refs #2687 perf: change variable description	2024-01-23 11:20:27 +01:00
Javier Segarra	90f5e876e7	Merge branch '2687_travel_cloneWithEntries' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2024-01-23 08:34:11 +01:00
Javier Segarra	c1bc2c94a6	refs #2687 perf: generate comments	2024-01-23 08:33:15 +01:00
Javier Segarra	7f43a45955	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 11:08:06 +00:00
Carlos Satorres	725c43c7e4	Merge pull request 'refs #6667 sql' (!1940) from 6667-searchFilter into dev ... Reviewed-on: #1940 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-22 10:36:08 +00:00
Javier Segarra	39453492a0	refs #2687 feat update db/change version	2024-01-22 10:22:21 +01:00
Carlos Satorres	01c7ca353a	Merge branch 'dev' into 6667-searchFilter	2024-01-22 09:14:41 +00:00
Javier Segarra	95398485dc	Merge branch 'dev' into 2687_travel_cloneWithEntries	2024-01-22 09:01:28 +00:00
Javier Segarra	0aecda6776	Merge pull request '#6694 Filter postcode by multiple fields' (!1939) from 6694_postcode_location_filter into dev ... Reviewed-on: #1939 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-22 07:22:56 +00:00
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