17333 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	404acdab6f	refs #5638 fix: solucionado problema con el limit	2023-05-04 14:51:47 +02:00
Alexandre Riera	5cdec35ed4	refs #5513 addFromPackaging.spec.js	2023-05-04 14:30:10 +02:00
Alexandre Riera	8ae5a0de0f	refs #5513 adding backs and models	2023-05-04 12:03:47 +02:00
Alex Moreno	a22a8a6bd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-04 11:34:19 +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
Carlos Satorres	49233eefcd	refs #5580 add button, yml	2023-05-04 10:18:37 +02:00
Juan Ferrer	677764f302	refs #5517 Fix e2e	2023-05-04 10:00:21 +02:00
Alexandre Riera	54eb0fc7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-05-04 09:59:05 +02:00
Alexandre Riera	b3100d2653	refs #5595 remove OkPackets from logIn and logOut	2023-05-04 09:55:36 +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
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	5eca583c62	refs #5472 feat(vnUser): override setPassword	2023-05-03 15:19:19 +02: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
Alexandre Riera	ad3c6dcee2	wip #5595	2023-05-03 14:34:36 +02:00
Carlos Satorres	dbd0e5138b	refs #5328 fix	2023-05-03 14:12:26 +02:00
Carlos Satorres	5aaef31562	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket	2023-05-03 14:07:29 +02:00
Carlos Satorres	3ac1ce403c	refs #5328 myOptions	2023-05-03 14:06:57 +02:00
Carlos Satorres	566f03c497	refs #5328 commit prueba	2023-05-03 13:03:14 +02:00
Carlos Satorres	3b2e1ca8d5	ref #5328 refundTicket.id	2023-05-03 12:36:30 +02:00
Carlos Satorres	eaf425fb51	refs #5328 mod funcion createTicketRefund	2023-05-03 12:30:33 +02: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
Alex Moreno	bf3aac70f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-03 11:37:07 +02: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
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +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	48be8b9fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-02 11:27:14 +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
Javi Gallego	659d76f022	Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master ... Reviewed-on: #1493 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-01 19:23:00 +00:00
Javi Gallego	ed6b2cf25b	refs #5615	2023-05-01 14:57:50 +02:00