18537 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	fe1ccf98e6	Merge pull request 'hotfix kmMax' (!2003) from hotfix-kmMax into master ... Reviewed-on: #2003 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-07 10:31:20 +00:00
Carlos Satorres	9ee0669903	hotfix kmMax	2024-02-07 11:27:18 +01:00
Juan Ferrer	15ac547280	fix: hotfix disable DEBUG	2024-02-05 14:38:22 +01:00
Javi Gallego	693a39d34a	fix: hotfix puppeteer CONCURRENCY_PAGE	2024-02-05 13:19:44 +01:00
Javi Gallego	759ff45a27	fix: hotfix DEBUG enabled	2024-02-05 13:13:00 +01:00
Javi Gallego	c9785e76da	fix: hotfix puppeteer updated to 21.11.0	2024-02-05 12:56:23 +01:00
Javi Gallego	ff22540076	fix: hotfix puppeteer updated	2024-02-05 12:48:43 +01:00
Pablo Natek	931985fb1b	Merge pull request 'fix(driver-route): refs #6684 manage word overflow with wordBreak' (!1957) from 6684-driverRouteHotfix into master ... Reviewed-on: #1957 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-31 13:18:05 +00:00
Pablo Natek	85230d2647	Merge branch 'master' into 6684-driverRouteHotfix	2024-01-31 12:54:03 +00:00
Pablo Natek	550e3991cd	fix(warning): refs #6684 fix vue warning	2024-01-31 12:50:32 +01:00
Pablo Natek	4ba76291c1	remove(console.log): refs #6684 driverRouteFix	2024-01-31 12:33:52 +01:00
Pablo Natek	7d4b6132ec	fix(css): refs #6684 driverRouteReport	2024-01-31 12:30:57 +01:00
Juan Ferrer	194262a93e	fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks	2024-01-29 13:48:02 +01:00
Pablo Natek	4fc71b9798	fix(driverRoute): refs #6684 driverRouteHotFix	2024-01-29 08:04:52 +01:00
Pablo Natek	e43210af9c	fix(driver-route): refs #6684 manage word overflow with wordBreak	2024-01-26 09:23: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
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	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
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
Alex Moreno	ece0c926dd	refs #6745 fix: duplicate fixtures	2024-01-24 14:52:49 +01:00
Alex Moreno	1c0f8acb87	refs #5871 fix: awb	2024-01-24 13:37:29 +01:00
Sergio De la torre	48e4e21aa8	refs #6028 hotFix : getByWorker days to show	2024-01-24 12:55:51 +01: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
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
Alex Moreno	2415e22258	refs #6222 fix: apply sql	2024-01-18 14:25:48 +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
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
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +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