15904 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	42a39b6778	refs #5706 master to test	2023-05-25 07:22:56 +02:00
Alex Moreno	43538a8e36	Merge pull request 'hotFix(closeAll): fix where' (!1557) from hotFix_fix_closeAll into master ... Reviewed-on: #1557 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 05:16:41 +00:00
Alexandre Riera	0d223bb443	Merge pull request 'fixes #3628 item historical absoluto' (!1539) from 3628-item-historical-absoluto into dev ... Reviewed-on: #1539 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-25 05:05:06 +00:00
Alex Moreno	03e2b98485	hotFix(closeAll): fix where	2023-05-24 15:50:59 +02:00
Alexandre Riera	de313b6418	refs #3628 Show what's before the inventory	2023-05-24 13:40:26 +02:00
Alexandre Riera	74ba21b1b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 13:39:01 +02:00
Alexandre Riera	12aa9dee41	Merge pull request 'fixes #5677 Fallo portainer Ticket/SaveSign' (!1556) from 5677-fallo-saveSign into dev ... Reviewed-on: #1556 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 11:34:47 +00:00
Alexandre Riera	087fa137fd	Merge branch 'dev' into 5677-fallo-saveSign	2023-05-24 11:14:17 +00:00
Carlos Satorres	d6a0db3fb8	Merge pull request '5297-newWorker_iban_not_required' (!1492) from 5297-newWorker_iban_not_required into dev ... Reviewed-on: #1492 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 11:05:14 +00:00
Alexandre Riera	49bd9c35b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 12:19:45 +02:00
Alexandre Riera	133c5dbca5	Merge branch 'dev' into 5677-fallo-saveSign	2023-05-24 10:18:26 +00:00
Alexandre Riera	856dcf18cb	refs #5677 locations	2023-05-24 12:17:41 +02:00
Alexandre Riera	05fb0a7203	refs #5677 tickets without state fixed	2023-05-24 12:16:19 +02:00
Carlos Satorres	a99b7cd4f1	Merge branch 'dev' into 5297-newWorker_iban_not_required	2023-05-24 08:02:33 +00:00
Carlos Satorres	6294fc0435	refs #5297 back&e2e fix changes	2023-05-24 10:02:02 +02:00
Carlos Satorres	0f66e56390	Merge pull request 'refs #5639 smart-tabla defaulter' (!1550) from 5639-seccionesFormaPagoYPais(MOROSOS) into dev ... Reviewed-on: #1550 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 07:04:50 +00:00
Carlos Satorres	6cf2c38927	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:59:04 +00:00
Vicent Llopis	e43e0a8f9f	Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev ... Reviewed-on: #1554 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-24 06:39:46 +00:00
Carlos Satorres	bb39724718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-24 08:09:44 +02:00
Carlos Satorres	e46caffe96	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:05:44 +00:00
Vicent Llopis	1ddad7a5ec	Merge branch 'dev' into 5609-ticket.index_searchByFilter	2023-05-24 05:45:04 +00:00
Vicent Llopis	68c33efd9a	refs #5609 fix: front test	2023-05-24 07:33:01 +02:00
Alexandre Riera	b2f4c02b95	Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev ... Reviewed-on: #1549 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-24 05:17:26 +00:00