14872 Commits

All Branches

Search

Author	SHA1	Message	Date
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	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Vicent Llopis	4567981724	add console.log	2023-03-01 09:09:09 +01: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
Vicent Llopis	f6afed485c	add console.log	2023-03-01 08:50:30 +01:00
Vicent Llopis	07784ffbfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest2	2023-03-01 08:46:26 +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	d2e7526a09	Merge pull request 'hotfix isTrucker was not in the params' (!1350) from hotfix-supplier-isTrucker into master ... Reviewed-on: #1350	2023-02-28 13:58:02 +00:00
Guillermo Bonet	15f2f46e4c	refs #4975 Traduction no branch	2023-02-28 14:48:17 +01:00
Alexandre Riera	4d6a770b26	Merge branch 'master' into hotfix-supplier-isTrucker	2023-02-28 13:39:45 +00:00
Guillermo Bonet	3afdee9a75	Merge pull request '4975-mdbUploadFixes' (!1349) from 4975-mdbUploadFixes into master ... Reviewed-on: #1349	2023-02-28 13:39:25 +00:00
Alexandre Riera	3dd6232d6a	hotfix isTrucker was not in the params	2023-02-28 14:39:01 +01:00
Guillermo Bonet	656685cd7e	refs #4975 Minor changes	2023-02-28 14:35:34 +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
Juan Ferrer	9336d20e45	refs #4975 MdbVersion/upload fixes & code clean	2023-02-28 13:45:36 +01: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	698a3396fc	refs #5063 deleted changes in item hook	2023-02-24 10:40:24 +01:00
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
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
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00