21806 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	a40545264b	fix: descuentos en bs.ventas refs #6974	2024-04-30 15:46:24 +02:00
Ivan Mas	de5e43fb05	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-30 12:41:54 +00:00
Ivan Mas	3167bdcdd0	refs #7191 message modification	2024-04-30 14:37:06 +02:00
Carlos Satorres	b66111a032	refs #6895 remove tfront	2024-04-30 13:33:46 +02:00
Carlos Satorres	b0b8f12ca9	refs #6895 remove code	2024-04-30 13:17:19 +02:00
Carlos Satorres	e546a13e5d	refs #6895 redirect lilium	2024-04-30 12:41:29 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Alex Moreno	d18f08e676	hotFix(addSaleByCode) add userId	2024-04-30 12:15:27 +02:00
Robert Ferrús	5ea57ce728	Merge branch 'dev' into 7296-expeditionTruck	2024-04-30 10:04:40 +00:00
Robert Ferrús	83e9756692	fear: refs #7296 expeditionTruck	2024-04-30 12:02:19 +02:00
Robert Ferrús	e7be1e2efe	feat: refs #7296 expeditionTruck to roadmapStop	2024-04-30 11:48:18 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Javier Segarra	426c5de1b8	Merge branch '7272_bug_redirectToLogin' of https://gitea.verdnatura.es/verdnatura/salix into 7272_bug_redirectToLogin	2024-04-30 11:45:39 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Javier Segarra	5b4ed62a36	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-04-30 11:35:51 +02:00
Javier Segarra	be3ee43b06	fix(salix): refs #7272 #7272 Back validateToken endpoint	2024-04-30 11:35:30 +02:00
Javier Segarra	b4284889e1	fix(salix): refs #7272 #7272 Front retry calls	2024-04-30 11:35:07 +02:00
Javier Segarra	43cedef259	fix(salix): refs #7272 #7272 Call validateToken	2024-04-30 11:26:31 +02:00
Javier Segarra	6277c3da09	fix(salix): refs #7272 #7272 Remove aclService from auth.js	2024-04-30 11:26:12 +02:00
Javier Segarra	596c0f78d0	fix(salix): refs #7272 #7272 Add aclService in routes.js	2024-04-30 11:24:36 +02:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Carlos Andrés	2b6d4198ad	Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master ... Reviewed-on: #2385 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-30 07:06:43 +00:00
Javier Segarra	60634fc308	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-04-30 05:58:03 +00:00
Guillermo Bonet	80b44ccace	Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ... Reviewed-on: #2362 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 05:37:33 +00:00
Ivan Mas	a33cbb0a7c	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-29 17:46:26 +00:00
Ivan Mas	30f6a9324d	refs #7191 SQL conventions mod	2024-04-29 19:40:43 +02:00
Carlos Andrés	e934b47e98	Hotfix feat: new function to kill connections	2024-04-29 17:09:51 +02:00
Carlos Andrés	e55658e6b3	Hotfix feat: new function to kill connections	2024-04-29 17:02:47 +02:00
Carlos Andrés	21a1e1eed3	Hotfix feat: new function to kill connections	2024-04-29 16:59:56 +02:00
Jorge Penadés	9802f0066c	fix: refs #5919 unique key & unassigned locker	2024-04-29 16:05:36 +02:00
Carlos Andrés	8c7f8a43a7	Merge pull request 'hotFix collection_assign' (!2384) from hotfix-eliminar-vLockTime-collection_assign into master ... Reviewed-on: #2384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-29 13:02:56 +00:00
Carlos Andrés	7b7afb05c5	hotfix collection_assign	2024-04-29 15:01:20 +02:00
Carlos Andrés	51c8736da2	hotFix collection_assign	2024-04-29 14:54:15 +02:00
Carlos Andrés	dcb6f90ab3	hotfix collection_assign elimino vLockTime	2024-04-29 14:42:16 +02:00
Javier Segarra	cf800ae6b4	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-04-29 12:50:31 +02:00
Javier Segarra	ab87929b2d	fix(salix): refs #7272 #7272 i18n Error	2024-04-29 12:50:17 +02:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Jorge Penadés	be69b5e2c4	fix: refs #5919 rollback	2024-04-29 12:04:31 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02:00
Jorge Penadés	f6e89c9049	fix: refs #5919 rollback	2024-04-29 11:46:58 +02:00
Jorge Penadés	7240269f5b	fix: refs #5919 rollback	2024-04-29 11:45:54 +02:00
Jorge Penadés	50ea41f99a	fix: refs #5919 rollback	2024-04-29 11:43:56 +02:00
Jorge Penadés	0003779681	fix: refs 5919 apply version	2024-04-29 11:35:08 +02:00
Sergio De la torre	e1fe1cef7f	Merge pull request '6275_getExpeditionSummary' (!2381) from 6275_getExpeditionSummary into master ... Reviewed-on: #2381 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-29 09:24:50 +00:00
Robert Ferrús	c18c77ab93	Merge branch 'dev' into 7039-country-country	2024-04-29 08:08:52 +00:00
Robert Ferrús	9af3c17a1f	feat: refs #7291 sale_getProblems	2024-04-29 09:58:58 +02:00
Jorge Penadés	8adb52aac4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-04-29 09:24:10 +02:00
Sergio De la torre	a180f54390	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:59:12 +02:00
Sergio De la torre	f4767728bc	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:20:57 +02:00