21403 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	60a3ec99d0	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-25 05:02:17 +00:00
Sergio De la torre	b8fdd7d726	Merge pull request 'refs #6574 feat: add order' (!2264) from 6574_itemGetBalance into dev ... Reviewed-on: #2264 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 13:55:05 +00:00
Sergio De la torre	8bb2fa93a7	Merge branch 'dev' into 6574_itemGetBalance	2024-04-24 13:46:53 +00:00
Alex Moreno	917592cdad	Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ... Reviewed-on: #2366 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 12:34:46 +00:00
Alex Moreno	69486fb29f	fix(componentUpdate): refs #7225 fix transfer all lines to newTicket	2024-04-24 14:15:27 +02:00
Carlos Satorres	b7b9035f72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6976-supplierConsumption	2024-04-24 12:45:22 +02:00
jcasado	aeee012c2b	refs #6697 fix sql test	2024-04-24 11:43:10 +02:00
Alex Moreno	2638b93299	Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable	2024-04-24 11:40:25 +02:00
Alex Moreno	eced03f69b	fix(ticket_getMovable): refs #7225 stock add ifnull	2024-04-24 11:40:24 +02:00
Guillermo Bonet	6fb87531c4	refactor: #7258 Deprecated last tables vn2008	2024-04-24 11:27:16 +02:00
jcasado	87d5e0a311	Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity	2024-04-24 11:19:17 +02:00
jcasado	d1659ce04c	refs #6697 fix claimQuantity	2024-04-24 11:19:15 +02:00
Guillermo Bonet	fda2298f7a	Merge branch '7258-lastChangesMigrationVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 7258-lastChangesMigrationVn2008	2024-04-24 10:57:36 +02:00
Guillermo Bonet	71e1e53ccd	refactor: #7258 Fixes	2024-04-24 10:57:35 +02:00
Alex Moreno	0cd740ce0c	test: refs #7225 fix back test	2024-04-24 10:42:50 +02:00
Alex Moreno	2e1ad0c000	Merge branch 'master' into 7225-hotFix_ticket_advanced_movable	2024-04-24 08:42:26 +00:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Guillermo Bonet	7a1c8ebc7f	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-24 08:16:34 +00:00
Javier Segarra	f7d9cc8102	Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev ... Reviewed-on: #2355 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 07:56:03 +00:00
Guillermo Bonet	4cc6b2f4f2	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-24 07:53:47 +00:00
Guillermo Bonet	f7ebd071bf	refactor: #7258 Deleted all dependences of vn2008 schema	2024-04-24 09:53:31 +02:00
Jon Elias	88ba6833be	Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev ... Reviewed-on: #2322 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 07:36:55 +00:00
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