15020 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	9da3593dff	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-24 10:37:38 +01:00
Alexandre Riera	6d6fa11da1	refs #5063 fixed front test	2023-02-24 10:37:35 +01:00
Alexandre Riera	113b37e56f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-24 09:25:44 +00:00
Alexandre Riera	afb14044cc	refs #5063 deleted item checked in image, added front test	2023-02-24 10:25:08 +01:00
Alexandre Riera	ed7f3f5d63	Merge branch 'dev' into 5172-cliente-impagado	2023-02-24 08:34:41 +00:00
Alexandre Riera	e7e7fef285	Merge pull request 'fixes #5168 Mostrar instance-log en Ticket/Sale solo cuando haya registros' (!1341) from 5168-mostrar-instanceLog into dev ... Reviewed-on: #1341 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-24 08:34:16 +00:00
Alexandre Riera	6a65c9f0e2	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:22:45 +00:00
Alex Moreno	36651aa423	Merge pull request '4998-claim_photos_back' (!1343) from 4998-claim_photos_back into dev ... Reviewed-on: #1343 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-24 08:15:35 +00:00
Alexandre Riera	4682497df9	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:08:20 +00:00
Alex Moreno	bd225e6824	Merge branch 'dev' into 4998-claim_photos_back	2023-02-24 07:59:28 +00:00
Joan Sanchez	788e5488ae	Merge branch 'dev' into 5115-transfer_sales	2023-02-24 07:58:26 +00:00
Alexandre Riera	6590c6f1fa	refs #5036 transferSales also transfer sale's logs	2023-02-24 08:55:04 +01:00
Joan Sanchez	fafbfed189	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-24 07:23:38 +01:00
Alexandre Riera	afef2e4d63	Merge pull request 'hotfix Balance crear pago' (!1345) from hotfix-balance-crearPago into master ... Reviewed-on: #1345	2023-02-24 06:04:00 +00:00
Alexandre Riera	bca9e757d4	hotfix parsed description array to string	2023-02-23 15:52:47 +01:00
Carlos Andrés	ffdfd1a7e5	refs #5000 Invoicing change structure	2023-02-23 14:48:21 +01:00
Vicent Llopis	9b11987d75	feat: desaparecen los botones para las semanas que no tienen registros	2023-02-23 14:33:38 +01:00
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00
Vicent Llopis	9310e92223	refactor	2023-02-23 10:44:08 +01:00
Carlos Andrés	7f60335a91	refs #5000 Invoicing: front tests refactor & fixes	2023-02-23 09:45:15 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Carlos Andrés	01ade6eb03	refs #5000 Merge with dev	2023-02-23 09:23:06 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Vicent Llopis	35b47c6da2	refactor code	2023-02-23 08:21:59 +01:00
Alexandre Riera	4de49a9155	Merge pull request 'fixes #5235 Error mensaje: Cambios sin guardar' (!1342) from 5235-cambios-sin-guardar into dev ... Reviewed-on: #1342 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-23 06:45:58 +00:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Alex Moreno	8597497429	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back	2023-02-22 14:31:31 +01:00
Vicent Llopis	a93fb2c69f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-22 14:29:29 +01:00
Alexandre Riera	3a3dcc941b	Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-22 14:24:33 +01:00
Alexandre Riera	0263a4833e	refs #5172 added changelog	2023-02-22 14:24:31 +01:00
Alexandre Riera	ca1f5480ae	refs #5235 added setClientSample(), fixed tests	2023-02-22 13:04:27 +01:00
Alexandre Riera	b9b2a40199	refs #5168 fixed e2e	2023-02-22 12:52:54 +01:00
Alexandre Riera	42b8f08a4d	refs #5168 checked sales with logs	2023-02-22 12:14:17 +01:00
Alexandre Riera	be8d19a9f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-22 09:27:38 +01:00
Vicent Llopis	c8c48ea175	feat: colorar numeros de semanas segun el registro de horas	2023-02-21 15:16:28 +01:00
Joan Sanchez	0997f8cd27	Merge pull request 'feat: add console.log' (!1340) from post_add_consoleLog into test ... Reviewed-on: #1340 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-21 13:58:10 +00:00
Joan Sanchez	ce68301885	Merge pull request 'Imported production database' (!1338) from 5192-db_export into dev ... Reviewed-on: #1338 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-21 13:53:36 +00:00
Alex Moreno	f0827c992b	feat: add console.log	2023-02-21 14:53:35 +01:00
Joan Sanchez	3d8add4d6f	Merge branch 'dev' into 5192-db_export	2023-02-21 13:12:27 +00:00
Joan Sanchez	3177573c4d	Removed invalid dash character	2023-02-21 14:12:06 +01:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Joan Sanchez	71167ffa1f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-21 14:02:25 +01:00
Joan Sanchez	49c2ec7f9a	fix(image): Enabled failOn option ... Refs: #5266	2023-02-21 14:01:12 +01:00
Vicent Llopis	1c1e4cc176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-21 13:37:53 +01:00
Vicent Llopis	a6dbc64ef6	Merge pull request 'hotfix_item.getVisible&Available' (!1339) from hotfix_item.getVisible&Available into test ... Reviewed-on: #1339 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-21 12:04:27 +00:00
Vicent Llopis	c30242f9cc	fix: front test	2023-02-21 12:17:16 +01:00
Joan Sanchez	65a251ab03	Updated e2e	2023-02-21 11:59:53 +01:00
Vicent Llopis	eda70b009b	fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto	2023-02-21 11:48:56 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00