21365 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	73f7d09b0e	feat: #7108 acl a invoiceIn	2024-04-24 08:14:07 +02:00
Robert Ferrús	ec7dc390b9	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-24 06:05:03 +00:00
Robert Ferrús	e36e997844	feat: refs #6223 ticketCalculateClon	2024-04-24 08:04:28 +02:00
Javier Segarra	41e1a57d2e	Merge branch 'dev' into fix_itemFk_ticketRequest_filter	2024-04-24 06:00:03 +00:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00
Juanjo Breso	8439125655	Merge pull request 'refs #6493 refactorizar-procedimientos-vn2008-parte_2' (!2235) from 6493-refactorizar-procedimientos-vn2008-parte_2 into dev ... Reviewed-on: #2235 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-24 05:18:58 +00:00
Guillermo Bonet	a6c57ef3df	Merge branch 'dev' into 6997-eypbc	2024-04-24 05:09:44 +00:00
Juanjo Breso	be8e55a905	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-24 05:03:19 +00:00
Carlos Andrés	26fd1ae6c9	Merge pull request 'test' (!2359) from test into dev ... Reviewed-on: #2359	2024-04-23 15:53:13 +00:00
Carlos Andrés	a7f1188975	Merge pull request 'master' (!2358) from master into test ... Reviewed-on: #2358 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 15:35:33 +00:00
Carlos Andrés	9823c22c66	Merge pull request 'hotfix importErrorNotification refs #6189' (!2357) from hotFix-6189-importErrorNotification into master ... Reviewed-on: #2357 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 15:32:09 +00:00
Carlos Andrés	033bcf6b67	hotfix importErrorNotification refs #6189	2024-04-23 17:24:47 +02:00
Alex Moreno	cc06698214	hotFix(ticket): refs #7225 fix advanced and movable	2024-04-23 15:37:04 +02:00
Juanjo Breso	9c306d4cc2	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:55:02 +00:00
Juanjo Breso	5efb6acafe	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:55:05 +02:00
Guillermo Bonet	e0393a6e72	Merge branch 'test' into dev	2024-04-23 14:43:19 +02:00
Guillermo Bonet	f5844ff426	Merge branch 'master' into test	2024-04-23 14:42:57 +02:00
Guillermo Bonet	ec23cc7619	hotfix: entry_checkBooked	2024-04-23 14:41:43 +02:00
Javier Segarra	0fd120676d	Actualizar modules/ticket/back/methods/ticket-request/filter.js	2024-04-23 12:29:40 +00:00
Juanjo Breso	022264ffff	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 14:05:51 +02:00
Juanjo Breso	d1c72a0be3	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:05:48 +02:00
Juanjo Breso	9b2bb4be0e	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:04:19 +00:00
Guillermo Bonet	afe2669b27	Merge branch 'test' into dev	2024-04-23 13:57:42 +02:00
Guillermo Bonet	36c8a8db0f	Merge branch 'master' into test	2024-04-23 13:57:18 +02:00
Guillermo Bonet	8f6303e851	Merge pull request 'hotfix: Throw msg and entry_updateComission start transaction' (!2352) from ticket176792-hotfix into master ... Reviewed-on: #2352 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 11:55:00 +00:00
Guillermo Bonet	1d5d6141d1	Merge branch 'dev' into 6997-eypbc	2024-04-23 11:17:29 +00:00
Javier Casado	69ea518a49	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-23 10:55:45 +00:00
Ivan Mas	2291a92a43	Merge pull request 'refs #7032 Delete vn.recipe_Cook' (!2348) from 7032-Delete-vn.recipeCook into dev ... Reviewed-on: #2348 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-23 10:28:28 +00:00
Ivan Mas	e7055e2428	Merge branch 'dev' into 7032-Delete-vn.recipeCook	2024-04-23 10:26:42 +00:00
Juanjo Breso	79172ef288	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 10:16:27 +00:00
Carlos Andrés	2d5daf55c2	Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev ... Reviewed-on: #2349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 10:04:08 +00:00
Guillermo Bonet	1044a24bc7	refactor: #6997 Deleted vn.client.eypbc	2024-04-23 12:00:23 +02:00
Guillermo Bonet	8dd4ac9119	hotfix: Throw msg and entry_updateComission start transaction	2024-04-23 11:50:48 +02:00
Javier Segarra	27354e452f	Merge pull request '#7190 - RenewTokenMultimedia' (!2335) from 7190_renewTokenMultimedia into dev ... Reviewed-on: #2335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 08:28:08 +00:00
Javier Segarra	83d89d13ad	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:26:23 +00:00
Alex Moreno	6f0038e4cc	fix: refs #7226 disable debug	2024-04-23 10:23:21 +02:00
Carlos Satorres	34bb0e9052	refs #6976 fix pdf	2024-04-23 10:07:40 +02:00
Alex Moreno	7fd7acbb56	deploy: refs #7253 init version 2420	2024-04-23 10:06:22 +02:00
Alex Moreno	fbf1b6e1af	Merge pull request '7253-devToTest_2418' (!2350) from 7253-devToTest_2418 into test ... Reviewed-on: #2350 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-23 08:02:45 +00:00
Pablo Natek	06e743f5da	fix: refs #7253 check booked add new restriction to be tested	2024-04-23 10:00:11 +02:00
Alex Moreno	60d5b9e4aa	test: refs #7173 fix sql, adding alias	2024-04-23 08:47:52 +02:00
Alex Moreno	85491613b0	test: refs #7173 fix fixtures	2024-04-23 08:47:28 +02:00
Juanjo Breso	d7e4dd4fc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 08:03:17 +02:00
Javi Gallego	eaf2762922	feat: #6382 chekCodeFormat	2024-04-23 07:57:37 +02:00
Alex Moreno	e52322f649	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-23 07:42:56 +02:00
Alex Moreno	902be9e788	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-23 07:41:04 +02:00
Juan Ferrer	91608b9053	Merge pull request 'refs #4409 Remove old recalc code' (!2300) from 4409-binlog into dev ... Reviewed-on: #2300 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-22 19:45:18 +00:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Carlos Andrés	8bb331f0ed	feat: Varias líneas farming en albaranes refs #7020	2024-04-22 19:57:17 +02:00
Carlos Andrés	c6a1ae338c	Merge pull request 'Hot fix informe facturas recibidas Ticket #176640' (!2347) from Hotfix-informe-facturas-emitidas-Ticket-#176640 into master ... Reviewed-on: #2347 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-22 15:56:50 +00:00