14685 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	84dc95621d	Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev ... Reviewed-on: #1348 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:30:17 +00:00
Joan Sanchez	d819a13597	Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev ... Reviewed-on: #1353 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:28:01 +00:00
Joan Sanchez	bc30fffc2d	Merge pull request 'refs #5193 ticketCreateWithUser to ticket_add' (!1358) from 5193-ticketCreateWithUser__ into dev ... Reviewed-on: #1358 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:25:02 +00:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Vicent Llopis	2f9e9ada43	Merge branch 'dev' into 5240-ticket.sale-tracking	2023-03-01 10:58:49 +00:00
Alexandre Riera	c47f64519d	Merge pull request 'fixes #5160 Error Test Back Jenkins' (!1355) from 5160-testsBack-jenkins into dev ... Reviewed-on: #1355 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-01 09:31:11 +00:00
Alexandre Riera	680d0ba0a1	Merge branch 'dev' into 5160-testsBack-jenkins	2023-03-01 09:18:24 +00:00
Vicent Llopis	01519ec0fb	Merge pull request '4849-supplier-isVies' (!1329) from 4849-supplier-isVies into dev ... Reviewed-on: #1329 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-03-01 09:17:45 +00:00
Alexandre Riera	314c5c27eb	refs #5149 changelog	2023-03-01 09:09:05 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +01:00
Alexandre Riera	fb940fff52	.	2023-03-01 08:31:45 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Vicent Llopis	8a1a7d7159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking	2023-03-01 08:20:28 +01:00
Alexandre Riera	6eab4bbe94	refs #5149 fixing tests	2023-03-01 08:15:58 +01:00
Vicent Llopis	da6e29056e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-03-01 08:08:23 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Alexandre Riera	85b1ca4a02	Merge pull request 'fixes #5287 Añadir campo Locker (Taquilla) en Worker/Basic Data y crear nueva sección Worker/PDA' (!1347) from 5287-worker-locker-pda into dev ... Reviewed-on: #1347 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-28 12:55:35 +00:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	d5ea59e284	refs #5287 permisos añadidos	2023-02-28 12:46:48 +01:00
Alexandre Riera	5ccfe6bf90	refs #5160 callback added	2023-02-28 11:19:41 +01:00
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +01:00
Alexandre Riera	7a04b0b3de	refs #5287 icon added	2023-02-28 08:00:18 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5b7306a9ca	refs #5287 f describe	2023-02-27 08:41:27 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Joan Sanchez	1bc715cde5	Updated claim state field	2023-02-24 14:32:56 +01:00
Alexandre Riera	335f259eba	Merge pull request 'fixes #5172 Mostrar Impagado en el descriptor de Client' (!1323) from 5172-cliente-impagado into dev ... Reviewed-on: #1323 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-24 09:40:59 +00: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	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
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
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
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
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