15697 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	2e020b5ebb	fix(): correct version	2023-05-04 09:02:23 +02: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
Carlos Satorres	0e0db960af	refs #5540 supplier	2023-04-28 14:23:44 +02:00
Carlos Satorres	c0deb745d6	refs #5540 arreglo en supplier	2023-04-28 14:03:21 +02:00
Carlos Satorres	38142c121d	refs #5540 mods client	2023-04-28 12:12:26 +02:00
Juan Ferrer	e70b0b22f3	refs #5517 Code clean	2023-04-28 11:43:45 +02:00
Juan Ferrer	14170286d7	Merge pull request '5517-improveLogs+translations' (!1439) from 5517-improveLogs+translations into dev ... Reviewed-on: #1439 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-28 09:35:38 +00:00
Juan Ferrer	4982fb254c	refs #5517 Final style fixes, production ready	2023-04-28 11:27:02 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Carlos Satorres	cdbbec9d36	refs #5540 validate	2023-04-28 10:21:54 +02:00
Carlos Satorres	b8f7f7bd69	refs #5540 create validateIban	2023-04-28 09:07:06 +02:00
Juan Ferrer	2cfd2d9dda	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-27 18:13:24 +02:00
Juan Ferrer	6e3e2cf798	refs #5517 Filter RC	2023-04-27 18:13:17 +02:00
Pablo Natek	7189f7dc79	Merge pull request 'refs #4795 clientGetDebt → client_getDebt' (!1442) from 4795-client_getDebt into dev ... Reviewed-on: #1442 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-27 12:58:46 +00:00
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00:00
Pablo Natek	51624882e8	Merge branch 'dev' into 4795-client_getDebt	2023-04-27 12:05:12 +00:00
Carlos Satorres	e1864fec09	arreglo json	2023-04-27 13:26:22 +02:00
Carlos Satorres	08c173acf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 12:49:01 +02:00
Carlos Satorres	d15a671359	refs #5540 traduccion	2023-04-27 11:40:42 +02:00
Carlos Satorres	07148f6c29	refs #5540 mon message	2023-04-27 11:31:26 +02:00
Alexandre Riera	7f8f65567f	Merge pull request 'fixes #5255 Revisar ticket/boxing' (!1486) from 5255-revisar-ticketBoxing into dev ... Reviewed-on: #1486 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-27 08:55:05 +00:00
Alexandre Riera	3bd5582794	Merge branch 'dev' into 5255-revisar-ticketBoxing	2023-04-27 08:42:21 +00:00