23633 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
Guillermo Bonet	2dc095e828	fix: refs #7811 Renew token crash	2024-08-27 10:07:09 +02:00
Guillermo Bonet	79e2424a41	Merge branch 'dev' into 7844-changeProblemsCalc	2024-08-27 08:04:21 +00:00
Pako Natek	b2b16dc551	Merge pull request 'version' (!2887) from saleGroup_state into dev ... Reviewed-on: #2887 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 06:39:36 +00:00
Pako Natek	ce2058ec8b	version	2024-08-27 08:36:14 +02:00
Javier Segarra	5f949e1344	Merge pull request '#7283 ItemFixedPrice duplicated' (!2886) from 7283_itemFixedPrice_duplicated into dev ... Reviewed-on: #2886 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 06:15:43 +00:00
Javier Segarra	ef26d7f437	fix(salix): #7283 ItemFixedPrice duplicated	2024-08-27 06:05:39 +00:00
Guillermo Bonet	d2a61cf18d	Merge branch 'test' into dev	2024-08-27 07:24:38 +02:00
Guillermo Bonet	83f3a05721	fix: refs #7811 Tests	2024-08-27 07:24:10 +02:00
Guillermo Bonet	aaf95e3cff	fix: refs #7756 id 0	2024-08-26 14:39:30 +02:00
Guillermo Bonet	e9870be76f	Merge branch 'test' into dev	2024-08-26 12:14:38 +02:00
Guillermo Bonet	1fac261682	Merge pull request 'fix: refs #7811 Renew token crash' (!2881) from 7811-renewTokenFix into master ... Reviewed-on: #2881 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-26 10:12:04 +00:00
Guillermo Bonet	b6c0ff01bf	fix: refs #7811 Renew token crash	2024-08-26 12:04:03 +02:00
Javi Gallego	638a43d3e6	Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev ... Reviewed-on: #2878 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 13:41:39 +00:00
Ivan Mas	2ea9198279	Merge pull request 'feat: refs #7758 accountDetailType fix deploy error' (!2880) from 7758-error_deploy into dev ... Reviewed-on: #2880 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 12:34:17 +00:00
Javi Gallego	32d36cda21	feat: refs #7710 pr revision	2024-08-23 14:28:25 +02:00
Ivan Mas	c5210157b1	feat: refs #7758 accountDetailType fix deploy error	2024-08-23 13:55:51 +02:00
Ivan Mas	ffbcd1bd4a	Merge pull request 'feat: refs #7758 Add code mandateType and accountDetailType' (!2876) from 7758-Add_code_mandateType_accountDetailType into dev ... Reviewed-on: #2876 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 10:16:26 +00:00
Ivan Mas	754792e3b5	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-23 09:36:06 +00:00
Ivan Mas	94461cff58	feat: refs #7758 Modify code lowerCamelCase and UNIQUE	2024-08-23 11:34:26 +02:00
Javi Gallego	340515968b	feat: refs #7710 test fixed	2024-08-23 10:57:35 +02:00
Guillermo Bonet	cce7bb2264	Merge pull request 'refactor: refs #7567 Fix and improvement' (!2699) from 7567-movingCleanFix into dev ... Reviewed-on: #2699 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 07:13:35 +00:00
Guillermo Bonet	3974728658	Merge branch 'dev' into 7567-movingCleanFix	2024-08-23 07:09:31 +00:00
Ivan Mas	9806265030	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-23 06:25:06 +00:00
Ivan Mas	2026fb128d	Merge pull request 'feat: refs #7862 roadmap new fields' (!2877) from 7862-Roadmap-new_fields into dev ... Reviewed-on: #2877 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 06:10:06 +00:00
Ivan Mas	7c545a379f	feat: refs #7862 roadmap new fields	2024-08-22 17:02:59 +02:00
Javi Gallego	24468ad338	Merge pull request 'feat: refs #7346' (!2864) from 7346 into dev ... Reviewed-on: #2864 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-22 09:30:27 +00:00
Ivan Mas	150c60c894	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-21 14:49:05 +00:00
Ivan Mas	d9d2ae2f7b	feat: refs #7758 Add code mandateType and accountDetailType	2024-08-21 16:45:46 +02:00
Guillermo Bonet	c2cc7207c3	Merge branch 'dev' into 7567-movingCleanFix	2024-08-21 12:42:29 +00:00
Guillermo Bonet	582fa5faeb	feat: refs #7567 Requested changes	2024-08-21 14:42:03 +02:00
Guillermo Bonet	16039b0ccc	Merge pull request 'feat: refs #7784 Changes in entry-order-pdf' (!2872) from 7784-entryOrderPdf into dev ... Reviewed-on: #2872 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 12:36:16 +00:00
Guillermo Bonet	32ae8282f1	Merge branch 'dev' into 7784-entryOrderPdf	2024-08-21 12:34:36 +00:00
Guillermo Bonet	35c49b4708	Merge pull request 'feat: refs #3199 Added one more scope ticketTotal' (!2447) from 3199-ticket_recalc_itemTaxCountry into dev ... Reviewed-on: #2447 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 12:32:27 +00:00
Guillermo Bonet	73fedfabea	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-21 12:28:22 +00:00
Guillermo Bonet	ae985312a9	Merge pull request 'feat: refs #7514 Changes to put srt log' (!2873) from 7514-srtLog into dev ... Reviewed-on: #2873 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 11:23:28 +00:00
Guillermo Bonet	9c4f4ad5a9	Merge branch 'dev' into 7514-srtLog	2024-08-21 11:21:21 +00:00
Guillermo Bonet	ed5b012d3f	Merge pull request 'feat: refs #7882 Added quadMindsConfig table' (!2874) from 7882-quadMindsConfig into dev ... Reviewed-on: #2874 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 11:21:04 +00:00
Guillermo Bonet	d63a1c5497	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:28:14 +02:00
Guillermo Bonet	c641b47a9b	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:26:34 +02:00
Guillermo Bonet	29b779d6ab	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:03:49 +02:00