18647 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	f8939fb5cf	Merge branch 'dev' into fixe2e	2024-01-15 12:54:18 +00:00
Carlos Satorres	3cdf8b2011	Merge branch 'dev' into 6489-authSupport	2024-01-15 12:42:05 +00:00
Carlos Satorres	55b5e4cfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-15 13:29:39 +01:00
Juan Ferrer	74a4e486aa	refs #6661 Propagate changes from vn-database	2024-01-15 13:12:15 +01:00
Carlos Satorres	7d7c6d7071	remove fdescribre	2024-01-15 12:59:55 +01:00
Carlos Satorres	3ba5bc8fa1	refs #3979 fix e2e	2024-01-15 12:59:19 +01:00
Juan Ferrer	51a4608390	feat: refs #5483 Gulp and back tests adjustments	2024-01-15 12:35:23 +01:00
Juan Ferrer	b7edbbe12f	feat: refs #5483 Copy vn-database project	2024-01-15 12:31:03 +01:00
Guillermo Bonet	f3e7162bfe	Merge pull request 'feat: refs #6634 Modified collection-label' (!1932) from 6634-collectionLabelPrevia into dev ... Reviewed-on: #1932 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-15 09:53:43 +00:00
Javier Segarra	831d358e41	refs #6174 feat first approach	2024-01-15 10:52:02 +01:00
Guillermo Bonet	107e35001a	fix: refs #6582 Solved log error	2024-01-15 10:09:43 +01:00
Guillermo Bonet	4ead2345c4	Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia	2024-01-15 10:03:06 +01:00
Guillermo Bonet	a900e0fff6	feat: refs #6634 Minor change	2024-01-15 10:03:05 +01:00
Guillermo Bonet	1cd9b85ddf	Merge branch 'dev' into 6634-collectionLabelPrevia	2024-01-15 09:00:08 +00:00
Guillermo Bonet	be1a94c283	feat: refs #6634 Modified collection-label	2024-01-15 09:59:32 +01:00
Jorge Penadés	f5372cb801	Merge pull request 'hotfix ticket refund' (!1930) from hotfix-ticketRefund into master ... Reviewed-on: #1930 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-15 08:40:22 +00:00
Carlos Satorres	107dded411	refs #6296 countryAddress	2024-01-15 09:03:56 +01:00
Jorge Penadés	fcca927adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund	2024-01-15 07:54:35 +01:00
Alex Moreno	c20b9fe212	refs #6656 fix(updateTimeEntry): correct accessType (WRITE)	2024-01-15 07:45:40 +01:00
Jorge Penadés	6236cf0621	hotfix ticketRefund	2024-01-12 16:18:26 +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
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
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
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	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
Guillermo Bonet	2d93452bda	Merge pull request 'fix: refs #6582 Traductions routesMonitor' (!1922) from 6582-routesMonitorTraduction into master ... Reviewed-on: #1922 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-10 09:12:55 +00:00
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Guillermo Bonet	2b0e5e9d04	Merge branch 'master' into 6582-routesMonitorTraduction	2024-01-10 08:20:39 +00:00
Carlos Satorres	877dc718a7	refs #6353 remove rating	2024-01-10 08:57:19 +01:00