18470 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	f477cdb878	refs #5739 feat: try run test back and front	2024-01-15 13:08:34 +01:00
Alex Moreno	417503bd06	refs #5739 feat: try run test back and front	2024-01-15 12:54:11 +01:00
Alex Moreno	51dcc402ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor	2024-01-15 09:05:30 +01:00
Alex Moreno	574fad7431	refs #5739 feat: try run test back and front	2024-01-15 09:00:38 +01:00
Alex Moreno	570d6b63b0	refs #5739 feat: try remove duplicate networks	2024-01-12 14:20:25 +01:00
Alex Moreno	6252c698d3	refs #5739 feat: try remove duplicate networks	2024-01-12 14:17:08 +01:00
Alex Moreno	6d02a8dc0c	refs #5739 feat: try remove duplicate networks	2024-01-12 14:14:21 +01:00
Alex Moreno	ce697f8ba5	refs #5739 feat: try remove duplicate networks	2024-01-12 14:11:59 +01:00
Alex Moreno	5fa1637d84	refs #5739 feat: try remove duplicate networks	2024-01-12 14:09:37 +01:00
Alex Moreno	2c61f21868	refs #5739 feat: try remove duplicate networks	2024-01-12 14:07:28 +01:00
Alex Moreno	22b0e65e35	refs #5739 feat: try remove duplicate networks	2024-01-12 14:05:47 +01:00
Alex Moreno	bfce8a57d4	refs #5739 feat: try remove duplicate networks	2024-01-12 13:55:37 +01:00
Alex Moreno	ccd80eb6e2	refs #5739 feat: try remove duplicate networks	2024-01-12 13:53:58 +01:00
Alex Moreno	112a5f1f3a	refs #5739 feat: try remove duplicate networks	2024-01-12 13:49:32 +01:00
Alex Moreno	0ea9997753	refs #5739 feat: try remove duplicate networks	2024-01-12 13:40:13 +01:00
Alex Moreno	56dc5ebb0e	refs #5739 feat: try remove duplicate networks	2024-01-12 13:37:52 +01:00
Alex Moreno	31fc3c5b35	refs #5739 feat: try remove duplicate networks	2024-01-12 13:36:10 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	c309f52c6f	Merge pull request 'fix: refs #6656 change acls' (!1929) from 6656-hotfix-workerTimeControl into master ... Reviewed-on: #1929 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-12 11:24:11 +00:00
Alex Moreno	336c678801	refs #5739 feat: try run test back and front	2024-01-12 11:53:58 +01:00
Alex Moreno	5604423de0	refs #5739 feat: try run test back and front	2024-01-12 11:41:07 +01:00
Carlos Satorres	1ca49d064e	Merge pull request 'refs #6353 remove rating' (!1923) from 6353-ratingCatalog into dev ... Reviewed-on: #1923 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-12 10:36:43 +00:00
Alex Moreno	ba247f4767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor	2024-01-12 11:01:14 +01:00
Alex Moreno	63fa732ba9	refs #5739 feat: try run test back and front	2024-01-12 10:52:00 +01:00
Alex Moreno	d0e64dff2b	refs #5739 feat: try run test back and front	2024-01-12 10:49:02 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	b7a523074f	Merge pull request 'refs #6322 importe' (!1921) from 6322-futureTicketImporte into dev ... Reviewed-on: #1921 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-12 07:55:18 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Alex Moreno	1319428085	refs #5739 feat: try run test back	2024-01-12 07:59:16 +01:00
Javi Gallego	887f686767	Merge pull request '3979-abonarTicketsSinAlmacen' (!1910) from 3979-abonarTicketsSinAlmacen into dev ... Reviewed-on: #1910 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-11 12:39:27 +00:00
Alex Moreno	f713ec268f	refs #5739 feat: try run test back	2024-01-11 13:33:58 +01:00
Alex Moreno	b1530d049e	refs #6398 hotFix: use userFk	2024-01-11 13:29:03 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Juan Ferrer	46fe878f45	Merge pull request 'refs #6660 feat: update mariadb version 10.7.7→10.11.6' (!1926) from 6660-mariadbV10.11.6 into dev ... Reviewed-on: #1926 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-11 11:28:13 +00:00
Juan Ferrer	ce5e8c278f	Merge branch 'dev' into 6660-mariadbV10.11.6	2024-01-11 11:22:55 +00:00
Guillermo Bonet	e2fd55d9fb	Merge pull request 'fix: ticket 147437: Fix packages in incoterms' (!1927) from ticket147437-fixPackages into master ... Reviewed-on: #1927 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-11 10:46:12 +00:00
Guillermo Bonet	4673145c58	fix: ticket 147437: Fix packages in incoterms	2024-01-11 10:09:35 +01:00
Alex Moreno	9b15551013	refs #6675 fix: correct sql folder	2024-01-11 09:00:45 +01:00
Alex Moreno	a92297da73	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-11 08:14:56 +01:00
Javier Segarra	93f80718d8	Merge pull request 'Send message to comercial by RocketChat' (!1897) from 5499_claim_rocketMessage_comercial into dev ... Reviewed-on: #1897 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-11 07:00:12 +00:00
Javier Segarra	b76e269e73	refs #5499 perf: rename variable	2024-01-11 06:18:02 +00:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Javier Segarra	de4ddf9392	remove bad comment	2024-01-10 13:47:42 +00:00
Pablo Natek	fd0ee6b7a2	Merge pull request 'fix(ticketTracking): refs #6398 assign ticket workerFk to userFk' (!1924) from 6398-ticketTrackingAsignFix into master ... Reviewed-on: #1924 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-01-10 13:04:24 +00:00
Pablo Natek	a623e5b90e	Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix	2024-01-10 13:55:03 +01:00
Pablo Natek	dff277ed12	fix(spec): refs #6398 fix spec	2024-01-10 13:55:01 +01:00
Pablo Natek	5d63b4fba8	Merge branch 'master' into 6398-ticketTrackingAsignFix	2024-01-10 12:51:33 +00:00
Pablo Natek	df13fa3c88	fix(selector): refs #6398 change selector name	2024-01-10 13:35:34 +01:00
Pablo Natek	63b20c1e91	fix(ticketTracking): refs #6398 assign ticket workerFk to userFk	2024-01-10 13:12:12 +01:00