16018 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	60e694423d	Merge pull request '5600-workerPhoto_incorrectSize' (!1522) from 5600-workerPhoto_incorrectSize into dev ... Reviewed-on: #1522 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-26 12:34:54 +00:00
Alex Moreno	f37d93b469	refs #5488 correct folder	2023-05-26 14:04:00 +02:00
Vicent Llopis	4e3f8f6975	Merge branch 'dev' into 5600-workerPhoto_incorrectSize	2023-05-26 11:33:41 +00:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +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
Alexandre Riera	8d3ee18172	Merge pull request 'fixes #5634 Adelantar el mismo ticket origen a múltiples tickets destino' (!1529) from 5634-ticketAdvance-mismoOrigen-multiplesDestinos into dev ... Reviewed-on: #1529 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-26 05:08:53 +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	a584e1ab5e	Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos	2023-05-25 11:22:51 +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
Carlos Satorres	fa8fd8d5bc	refs #5398 update from oldbranch	2023-05-25 11:41:14 +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	79897d8917	Merge pull request 'refs #5730 new version 232401' (!1562) from 232401_dev_init into dev ... Reviewed-on: #1562 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 08:58:24 +00:00
Carlos Satorres	d82a7eeeb7	Merge branch 'dev' into 5328-abonarTodoTicket	2023-05-25 08:25:47 +00:00
Alex Moreno	99f87aaf38	Merge branch 'dev' into 232401_dev_init	2023-05-25 08:04:15 +00:00
Alex Moreno	1a4ae400c7	Merge pull request 'refs #5678 feat(sale_canEdit): handle exist sale' (!1555) from 5678-sale-canEdit-notSale into dev ... Reviewed-on: #1555 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-25 08:03:58 +00:00
Alex Moreno	a0da78700b	Merge branch 'dev' into 5678-sale-canEdit-notSale	2023-05-25 07:49:40 +00:00
Alex Moreno	256f30987f	refs #5730 new version 232401	2023-05-25 09:46:39 +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	e19ece6119	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale	2023-05-25 07:34:54 +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
Alex Moreno	292d9e038d	typo	2023-05-24 13:38:11 +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
Alex Moreno	6b66eb3bb2	refs #5679 typo	2023-05-24 12:59:58 +02: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
Alex Moreno	30c896c975	refs #5678 feat(sale_canEdit): handle exist sale	2023-05-24 11:20:07 +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