15666 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	b43f1dacf2	refs #4764 es	2023-05-08 08:50:19 +02:00
Carlos Satorres	0acb7906cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-05-08 08:33:37 +02:00
Juan Ferrer	a51481c00e	Merge pull request 'refs #5517 Fix e2e' (!1502) from 5517-e2eFix into dev ... Reviewed-on: #1502	2023-05-05 13:33:45 +00:00
Carlos Satorres	3d195bddb9	refs #4764 mod model post	2023-05-05 14:39:46 +02:00
Juan Ferrer	6f5c5963d0	refs #5517 fdescribe removed	2023-05-05 13:03:01 +02:00
Juan Ferrer	bfae4940f5	Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix	2023-05-05 13:00:48 +02:00
Juan Ferrer	ea5b032b40	refs #5517 Travel create E2E fixes	2023-05-05 13:00:45 +02:00
Alex Moreno	030cedbb3c	amend	2023-05-05 12:24:03 +02:00
Alex Moreno	0f08ea1852	Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix	2023-05-05 12:22:40 +02:00
Alex Moreno	ea3110dc2e	refs #5517 test(e2e): fix ticket future and advance	2023-05-05 12:22:36 +02:00
Alex Moreno	c5dcc39375	refs #5517 test(e2e): fix ticket future and advance	2023-05-05 12:20:41 +02:00
Carlos Satorres	c0e13d3339	refs #4754 del ticket.card.service	2023-05-05 12:00:37 +02:00
Carlos Satorres	80ee73a59b	refs #4764 creacion de métodos y back	2023-05-05 10:01:15 +02:00
Carlos Satorres	8119d38414	Merge branch 'dev'	2023-05-05 09:35:39 +02:00
Juan Ferrer	805e678ca7	Merge branch 'dev' into 5517-e2eFix	2023-05-05 08:14:13 +02:00
Juan Ferrer	4a84961c19	refs #5517 Removed focus from test	2023-05-05 08:13:06 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Carlos Satorres	8578e3ca49	Merge pull request 'refs #5090 mod golabel' (!1496) from 5090-modGolLabel into dev ... Reviewed-on: #1496 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-04 08:46:31 +00:00
Carlos Satorres	cfc02cd669	Merge branch 'dev' into 5090-modGolLabel	2023-05-04 08:20:04 +00:00
Juan Ferrer	677764f302	refs #5517 Fix e2e	2023-05-04 10:00:21 +02:00
Alex Moreno	9030aea17c	Merge pull request 'fix(client): use account setPassword' (!1500) from client_use_account_setPassword into dev ... Reviewed-on: #1500 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-04 07:38:09 +00:00
Alex Moreno	1fa5926c17	Merge branch 'dev' into client_use_account_setPassword	2023-05-04 07:06:44 +00:00
Alexandre Riera	e93b1cba63	Merge pull request 'fixes #4713 ENC - Modificar como se generan los avisos de cambios de cantidades al encajar' (!1374) from 4713-saleTracking into dev ... Reviewed-on: #1374 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-04 07:04:55 +00:00
Alexandre Riera	a2d3b79246	Merge branch 'dev' into 4713-saleTracking	2023-05-04 06:42:39 +00:00
Alex Moreno	b64f6d8489	Merge pull request 'refs #4617 use temporary instead of vn' (!1451) from 4617-use_tmp_in_ticketToInvoice into dev ... Reviewed-on: #1451 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-04 05:07:18 +00:00
Alex Moreno	b2027fddf3	fix(client): use account setPassword	2023-05-03 14:56:14 +02:00
Alex Moreno	a712c0a303	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 12:51:10 +00:00
Juan Ferrer	4c0f59399b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-03 11:57:16 +02:00
Juan Ferrer	bbd2137e57	refs #5517 Avatar componetized	2023-05-03 11:57:13 +02:00
Alex Moreno	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Carlos Satorres	2467534d1f	refs #5090 mod golabel	2023-05-03 09:23:16 +02:00
Carlos Satorres	34a9b3768c	Merge pull request '5316-kkeoEntryNotes' (!1449) from 5316-kkeoEntryNotes into dev ... Reviewed-on: #1449 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-03 06:33:55 +00:00
Carlos Satorres	3f9d711f90	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-03 06:24:04 +00:00
Juan Ferrer	a029071c4e	refs #5517 User image fixes	2023-05-02 20:47:56 +02:00
Juan Ferrer	0ed6fe3d32	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-02 17:17:18 +02:00
Juan Ferrer	a5c11a0154	refs #5517 Hide worker image on error	2023-05-02 17:17:16 +02:00
Carlos Satorres	17425a627c	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-02 11:25:17 +00:00
Alex Moreno	88b4abc2d2	Merge pull request 'solve' (!1495) from fdescribe03-fiscal-data into dev ... Reviewed-on: #1495 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-02 10:22:46 +00:00
Carlos Satorres	ca2ab8d7b2	Merge branch 'dev' into fdescribe03-fiscal-data	2023-05-02 10:18:48 +00:00
Alex Moreno	306d73eb69	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 09:42:56 +00:00
Carlos Satorres	754c5488bf	Merge pull request '5540-validarSupplierIsVies' (!1438) from 5540-validarSupplierIsVies into dev ... Reviewed-on: #1438 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-02 09:29:08 +00:00
Carlos Satorres	ea73e7697d	solve	2023-05-02 11:27:25 +02:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Carlos Satorres	5436eec63e	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-05-02 10:00:50 +02:00
Carlos Satorres	8156c17c7d	refs #5540 del jasmine	2023-05-02 10:00:47 +02:00
Carlos Satorres	d9aae670f7	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-05-02 06:07:17 +00:00
Juan Ferrer	ddec9fe406	refs #5517 Set tests timezone	2023-04-28 19:53:13 +02:00
Juan Ferrer	eb2c2b386a	refs #5517 Duplicated pagination removed	2023-04-28 19:48:36 +02:00
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Carlos Satorres	fb59371d54	refs #5540 quit logs	2023-04-28 14:38:49 +02:00