22616 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	3c71764529	Merge branch 'master' into 6264_log_tmp_renewToken	2024-06-20 21:29:58 +00:00
Javier Segarra	ba48d93c1e	perf(salix): refs #6264 #6264 remove save token as debug row	2024-06-20 23:28:11 +02:00
Carlos Andrés	f7b8bd2df6	Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-20 18:18:05 +02:00
Carlos Andrés	ed49c98c1c	fnpmeat: previas con sitema de reservas refs #6861	2024-06-20 18:18:03 +02:00
Carlos Andrés	9565bc1d77	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2623) from 7595-sincro-sage into master ... Reviewed-on: #2623 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 15:33:18 +00:00
Carlos Andrés	68f48de6f0	feat: sincro client supplier sage refs #7595	2024-06-20 17:14:38 +02:00
Sergio De la torre	9b0913e439	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-20 14:36:25 +00:00
Sergio De la torre	833a7c87db	feat boxPicking refs #7357	2024-06-20 16:26:56 +02: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
Javier Segarra	bfb6689835	test: add CALL util.debugAdd	2024-06-20 15:15:56 +02:00
Javier Segarra	31a75956c0	feat: add CALL util.debugAdd	2024-06-20 15:15:51 +02: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
Robert Ferrús	4b58afadae	Merge branch '195937-icoterms' of https://gitea.verdnatura.es/verdnatura/salix into 195937-icoterms	2024-06-20 14:03:34 +02:00
Robert Ferrús	8fc231da2f	feat: refs #195937	2024-06-20 14:03:31 +02:00
Robert Ferrús	72fd806750	Merge branch 'master' into 195937-icoterms	2024-06-20 11:49:09 +00:00
Robert Ferrús	852785b4c1	fix: refs #195937 refactor incoterms	2024-06-20 13:45:38 +02: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
Sergio De la torre	182cd3fa8e	feat boxPicking refs #7357	2024-06-20 11:34:51 +02:00
Robert Ferrús	46792ba30e	fix: refs #195937 changes requerid	2024-06-20 11:04:42 +02: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
Sergio De la torre	c1c01df3c3	feat itemShelving_filterBuyer refs #7023	2024-06-20 09:37:22 +02:00
Robert Ferrús	5a40952547	fix: refs #195937 icoterms	2024-06-20 09:34:13 +02:00
Sergio De la torre	c87f060d51	feat boxPicking refs #7357	2024-06-20 09:21:27 +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
Alex Moreno	7a0d107943	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 12:43:43 +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
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Pako Natek	b117352e1a	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-19 10:31:36 +00: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
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Pako Natek	49e01218e9	Warehouse name	2024-06-19 10:45:37 +02: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