17173 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	4d333c3a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-05 10:38:59 +02:00
Carlos Satorres	d6cde764d7	refs #5334 changelog	2023-06-05 10:38:08 +02:00
Vicent Llopis	5eac9d20dc	a	2023-06-05 09:43:39 +02:00
Vicent Llopis	b253ea8edf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-06-05 09:40:23 +02:00
Alexandre Riera	15b5f10a93	refs #5513 addFromBuy back added	2023-06-05 09:10:19 +02:00
Carlos Satorres	8afd149954	Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 09:06:45 +02:00
Carlos Satorres	2545a40087	Merge branch 'dev' into 5334-editDepartment	2023-06-05 07:00:27 +00:00
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00
Carlos Satorres	d8f5978284	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 08:30:12 +02:00
Carlos Satorres	c1cda1a3ff	refs #5334 basicData e2e	2023-06-05 08:29:56 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Carlos Satorres	9ef51f5600	remove fdescribe puppeter	2023-06-05 07:55:53 +02:00
Carlos Satorres	5798b28c5e	refs #5334 baicData e2e	2023-06-05 07:51:15 +02:00
Juan Ferrer	47c6ad6a71	refs #5667 Translation fix	2023-06-02 15:48:27 +02:00
Juan Ferrer	45eba4533a	refs #5667 VnUser translation added	2023-06-02 15:47:45 +02:00
Juan Ferrer	5be79bbdef	refs #5667 VnUser translations added	2023-06-02 15:31:36 +02:00
Alex Moreno	86cd5f5237	refs #5472 fix sync	2023-06-02 15:07:02 +02:00
Carlos Satorres	1095a59954	refs #5334 rest back, e2e summary, less e2e basic	2023-06-02 14:44:56 +02:00
Juan Ferrer	35cf48314a	refs #4090 back memory limit increased because of pupeteer	2023-06-02 13:51:26 +02:00
Vicent Llopis	67413360c6	refs #5561 feat: utilizar métodos bd	2023-06-02 13:31:41 +02:00
Vicent Llopis	1408e5f5ad	Merge pull request 'hotfix_sendMail' (!1587) from hotfix_sendMail into master ... Reviewed-on: #1587 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-06-02 10:39:17 +00:00
Vicent Llopis	01175a4c6c	quitado vn	2023-06-02 12:32:34 +02:00
Vicent Llopis	186ec2ea41	fix sendMail: sustituido modelo Journey por BusinessSchedule	2023-06-02 12:22:27 +02:00
Vicent Llopis	ba64dbbe46	refs #5561 refactor: actualizados nombres	2023-06-02 12:20:29 +02:00
Juan Ferrer	c05d6bb9a1	refs #5563 WorkerDocument translation fixes	2023-06-02 11:43:44 +02:00
Vicent Llopis	ccc386454c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-06-02 11:11:09 +02:00
Vicent Llopis	02d2afcb8b	refs #5561 feat: permite coloear todos los circulos	2023-06-02 10:57:28 +02:00
Alexandre Riera	37bbc66ca4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-06-02 09:39:46 +02:00
Juan Ferrer	95715763a1	refs #5667 Worker translations added/fixed	2023-06-02 08:57:22 +02:00
Alex Moreno	df21ca2d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-02 08:54:51 +02:00
Guillermo Bonet	20e574aef4	Merge pull request 'refs #5684 edi/updateData fix' (!1585) from 5684-ediUpdateData into master ... Reviewed-on: #1585 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-02 06:29:50 +00:00
Vicent Llopis	cf2bf0a17b	refs #5561 delete: codigo obsoleto	2023-06-02 08:23:44 +02:00
Carlos Satorres	5f72fabf8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-02 08:21:14 +02:00
Alex Moreno	cefe8e3e17	Merge pull request 'REFACTOR(node_version)! update to v20' (!1553) from salix-node20 into dev ... Reviewed-on: #1553 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-02 06:14:01 +00:00
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +02:00
Carlos Satorres	04780e211d	refs #5334 test front & 1/2 back	2023-06-01 16:03:55 +02:00
Vicent Llopis	d727ea83ab	refs # 5561 feat: cambiar url del crud-model	2023-06-01 15:31:16 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Vicent Llopis	0d85069e0f	refs #5561 feat: permite colorear	2023-06-01 15:01:38 +02:00
Alex Moreno	a26ab80e88	Merge branch 'dev' into salix-node20	2023-06-01 13:00:55 +00:00
Carlos Satorres	bb5247c49b	refs #5334 tree	2023-06-01 14:19:50 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alex Moreno	8d0ae30610	Merge pull request 'fix(workerLog): acl to hr' (!1584) from fix_workerLog_acl into master ... Reviewed-on: #1584 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 11:32:33 +00:00
Alex Moreno	69bf26433d	fix(workerLog): acl to hr	2023-06-01 13:19:34 +02:00
Carlos Satorres	f37c66304f	refs #5334 change info	2023-06-01 12:00:15 +02:00
Carlos Satorres	4c7c7f5c96	refs #5334 mod search-panel	2023-06-01 11:30:28 +02:00
Carlos Satorres	ffba5b2d7e	Merge pull request 'refs #5398 fix' (!1579) from 5398-fixAgenciesWarehouses into dev ... Reviewed-on: #1579 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 07:49:38 +00:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	fb330cdbfa	Merge pull request '232201_test_to_master' (!1582) from 232201_test_to_master into master ... Reviewed-on: #1582 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-06-01 06:16:44 +00:00