26079 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	fb653c1eca	fix: refs #7119 rollback	2025-01-24 16:42:10 +01:00
Jorge Penadés	ec7bbd13b1	refactor: refs #7119 update vehicle filter logic and improve test cases	2025-01-24 16:37:35 +01:00
Jorge Penadés	2346205072	Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-24 16:14:09 +01:00
Guillermo Bonet	e54b148088	Merge pull request 'refactor: refs #8205 Added geoFk Fk' (!3304) from 8205-geoFk into dev ... Reviewed-on: #3304 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-24 11:42:13 +00:00
Robert Ferrús	ad05641520	Merge pull request 'feat: refs #8077 sumDefaulter' (!3367) from 8077-sumDefaulterBackFix into dev ... Reviewed-on: #3367 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-24 10:55:32 +00:00
Robert Ferrús	b09e3398ff	Merge branch 'dev' into 8077-sumDefaulterBackFix	2025-01-24 10:46:16 +00:00
Guillermo Bonet	57ed161d27	Merge branch 'dev' into 8205-geoFk	2025-01-24 10:31:02 +00:00
Jorge Penadés	3fba81b41e	feat: refs #7119 add 'id' filter option and enhance bank policy model with dmsFk field	2025-01-24 10:46:35 +01:00
Jorge Penadés	f8e4561a59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-24 09:37:10 +01:00
Jon Elias	f3cb2bd200	Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev ... Reviewed-on: #3380 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 07:33:30 +00:00
Jon Elias	603e3e32c4	fix: shipped field	2025-01-24 07:39:18 +01:00
Jorge Penadés	3a449896cd	feat: refs #7119 update vehicle permissions and enhance vehicle model with new fields	2025-01-23 18:02:53 +01:00
Ivan Mas	13821b86ea	Merge pull request 'feat: refs #8342 deprecate sorter and splitLine tables' (!3377) from 8342-deprecateSorterAndSplitLineTables into dev ... Reviewed-on: #3377 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-23 11:40:55 +00:00
Ivan Mas	d98a867e12	Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables	2025-01-23 11:38:38 +00:00
Jorge Penadés	3ea67675da	feat: refs #7119 add VehicleType model and update vehicle permissions for delivery roles	2025-01-23 10:53:53 +01:00
Robert Ferrús	89de87c280	Merge pull request 'feat: refs #8398 sendCheckingPresence' (!3362) from 8398-mergeSendCheckingPresenceBack into dev ... Reviewed-on: #3362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:51:03 +00:00
Jorge Penadés	0440582e2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-23 10:09:47 +01:00
Robert Ferrús	14e69c1c64	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-23 08:21:32 +00:00
Jon Elias	64c697da6c	Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev ... Reviewed-on: #3378 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:05 +00:00
Alex Moreno	8ebf68cc4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-23 08:34:08 +01:00
Alex Moreno	200a7cf995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-23 08:33:58 +01:00
Jon Elias	602e822599	refactor: refs #7184 deleted .value	2025-01-23 08:21:19 +01:00
Jon Elias	6d5a329b49	fix: refs #7184 fixed filter and test	2025-01-22 17:09:01 +01:00
Jon Elias	0eff155daf	refactor: refs #7184 created myteam filter and modified filters where it is used	2025-01-22 16:34:14 +01:00
Ivan Mas	43528a0a53	feat: refs #8342 deprecate sorter and splitLine tables	2025-01-22 13:04:16 +01:00
Jorge Penadés	49e08fbf45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-22 12:42:25 +01:00
Robert Ferrús	5a12a01565	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix	2025-01-22 07:51:41 +01:00
Jorge Penadés	2ae0097fa8	feat: refs #7119 add vehicle type management and delivery role permissions	2025-01-21 15:48:20 +01:00
Alex Moreno	9d289fa11e	build: init version	2025-01-21 11:57:35 +01:00
Jorge Penadés	55a0a5bc9a	feat: refs #7119 add delivery role permissions	2025-01-21 11:52:09 +01:00
Robert Ferrús	0e0db6591e	Merge pull request 'feat: refs #8401 create triggers to itemTaxCountry' (!3370) from 8401-itemTaxCountryTrigger into master ... Reviewed-on: #3370 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:37:13 +00:00
Robert Ferrús	77606468fd	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-21 10:07:28 +00:00
Robert Ferrús	405e0adaec	Merge pull request 'feat: refs #8447 create tables tag' (!3375) from 8447-createTableTags2 into master ... Reviewed-on: #3375 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:02:01 +00:00
Alex Moreno	ded035285b	Merge pull request '8448-devToTest' (!3373) from 8448-devToTest into test ... Reviewed-on: #3373 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-21 10:00:49 +00:00
Alex Moreno	05b383ecb0	test: refs #8448 fix e2e	2025-01-21 10:57:40 +01:00
Jorge Penadés	e343e457ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-21 10:48:08 +01:00
Robert Ferrús	785a10a26a	feat: refs #8447 create tables tag	2025-01-21 09:34:56 +01:00
Sergio De la torre	6f73758cad	Merge pull request '7569-sendEmailOrderTicket' (!3350) from 7569-sendEmailOrderTicket into dev ... Reviewed-on: #3350 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 06:29:28 +00:00
Sergio De la torre	c50ff6a43a	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-21 07:05:42 +01:00
Sergio De la torre	eee73f001d	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 07:00:02 +01:00
Sergio De la torre	7f17cd59e7	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 06:58:15 +01:00
Jorge Penadés	3d2a7cfb66	feat: refs #7119 update ACLs for vehicle management and refine vehicle filter logic	2025-01-20 18:05:33 +01:00
Jorge Penadés	946d08e543	feat: refs #7119 update ACLs and remove unused models for vehicle management	2025-01-20 17:29:18 +01:00
Sergio De la torre	ef68884fe0	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 16:27:35 +01:00
Jorge Penadés	ecedc84164	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-20 14:28:30 +01:00
Sergio De la torre	b5e27707a7	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:36:31 +01:00
Sergio De la torre	0340612645	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:35:55 +01:00
Robert Ferrús	316a17304f	feat: refs #8401 restriction itemFk	2025-01-20 12:26:29 +01:00
Robert Ferrús	4b78c12ee4	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-20 10:26:14 +00:00
Robert Ferrús	cb065f42cd	feat: refs #8401 change request	2025-01-20 11:19:24 +01:00