23666 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	5f06ae5cf4	feat: refs #6760 refs #actualiza campo nickname	2024-08-26 15:57:39 +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
Guillermo Bonet	4839add2b4	Merge branch '7567-movingCleanFix' of https://gitea.verdnatura.es/verdnatura/salix into 7567-movingCleanFix	2024-08-21 09:35:43 +02:00
Guillermo Bonet	62176b8517	feat: refs #7567 Changed time to call event	2024-08-21 09:35:42 +02:00
Guillermo Bonet	0bd64a790e	Merge branch 'dev' into 7567-movingCleanFix	2024-08-21 07:34:05 +00:00
Guillermo Bonet	d2709a871c	feat: refs #7514 Changes to put srt log	2024-08-21 08:29:32 +02:00
Guillermo Bonet	04235e85e6	Merge branch 'dev' into 7784-entryOrderPdf	2024-08-21 06:05:54 +00:00
Guillermo Bonet	cf7ee3d990	feat: refs #7784 Requested changes	2024-08-21 08:05:45 +02:00
Guillermo Bonet	83f44e5a1d	Merge pull request 'feat: refs #7800 Added company Fk' (!2871) from 7800-tpvMerchantEnableFk into dev ... Reviewed-on: #2871 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 05:11:08 +00:00
Guillermo Bonet	2d4acd0f00	feat: refs #7784 Changes in entry-order-pdf	2024-08-20 15:03:34 +02:00
Guillermo Bonet	92f01f79d3	feat: refs #7800 Added company Fk	2024-08-20 13:11:04 +02:00
Guillermo Bonet	a967be51e2	Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry	2024-08-20 12:59:31 +02:00
Guillermo Bonet	d2bd408e31	feat: refs #3199 Requested changes	2024-08-20 12:59:28 +02:00
Guillermo Bonet	1db68c08ed	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-20 08:59:42 +00:00
Guillermo Bonet	d0f1362f85	feat: refs #3199 Requested changes	2024-08-20 10:59:05 +02:00
Guillermo Bonet	a995d80b46	feat: refs #3199 Requested changes	2024-08-20 10:58:26 +02:00
Guillermo Bonet	c1810eaccf	Merge pull request 'feat: refs #7712 sizeLimit' (!2797) from 7712-sizeLimit into dev ... Reviewed-on: #2797 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-08-20 08:30:46 +00:00
Guillermo Bonet	45fa615daf	Merge branch 'dev' into 7712-sizeLimit	2024-08-20 08:28:19 +00:00
Guillermo Bonet	5b964aec1e	Merge pull request 'fix: refs #212295 ticket 212295 Fixed claim link' (!2870) from 212295-liliumUrl into master ... Reviewed-on: #2870 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-20 08:22:36 +00:00