14874 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	e68afa3169	refs #5223 moved sql	2023-02-15 12:59:19 +01:00
Vicent Llopis	443118a7ac	esto se debe BORRAR	2023-02-15 12:37:31 +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
Vicent Llopis	fda428d73e	refactor: change user	2023-02-15 09:52:35 +01:00
Vicent Llopis	5ecf55a1e7	movida sql a carpeta changes actual	2023-02-15 09:51:27 +01:00
Vicent Llopis	7439b12d98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-15 09:31:20 +01:00
Vicent Llopis	df38f30f74	se incluyen los test intermintents que estaban incluidos	2023-02-15 09:10:55 +01: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
Pau	9839fc3d94	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 12:40:47 +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
Pau	6a732819ba	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 09:58:10 +00: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
Alexandre Riera	bfc21a7c97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-13 13:36:58 +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	4c7aae95aa	refs #5172 added default icon	2023-02-13 13:04:22 +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
Pau	294b4acbe2	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-13 06:03:21 +00:00
Joan Sanchez	2f2658d8b2	Merge pull request 'hotfix_intrastat' (!1321) from hotfix_intrastat into master ... Reviewed-on: #1321	2023-02-10 11:21:21 +00:00
Vicent Llopis	ac3faddac1	fix: actulizada sql intrastat y se muestra solamente cuando toca	2023-02-10 12:09:51 +01:00
Alexandre Riera	6cb815faaf	.	2023-02-10 10:13:41 +01:00
Vicent Llopis	e61af5286b	fix: actualizada sql intrastat	2023-02-10 10:10:48 +01:00
Alex Moreno	d715f5ab7b	Merge pull request 'MASTER_fix(client-debt-statment): typo' (!1319) from hoFix_client-debt-statment_typo into master ... Reviewed-on: #1319	2023-02-10 09:05:34 +00:00
Alex Moreno	d8acf45e0d	fix(client-debt-statment): typo	2023-02-10 09:34:42 +01:00
Alexandre Riera	4787de3df5	fixing merge	2023-02-10 09:04:49 +01:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	9dc07d88d6	fixing e2e	2023-02-10 08:56:30 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Vicent Llopis	5b22096567	refactor: actuializada consulta par obtener los clientes a facturar. Excluido impresion pdfs de la transaccion	2023-02-09 14:57:08 +01:00
Alex Moreno	a094eedfe3	Merge pull request 'fix(delivery-note_report): fix taxes' (!1318) from hotFix_delivery-note-report into master ... Reviewed-on: #1318	2023-02-09 13:02:39 +00:00
Alex Moreno	0529d56d4e	fix(delivery-note_report): fix taxes	2023-02-09 13:30:52 +01:00