15927 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	14ebcf96c0	refs #5842 refactor: change names	2023-06-15 07:24:17 +02:00
Vicent Llopis	7fa4eabf86	refs #5842 fix: recalcula invoiceDate cuando se cambia la company	2023-06-14 14:59:18 +02:00
Juan Ferrer	32a0955c1d	refs #5667 Zone translations fixed	2023-06-08 12:48:14 +02:00
Carlos Satorres	4ae6b7c739	Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master ... Reviewed-on: #1591 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-06 11:13:52 +00:00
Carlos Satorres	ab66ffa64a	Merge branch 'master' into hotfixTicketColors	2023-06-06 09:47:24 +00:00
Carlos Satorres	05111c9268	hotfix test front	2023-06-06 11:43:14 +02:00
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Juan Ferrer	6ef7055bc9	refs #5563 Display show values in logs	2023-06-06 11:05:04 +02:00
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +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
Juan Ferrer	35cf48314a	refs #4090 back memory limit increased because of pupeteer	2023-06-02 13:51:26 +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
Juan Ferrer	c05d6bb9a1	refs #5563 WorkerDocument translation fixes	2023-06-02 11:43:44 +02:00
Juan Ferrer	95715763a1	refs #5667 Worker translations added/fixed	2023-06-02 08:57:22 +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
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +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
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
Alex Moreno	de91e016e9	update changelLg	2023-06-01 07:22:09 +02:00
Alex Moreno	d02ee2fd12	deploy(232201)	2023-06-01 07:16:06 +02:00
Alex Moreno	23c52cc9b5	Merge pull request '5752-master_to_test' (!1578) from 5752-master_to_test into test ... Reviewed-on: #1578 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-31 12:35:10 +00:00
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Pablo Natek	38823f8481	Merge pull request 'refs #5153 client descriptor business type' (!1573) from 5153---business-type-worker-descriptor into master ... Reviewed-on: #1573 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-31 06:29:20 +00:00
Alex Moreno	6d23ef5d1e	Merge branch 'master' into 5153---business-type-worker-descriptor	2023-05-31 05:04:57 +00:00
Juan Ferrer	a4d7988591	refs #5517 Translations fixes	2023-05-30 19:39:11 +02:00
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +02:00
Pablo Natek	a232e9ecea	refs #5153	2023-05-29 09:26:36 +02:00
Alex Moreno	b9cb812e0d	Merge pull request 'fix item_getBalance' (!1569) from master_to_test2 into test ... Reviewed-on: #1569 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-26 05:37:35 +00:00
Juan Ferrer	27d4d10472	refs #5667 Expedition translation fixes	2023-05-25 18:32:03 +02:00
Juan Ferrer	2e0721b101	refs #5667 Fixes: Id filter, translations	2023-05-25 18:22:46 +02:00
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02:00
Alexandre Riera	c46e6cd862	Merge pull request 'hotfix item_getBalance' (!1563) from hotfix-item_getBalance into master ... Reviewed-on: #1563	2023-05-25 12:01:14 +00:00
Alexandre Riera	7e5fcc73ad	modified fixed structure	2023-05-25 13:10:05 +02:00
Alexandre Riera	ee8ce8f0de	Merge branch 'hotfix-item_getBalance' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-item_getBalance	2023-05-25 12:42:52 +02:00
Alexandre Riera	cd508e970d	changed structure like prod	2023-05-25 12:42:49 +02:00
Alex Moreno	dd83b25bb2	Merge branch 'master' into hotfix-item_getBalance	2023-05-25 09:37:38 +00:00
Alexandre Riera	dfac44a87b	hotfix 3rd parameter to null	2023-05-25 11:35:25 +02:00
Alex Moreno	310536120e	Merge pull request '232201_dev_to_test' (!1561) from 232201_dev_to_test into test ... Reviewed-on: #1561 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 07:43:17 +00:00
Alex Moreno	33928aa406	refs #5730 correct folder	2023-05-25 09:29:46 +02:00
Alex Moreno	c5a9eeed44	Merge pull request '232201_test_to_dev' (!1560) from 232201_test_to_dev into dev ... Reviewed-on: #1560 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-25 07:17:09 +00:00
Alex Moreno	37a3275b27	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-25 08:56:10 +02:00
Alex Moreno	a052c363fa	Merge pull request '232001_test_to_master' (!1559) from 232001_test_to_master into master ... Reviewed-on: #1559 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 06:54:49 +00:00
Alex Moreno	02c331ddd6	refs # fix(SQL): wagon	2023-05-25 08:37:06 +02:00
Alex Moreno	e44fd294ae	Merge pull request 'refs #5706 master to test' (!1558) from 232001_master_to_test into test ... Reviewed-on: #1558 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 06:12:06 +00:00
Alex Moreno	0e6501f306	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master	2023-05-25 07:42:58 +02:00