13336 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	c9cb1503dc	update node	2022-11-03 10:03:16 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alex Moreno	d03504814e	Merge pull request 'MASTER-delete package-lock' (!1122) from 4699-MASTER_fix-checkInbox2 into master	2022-11-03 08:30:09 +00:00
Alex Moreno	884d4ce579	delete package-lock	2022-11-03 09:27:57 +01:00
Alexandre Riera	4de1695ef4	Merge pull request 'refs #4650 observaciones añadidas' (!1105) from 4650-observaciones-albaranes into dev ... Reviewed-on: #1105 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 08:06:53 +00:00
Alexandre Riera	d1636376d8	Merge branch 'dev' into 4650-observaciones-albaranes	2022-11-03 08:03:59 +00:00
Alexandre Riera	a9bf9fb844	Merge pull request 'refs #4644 checkbox añadido' (!1108) from 4644-supplier.fiscal-data into dev ... Reviewed-on: #1108 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-03 08:01:33 +00:00
Alexandre Riera	6663b600a7	Merge branch 'dev' into 4644-supplier.fiscal-data	2022-11-03 07:54:06 +00:00
Alex Moreno	aa467dd565	Merge pull request '4159-tableQ_filter' (!1069) from 4159-tableQ_filter into dev ... fixes #4159	2022-11-03 07:52:21 +00:00
Alex Moreno	e370f20cec	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:49:18 +00:00
Alexandre Riera	3376f301b1	Merge branch 'dev' into 4644-supplier.fiscal-data	2022-11-03 07:49:02 +00:00
Joan Sanchez	46aafef965	Merge pull request '4548-invoiceIn-pdf' (!1113) from 4548-invoiceIn-pdf into dev ... Reviewed-on: #1113 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 07:48:40 +00:00
Alex Moreno	12df808844	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:43:14 +00:00
Joan Sanchez	254a56cd78	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 07:42:41 +00:00
Alexandre Riera	06f9cf8a40	Merge pull request 'refs #2818 sincronización quitada en test' (!1120) from 2818-sincronizar-usuarios into dev ... Reviewed-on: #1120 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-03 07:41:17 +00:00
Alex Moreno	d100ab4112	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:39:47 +00:00
Joan Sanchez	009e9e3bb7	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 07:35:02 +00:00
Alexandre Riera	8304c849e4	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-03 07:34:49 +00:00
Alexandre Riera	61e1f3350c	Merge pull request 'refs #4645 valores ref cambiados' (!1109) from 4645-refactor-entry.ref into dev ... Reviewed-on: #1109 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 07:33:58 +00:00
Alexandre Riera	4be3106245	Merge branch 'dev' into 4645-refactor-entry.ref	2022-11-03 07:29:49 +00:00
Alexandre Riera	0736fb4818	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-03 07:28:47 +00:00
Alexandre Riera	868218096b	Merge pull request 'refs #4497 servicios añadidos' (!1117) from 4497-services-intrastat into dev ... Reviewed-on: #1117 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 07:27:13 +00:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Alexandre Riera	b73fe06043	Merge branch 'dev' into 4497-services-intrastat	2022-11-03 07:22:57 +00:00
Alex Moreno	6d85cf7cf5	translations	2022-11-03 08:21:03 +01:00
Alexandre Riera	e1eeb81696	refs #2596 tabulación y css	2022-11-03 08:18:24 +01:00
Alex Moreno	64f1ce7b3a	Merge pull request 'MASTER: 4699-fix(checkInbox): fix condition' (!1121) from 4699-MASTER_fix-checkInbox into master	2022-11-03 07:14:51 +00:00
Alexandre Riera	84eb87e02a	refs #4547 cambios sql	2022-11-03 08:08:24 +01:00
Alex Moreno	67697784cd	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 06:48:38 +00:00
Pau	01db77271a	Merge pull request 'deleted the test as requested on #1885' (!1112) from 1885-delete-orderConfirmUser.spec.js into dev ... Reviewed-on: #1112 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 06:37:12 +00:00
Pau	30fb8b1bd2	Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js	2022-11-03 06:30:47 +00:00
Vicent Llopis	35c50cb314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 07:11:54 +01:00
Vicent Llopis	3e1859efba	Merge pull request '3852-client.search-panel2' (!1111) from 3852-client.search-panel2 into dev ... Reviewed-on: #1111 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-03 06:07:46 +00:00
Juan Ferrer	dc2b61a0a4	Merge branch 'dev' into 2818-sincronizar-usuarios	2022-11-02 15:20:11 +00:00
Alexandre Riera	908908a643	refs #4547 correcciones	2022-11-02 15:54:23 +01:00
Vicent Llopis	f96fc0f91e	Merge branch 'dev' into 3852-client.search-panel2	2022-11-02 14:13:41 +00:00
Vicent Llopis	0c73391565	Merge pull request '3095-item.shelving' (!1102) from 3095-item.shelving into dev ... Reviewed-on: #1102 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 14:12:53 +00:00
Alex Moreno	621158badc	fix(checkInbox): fix condition	2022-11-02 15:11:36 +01:00
Vicent Llopis	8c4e70c11d	Merge branch 'dev' into 3095-item.shelving	2022-11-02 14:06:06 +00:00
Vicent Llopis	abec6ae04d	Merge pull request '3811-ticket.sale_updatePrice' (!1099) from 3811-ticket.sale_updatePrice into dev ... Reviewed-on: #1099 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 14:03:51 +00:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Vicent Llopis	b2cfcab569	Merge pull request '3888-ticket.expedition_moveExpedition' (!1097) from 3888-ticket.expedition_moveExpedition into dev ... Reviewed-on: #1097 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-02 13:54:08 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	c01b1c06a7	Merge pull request '4616-ticket.sale_mana' (!1088) from 4616-ticket.sale_mana into dev ... Reviewed-on: #1088 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 13:48:18 +00:00
Vicent Llopis	7eaafa36a0	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 13:42:26 +00:00
Alex Moreno	943103c254	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 13:33:45 +00:00
Vicent Llopis	04f165d901	solved conflits	2022-11-02 14:23:35 +01:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Vicent Llopis	57564325e1	feat: añadidas opciones para confirmar o no confirmar el registro de horas	2022-11-02 14:22:18 +01:00