14630 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	d869cccdb9	add changelog	2023-02-17 10:39:12 +01:00
Vicent Llopis	5285ad9242	move sql changes	2023-02-17 10:19:12 +01:00
Joan Sanchez	a59dac2b9f	Added version 230801	2023-02-17 10:12:29 +01:00
Vicent Llopis	4001a75916	Merge branch 'dev' into 5180-invoice-out_refund	2023-02-17 08:57:48 +00:00
Vicent Llopis	af92aa60e9	Merge pull request '5097-item.summary_available' (!1312) from 5097-item.summary_available into dev ... Reviewed-on: #1312 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-17 08:54:22 +00:00
Vicent Llopis	874f459956	refactor: borrada variable innecesaria	2023-02-17 09:49:47 +01:00
Vicent Llopis	d25ebaec0b	Merge branch 'dev' into 5097-item.summary_available	2023-02-17 08:47:56 +00:00
Alexandre Riera	c5fc4e4b81	Merge pull request 'hotFix #5194 cambios ticketFutureAdvance' (!1320) from 5194-cambios-ticketFutureAdvance into master ... Reviewed-on: #1320	2023-02-16 14:05:43 +00:00
Alexandre Riera	4cae4448f6	refs #5194 moved invoiceOut to 230402	2023-02-16 14:45:11 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Alexandre Riera	ef12a428cd	Merge pull request 'hotFix #5223 Mostrar cliente compensado al enviar email' (!1327) from 5223-cliente-compensado into master ... Reviewed-on: #1327	2023-02-16 13:40:33 +00:00
Alexandre Riera	ec16a0d66c	Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:35:33 +01:00
Alexandre Riera	457fd3f5f9	refs #5194 sql moved to 230404	2023-02-16 14:35:03 +01:00
Joan Sanchez	3031ae2511	Updated version	2023-02-16 14:28:33 +01:00
Joan Sanchez	acf5981a5f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-16 14:20:05 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	3096738b84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-16 09:52:18 +01:00
Vicent Llopis	76f2030125	feat: add update sql	2023-02-16 09:50:25 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	dc2ab50f65	fix: test e2e	2023-02-16 09:44:06 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Alexandre Riera	dca5ae0f72	refs #5223 added params	2023-02-15 13:14:52 +01:00
Alexandre Riera	e68afa3169	refs #5223 moved sql	2023-02-15 12:59:19 +01:00
Alex Moreno	80b3588b37	Merge pull request 'feat: create post route for debug' (!1315) from 5094-application_post into test ... Reviewed-on: #1315 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-15 09:53:55 +00:00
Alex Moreno	9ec75a5af3	Merge branch 'test' into 5094-application_post	2023-02-15 09:19:39 +00:00
Joan Sanchez	d4cecb9c25	Merge pull request 'refs #4965 Added routeFk' (!1251) from 4965-collection-label-add-routeFk into dev ... Reviewed-on: #1251 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-15 07:53:28 +00:00
Alexandre Riera	3c2a6801fb	Merge pull request 'fixes #4588 Que al cambiar el campo nota quite el ultimo usuario' (!1222) from 4588-campo-nota-ultimo-usuario into dev ... Reviewed-on: #1222 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-14 13:06:22 +00:00
Alexandre Riera	936b3ad0b9	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-02-14 12:28:36 +00:00
Alexandre Riera	7194e62cae	refs #4588 faked observationEditorFk in structure	2023-02-14 13:28:21 +01:00
Alex Moreno	989b1ea3fe	Merge pull request 'fix(boot_date): Date.vnUTC return new Date()' (!1328) from fix_Date_vnUTC into dev ... Reviewed-on: #1328 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-14 12:27:17 +00:00
Alex Moreno	a507f7e8fb	fix(boot_date): Date.vnUTC return new Date()	2023-02-14 13:17:56 +01:00
Alexandre Riera	7876d4611c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado	2023-02-14 12:44:03 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Vicent Llopis	a5a0256e44	feat: añadido parametro que indica si genera uno o multiples ticket de abono	2023-02-14 10:58:41 +01:00
Alexandre Riera	7d5591462d	refs #4588 entry sql	2023-02-14 09:08:49 +01:00
Alexandre Riera	b1a6713a3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-14 09:04:08 +01:00
Alexandre Riera	350b572007	Merge pull request 'fixes #5152 Ticket/basic-data/step-two' (!1314) from 5152-ticketBasicData-stepTwo into dev ... Reviewed-on: #1314 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-14 07:25:43 +00:00
Alexandre Riera	139dac0bc1	refs #4588 moved hook from entryObservation to entry	2023-02-14 08:08:48 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00
Alexandre Riera	f6ec6da1c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 13:48:12 +01:00
Alex Moreno	bb23f8d9e9	Merge pull request 'fix: conflicts' (!1324) from fix_test_into_dev into dev ... Reviewed-on: #1324 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-02-13 12:33:12 +00:00
Alex Moreno	839d4986f1	Merge branch 'dev' into fix_test_into_dev	2023-02-13 12:25:12 +00:00
Alex Moreno	65df9b87e7	fix: conflicts	2023-02-13 13:22:53 +01:00
Alexandre Riera	54ad373c5e	Merge branch 'master' into 5194-cambios-ticketFutureAdvance	2023-02-13 09:30:47 +00:00
Alexandre Riera	76ed4d2d4b	refs #5194 fixed tests	2023-02-13 10:16:28 +01:00
Vicent Llopis	c2735e54a0	Merge pull request '2952-ticket.sale-tracking_part2' (!1310) from 2952-ticket.sale-tracking_part2 into dev ... Reviewed-on: #1310 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-13 07:17:25 +00:00
Vicent Llopis	4da8546bdf	Merge branch 'dev' into 2952-ticket.sale-tracking_part2	2023-02-13 07:14:28 +00:00
Joan Sanchez	8a8f535776	Merge pull request 'Fixes #5181 Ticket.summary-recargo' (!1297) from 5181-ticket.summary-recargo into dev ... Reviewed-on: #1297 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-13 07:02:30 +00:00
Alexandre Riera	a7e9e52ad4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 07:34:13 +01:00