22306 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Guillermo Bonet	6874474207	Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ... Reviewed-on: #2394 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:05:20 +00:00
Guillermo Bonet	a899ecaab7	Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev ... Reviewed-on: #2561 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:04:32 +00:00
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... Reviewed-on: #2621 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:47:11 +00:00
Carlos Andrés	691413a854	Merge pull request 'master' (!2620) from master into test ... Reviewed-on: #2620 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:44:37 +00:00
Carlos Andrés	11675c2e35	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master ... Reviewed-on: #2618 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 13:34:55 +00:00
Carlos Andrés	414bf9eb03	feat: sincro client supplier sage refs #7595	2024-06-20 14:48:32 +02:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Carlos Satorres	59abcaa654	Merge pull request 'Actualizar README.md' (!2616) from sergiodt-patch-1 into dev ... Reviewed-on: #2616 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-20 12:05:35 +00:00
Carlos Satorres	926982d5e0	Merge branch 'dev' into sergiodt-patch-1	2024-06-20 12:04:03 +00:00
Guillermo Bonet	b02a4721af	Merge branch 'test' into dev	2024-06-20 13:10:31 +02:00
Guillermo Bonet	074d4f4755	Merge branch 'master' into test	2024-06-20 13:10:07 +02:00
Guillermo Bonet	9a4ec46073	hotfix: refs #6820 Deleted km validation	2024-06-20 13:09:40 +02:00
Sergio De la torre	7d3c07aaae	Actualizar README.md	2024-06-20 10:44:31 +00:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Jorge Penadés	4b7fa29189	Merge pull request '#6744 hotfix show change password' (!2595) from 6744-hotfix-showChangePass into master ... Reviewed-on: #2595 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-19 14:55:15 +00:00
Jorge Penadés	4b8b503964	Merge branch 'master' into 6744-hotfix-showChangePass	2024-06-19 14:50:32 +00:00
Javi Gallego	3ec25bd237	Merge pull request 'feat: refs #7027 mailError managed' (!2612) from 7027-mailError into dev ... Reviewed-on: #2612 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 13:29:57 +00:00
Javi Gallego	b2ad449809	feat: refs #7027 mailError managed	2024-06-19 14:38:56 +02:00
Carlos Andrés	c596cae0c0	Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master ... Reviewed-on: #2592 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 12:22:32 +00:00
Jorge Penadés	905528a704	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6744-hotfix-showChangePass	2024-06-19 13:44:39 +02:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Pako Natek	c989cebbfc	Merge pull request '7420-supplierPackaging_ReportSource' (!2607) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2607 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-19 07:56:53 +00:00
Javi Gallego	637c6a9035	feat: refs #7216 logUnpaid	2024-06-19 09:40:24 +02:00
Pako Natek	bb496124ac	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-19 06:37:33 +00:00
Alex Moreno	f8407a83fe	Merge pull request 'fix: refs #6408 quito state.js' (!2608) from hotfix-stateFk into master ... Reviewed-on: #2608 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 06:17:30 +00:00
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +02:00
Pako Natek	1fa0a841da	TP previous	2024-06-19 07:26:30 +02:00
Pako Natek	cccc87d211	Merge pull request 'tickets deleted excluded' (!2601) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2601 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-19 05:17:58 +00:00
Pako Natek	bf62f40c87	actualizada la rama	2024-06-19 07:17:25 +02:00
Pako Natek	841f8e9cac	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 18:38:48 +00:00
Sergio De la torre	caec6c7f6f	Merge pull request 'hotFix delete unique refs #6281' (!2606) from 6281_hotFix_itemShelving into master ... Reviewed-on: #2606 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-18 17:08:40 +00:00
Sergio De la torre	ae01fb6440	hotFix delete unique refs #6281	2024-06-18 17:00:15 +02:00
Sergio De la torre	16d50ca2e5	Merge pull request '6964-hasItemOlder' (!2560) from 6964-hasItemOlder into test ... Reviewed-on: #2560 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 14:27:07 +00:00
Sergio De la torre	5694d9a9fe	Merge branch 'test' into 6964-hasItemOlder	2024-06-18 14:20:57 +00:00
Jorge Penadés	116ec6bba9	Merge pull request '#6238 use scheme' (!2604) from 6238-fix-useDb into dev ... Reviewed-on: #2604 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-18 11:20:16 +00:00
Jorge Penadés	6cf7c58671	fix: refs #6238 use scheme	2024-06-18 12:59:55 +02:00
Ivan Mas	b8b88cdb92	Merge pull request 'refs #7313 delete vn.itemPackaging.workerFk' (!2599) from 7313-Delete_vn.ticketPackaging.workerFk into dev ... Reviewed-on: #2599 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-18 10:10:49 +00:00
Ivan Mas	49943e4f25	Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk	2024-06-18 10:09:04 +00:00
Pako Natek	66ed958c72	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 09:07:24 +00:00
Guillermo Bonet	5e1bfc12f2	Merge branch 'test' into dev	2024-06-18 11:04:11 +02:00
Guillermo Bonet	a61c12a06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-18 11:04:01 +02:00
Guillermo Bonet	b7fadddbb1	Merge branch 'master' into dev	2024-06-18 11:03:56 +02:00
Guillermo Bonet	4d5f3e43ed	Merge branch 'master' into test	2024-06-18 11:03:49 +02:00
Guillermo Bonet	2b1de271a9	refs #7552 Added force vShowType true	2024-06-18 11:03:30 +02:00
Jorge Penadés	0bf0c6ce8c	Merge pull request '#6238 add travelKgPercentage table and model' (!2590) from 6238-addPercentage into dev ... Reviewed-on: #2590 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-18 08:41:29 +00:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00