22062 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Jorge Penadés	b50b1f2b13	Merge pull request '#6942 toUnbook' (!2135) from 6942-improveInvoiceIn into dev ... Reviewed-on: #2135 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-29 07:03:34 +00:00
Jorge Penadés	d35bbe5c06	Merge branch 'dev' into 6942-improveInvoiceIn	2024-05-29 07:00:17 +00:00
Pako Natek	03fa06a9fb	Merge branch 'dev' into 6021-floranet_beta	2024-05-29 06:37:44 +00:00
Pako Natek	e0d8a46cd6	nuevo enfoque recipe y manejo de errores en order_confirm	2024-05-29 08:36:18 +02:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Guillermo Bonet	f770bce54c	fix: refs #7486 Deleted get_lock collection_assign	2024-05-29 07:55:33 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Carlos Andrés	aefe6dc4f4	Merge pull request 'Hotfix payments ticket 188787' (!2521) from Hotfix-payments-Ticket-#188787 into master ... Reviewed-on: #2521 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 13:01:47 +00:00
Carlos Andrés	a022ed0854	Hotfix payments ticket 188787	2024-05-28 14:50:58 +02:00
Guillermo Bonet	7dd1ecfd67	fix: refs #6404 Version increased	2024-05-28 14:38:26 +02:00
Carlos Andrés	dc3c92eef1	Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master ... Reviewed-on: #2519 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 11:34:04 +00:00
Jorge Penadés	56407e12a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-28 13:22:33 +02:00
Jorge Penadés	44e71b303c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-28 13:14:31 +02:00
Carlos Andrés	cf84aa7256	Hotfix contabilizar DUA Ticket #188682	2024-05-28 13:01:27 +02:00
Pablo Natek	c4e08a6f14	Merge pull request 'feat: refs #6404 default weight' (!2517) from 6404-add-default-weight-and-height into master ... Reviewed-on: #2517 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-28 10:53:01 +00:00
Javi Gallego	1bcd7a9665	Merge branch 'dev' into 6408-rocketChat	2024-05-28 12:46:37 +02:00
Carlos Andrés	6e5b41a886	Hotfix contabilizar DUA Ticket #188682	2024-05-28 12:30:17 +02:00
Pablo Natek	49a243a6fd	Merge branch 'master' into 6404-add-default-weight-and-height	2024-05-28 10:24:05 +00:00
Javi Gallego	9ee05860f6	feat: #6408 tests	2024-05-28 12:19:54 +02:00
Alex Moreno	08856a9132	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-28 12:11:51 +02:00
Alex Moreno	113f210df2	Merge pull request 'deploy: dump' (!2518) from 7489-dump into master ... Reviewed-on: #2518 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-28 10:11:16 +00:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +02:00
Pablo Natek	33e823675e	feat: refs #6404 default weight	2024-05-28 10:08:15 +02:00
Alex Moreno	60ac8cf6fc	Merge pull request '7489-testToMaster' (!2515) from 7489-testToMaster into master ... Reviewed-on: #2515 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-28 05:30:18 +00:00
Jorge Penadés	7cc86d5af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 14:36:18 +02:00
Robert Ferrús	b404c7d101	Merge pull request 'test' (!2514) from test into dev ... Reviewed-on: #2514 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-27 12:11:12 +00:00
Robert Ferrús	1a96b96dd0	Merge pull request 'feat: refs #7296 fixAPPWarehouse' (!2513) from 7296-restoreExpeditionTruck into test ... Reviewed-on: #2513 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-27 12:07:13 +00:00
Robert Ferrús	f4426f5863	Merge branch 'test' into 7296-restoreExpeditionTruck	2024-05-27 12:05:49 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Guillermo Bonet	c7a324bc27	Merge branch 'test' into dev	2024-05-27 13:57:53 +02:00
Jorge Penadés	9ecba10446	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-27 13:57:35 +02:00
Guillermo Bonet	d384c5624f	refactor: refs #7486 Deleted unused debugAll	2024-05-27 13:57:27 +02:00
Guillermo Bonet	55fd94a12a	Merge branch 'test' into dev	2024-05-27 13:51:16 +02:00
Guillermo Bonet	086c2291d1	Merge branch 'master' into test	2024-05-27 13:50:59 +02:00
Guillermo Bonet	2498849ed0	hotfix: refs #7486 Added tmp debug insert	2024-05-27 13:43:55 +02:00
Jorge Penadés	1b4b8668be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 13:34:53 +02:00
Jorge Penadés	1af24e8473	fix : refs #6942 remove grafana update priv	2024-05-27 13:34:00 +02:00
Juan Ferrer	1cbcc7714e	ci: refs #7442 Version increased	2024-05-27 13:24:07 +02:00
Juan Ferrer	8fdfe8d6b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-27 12:56:15 +02:00
Juan Ferrer	586dff7f18	Merge branch 'test' into dev	2024-05-27 12:56:02 +02:00
Juan Ferrer	ab879df00f	fix(Jenkinsfile): refs #7442 Remove unused variable	2024-05-27 12:55:36 +02:00
Jorge Penadés	1671423d23	fix: refs #6942 add deleteById acl	2024-05-27 12:53:25 +02:00
Alex Moreno	992797eb86	Merge pull request 'fix traduction & e2e' (!2512) from 7292fix-teste2e into dev ... Reviewed-on: #2512 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-27 10:36:14 +00:00
Ivan Mas	745404e761	Merge pull request 'refs #7217 create travel_throwAWBError' (!2465) from 7217-Unify_errorMessageAWB into dev ... Reviewed-on: #2465 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-27 10:34:29 +00:00
Jorge Penadés	c136f2783a	refactor: refs #6942 toUnbook & drop buyer acls	2024-05-27 12:34:27 +02:00
Ivan Mas	6222d2657b	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-27 10:33:02 +00:00
Carlos Satorres	3626941c8c	fix traduction & e2e	2024-05-27 12:30:53 +02:00
Jorge Penadés	0fa6074278	fix: refs #6942 drop quotes	2024-05-27 12:03:07 +02:00
Jorge Penadés	721c31ccce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 11:57:02 +02:00