16759 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e019ab4160	deploy(232001): add changes folder, package and changelog	2023-05-08 12:40:52 +02:00
Alex Moreno	dde62f8971	Merge pull request '231801_dev_to_test' (!1501) from 231801_dev_to_test into test ... Reviewed-on: #1501 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-08 10:29:06 +00:00
Alex Moreno	90465c275a	correct folder	2023-05-08 12:21:20 +02:00
Alex Moreno	ad3c34bd35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test	2023-05-08 12:08:00 +02:00
Alex Moreno	ebbc860ba3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 12:03:53 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +02:00
Alex Moreno	7273dd4f1e	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-08 08:56:06 +00:00
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00
Carlos Satorres	96b5749e1e	refs #5297 cambio actual	2023-05-08 10:17:35 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02:00
Alexandre Riera	a2055d35fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-08 09:48:09 +02:00
Alexandre Riera	372b9a2ce2	refs #5513 test getItemsPackaging	2023-05-08 09:46:56 +02:00
Alexandre Riera	d21b949ffb	refs #5513 fix getItemsPackaging	2023-05-08 09:18:53 +02:00
Carlos Satorres	7e63bc0004	refs #5297 quit fdescribe	2023-05-08 09:18:22 +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
Alex Moreno	728ef965c4	refs #5472 feat(out_login): change-password	2023-05-05 14:50:20 +02:00
Alex Moreno	8423968013	Merge branch '5488-use_checkAccessAcl' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:13:13 +02:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Alex Moreno	6b4b8565f9	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-05 11:58:57 +00:00
Alex Moreno	97da5e6e24	refs #5488 feat(isRoleAdvanced): use Acl instead of method	2023-05-05 13:58:11 +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
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
Alex Moreno	2da4289695	refs #5472 feat(vn-user): override change-password & set-password	2023-05-04 15:01:29 +02:00
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