23689 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	7486c4a3c6	feat: refs #7562 refs #7532 Requested changes	2024-09-06 07:48:53 +02:00
Guillermo Bonet	f15fd66e48	Merge branch 'dev' into 7562-deleteDeprecatedObjects	2024-09-02 07:57:10 +02:00
Guillermo Bonet	2ba391fc85	feat: refs #7562 Deleted deleteDeprecatedObjects objects	2024-09-02 07:57:00 +02:00
Guillermo Bonet	8fee3dd706	Merge branch 'test' into dev	2024-09-02 07:06:13 +02:00
Guillermo Bonet	586f3334fe	Merge pull request 'feat: refs #7860 Update new packagings' (!2902) from 7860-newPackaging into test ... Reviewed-on: #2902 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 05:05:21 +00:00
Guillermo Bonet	b7fa6735a5	Merge pull request 'feat: refs #7564 Added volume column' (!2664) from 7564-ticketVolume into dev ... Reviewed-on: #2664 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-30 11:57:09 +00:00
Guillermo Bonet	d46a93a96f	Merge branch 'dev' into 7564-ticketVolume	2024-08-30 11:55:03 +00:00
Carlos Satorres	cde5e20260	Merge pull request 'fix: refs #6897 fix filter' (!2901) from 6897-entryMigrationFilterFix into dev ... Reviewed-on: #2901 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-30 10:58:01 +00:00
Carlos Satorres	4a7d81f920	fix: refs #6897 back and tests	2024-08-30 12:53:44 +02:00
Guillermo Bonet	7b1a34e249	feat: refs #7860 Update new packagings	2024-08-30 12:47:05 +02:00
Carlos Satorres	f65d36011b	fix: refs #6897 back	2024-08-30 12:40:37 +02:00
Carlos Satorres	26d93ef474	fix: refs #6897 travel filter	2024-08-30 12:35:10 +02:00
Carlos Satorres	e8010d0f18	fix: refs #6897 fix json	2024-08-30 12:10:33 +02:00
Carlos Satorres	b451641d47	fix: refs #6897 fix filter	2024-08-30 11:49:39 +02:00
Guillermo Bonet	6cb6110b14	Merge branch 'test' into dev	2024-08-29 07:51:23 +02:00
Guillermo Bonet	6093f2001b	Merge branch 'master' into test	2024-08-29 07:51:14 +02:00
Guillermo Bonet	e6e142ce80	Merge pull request 'fix: refs #6727 No delete log tables data in clean procedures' (!2896) from 6727-noDeleteLogInProc into dev ... Reviewed-on: #2896 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-29 05:14:47 +00:00
Guillermo Bonet	5e95e0465c	Merge branch 'dev' into 6727-noDeleteLogInProc	2024-08-29 05:06:16 +00:00
Carlos Andrés	1a47040e75	Merge pull request 'fixes: refs #7760 collection problems' (!2888) from 7760-Refactor-collection_assign into dev ... Reviewed-on: #2888 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 15:27:14 +00:00
Carlos Andrés	88246174dc	Merge pull request 'fix: refs #7213 Hotfix-ticket_isTooLittle-group-by-addressFk' (!2895) from Hotfix-ticket_isTooLittle-group-by-addressFk into master ... Reviewed-on: #2895 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 14:41:48 +00:00
Javi Gallego	a4e09884db	Merge pull request 'feat: refs #6760 refs #actualiza campo nickname' (!2883) from 6760-transferClient into dev ... Reviewed-on: #2883 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-28 10:38:45 +00:00
Javi Gallego	a8ee92f891	Merge branch 'dev' into 6760-transferClient	2024-08-28 10:36:17 +00:00
Carlos Andrés	484bb48d04	fix: refs #7760 collection problems	2024-08-28 12:33:05 +02:00
Carlos Andrés	423ba8c218	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-28 11:59:46 +02:00
Carlos Satorres	35009fdd6f	Merge pull request 'fix(salix): rollback updateClaim' (!2897) from hotfix_claimLink into master ... Reviewed-on: #2897 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 09:35:22 +00:00
Carlos Satorres	49394b9b16	fix: change claim	2024-08-28 09:42:59 +02:00
Javier Segarra	27e30c0051	fix(salix): redirect with params	2024-08-28 09:22:31 +02:00
Jorge Penadés	1c6c6902c4	Merge pull request 'chore: refs #7524 modify ormConfig table col' (!2894) from 7524-warmfix-modifyColumn into test ... Reviewed-on: #2894 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 06:52:21 +00:00
Javier Segarra	5b49e7cf45	fix(salix): rollback updateClaim	2024-08-28 06:51:32 +00:00
Jorge Penadés	80844acc61	Merge branch 'test' into 7524-warmfix-modifyColumn	2024-08-28 06:50:28 +00:00
Guillermo Bonet	fdeb041e56	Merge branch 'test' into dev	2024-08-28 08:40:37 +02:00
Guillermo Bonet	f9c59a9e4c	Merge branch 'master' into test	2024-08-28 08:40:24 +02:00
Guillermo Bonet	3dda49b3c5	fix: refs #pako Deleted duplicated version	2024-08-28 08:40:03 +02:00
Guillermo Bonet	97b839bf1a	fix: refs #6727 No delete log tables data in clean procedures	2024-08-28 08:10:32 +02:00
Carlos Andrés	16fd69904b	fixes: refs #7760 collection problems	2024-08-27 18:36:07 +02:00
Carlos Andrés	1ec9e5bf09	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:39:54 +02:00
Carlos Andrés	9a2351b958	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:12:41 +02:00
Jorge Penadés	b833fd5081	chore: refs #7524 modify ormConfig table col	2024-08-27 14:45:11 +02:00
Javier Segarra	df8fe4f1cd	Merge pull request '7896_down_devToTest_2436' (!2892) from 7896_down_devToTest_2436 into dev ... Reviewed-on: #2892 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 12:32:22 +00:00
Javier Segarra	db2215e3fa	feat(salix): refs #7896 update version and changelog	2024-08-27 13:53:27 +02:00
Carlos Andrés	6090e8ceee	fixes: refs #7760 collection problems	2024-08-27 13:47:47 +02:00
Carlos Andrés	58f8903b53	fixes: refs #7760 collection problems	2024-08-27 13:43:20 +02:00
Carlos Andrés	44072de928	fixes: refs #7760 collection problems	2024-08-27 13:36:06 +02:00
Carlos Andrés	3ac2c18da5	fixes: refs #7760 collection problems	2024-08-27 13:31:07 +02:00
Pako Natek	4a3f884173	Merge pull request 'version' (!2889) from saleGroup_State into master ... Reviewed-on: #2889 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 11:03:06 +00:00
Javier Segarra	e98d64f526	Merge pull request '#7896 - 24.36 Dev To Test' (!2884) from dev into test ... Reviewed-on: #2884 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 10:32:52 +00:00
Pako Natek	a4cc36eed1	version	2024-08-27 11:41:34 +02:00
Carlos Andrés	b317c8c462	fixes: refs #7760 collection problems	2024-08-27 10:47:09 +02:00
Guillermo Bonet	4d820f1003	Merge branch 'test' into dev	2024-08-27 10:08:04 +02:00
Guillermo Bonet	724a9b5dc1	Merge pull request 'refs #7844 Change in problems calc' (!2842) from 7844-changeProblemsCalc into dev ... Reviewed-on: #2842 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 08:07:25 +00:00