16957 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	28be9ec6a6	Merge pull request 'fixes #6153 desplegar test-master' (!1721) from test into master ... Reviewed-on: #1721 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-29 07:26:31 +00:00
Juan Ferrer	d60e35d817	Merge pull request 'refs #6153 master into test' (!1726) from master into test ... Reviewed-on: #1726	2023-08-29 06:50:27 +00:00
Alex Moreno	1f06cc2072	Merge pull request 'refs #5941 feat(sendToSupport): don't show the button if it doesn't have token' (!1720) from 5941-warmFix_sendToSupport_mandatoryToken into test ... Reviewed-on: #1720 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-25 07:55:15 +00:00
Alex Moreno	7e0865e4b7	refs #5941 feat(sendToSupport): don't show the button if it doesn't have token	2023-08-25 08:01:11 +02:00
Alex Moreno	4c1d9cd767	hotFix(priceDifference): import UserError	2023-08-24 11:32:20 +02:00
Alex Moreno	508a4b2d34	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-23 12:04:27 +02:00
Alex Moreno	8454d208e1	hotFix(route_tickets): orderBy nickname	2023-08-23 12:02:52 +02:00
Alex Moreno	7349d4496f	refs #5351 hotFix(worker_sip): use worker.id not worker.userFk	2023-08-23 07:34:01 +02:00
Alex Moreno	5a5e3ebddb	refs #5712 hotFix(catalog): undo last fix search_panel	2023-08-22 13:39:57 +02:00
Alex Moreno	cb8ed437d9	refs #6140 fix: el valor de ttl ya no es undefined	2023-08-22 13:21:17 +02:00
Alex Moreno	a26652045c	refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel	2023-08-22 10:17:46 +02:00
Alex Moreno	d72e3ec4ec	Merge pull request 'refs #5941 fix(sendToSupport): fix email from' (!1711) from 5941-warnFix_email_from into test ... Reviewed-on: #1711 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-22 05:07:52 +00:00
Alex Moreno	14d4de0e1f	refs #5941 fix(sendToSupport): add as a collaborator	2023-08-21 14:48:05 +02:00
Alex Moreno	36623c1cae	refs #5941 fix(sendToSupport): fix email from	2023-08-21 13:48:51 +02:00
Carlos Satorres	555306c5da	Merge pull request 'refs #6041 hotfix agricola' (!1709) from 6041-hotfixAgricola into master ... Reviewed-on: #1709 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-21 08:36:33 +00:00
Carlos Satorres	bdc0646edd	Merge branch 'master' into 6041-hotfixAgricola	2023-08-21 07:46:35 +00:00
Guillermo Bonet	6d60592fb9	Merge branch 'master' into test	2023-08-21 09:34:32 +02:00
Guillermo Bonet	579ace9e9d	Merge pull request 'refs #5995 Changed query getExternalCmrs' (!1710) from 5995-queryExternalCmr into master ... Reviewed-on: #1710 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-21 07:29:58 +00:00
Guillermo Bonet	86def6e212	refs #5995 Changed query getExternalCmrs	2023-08-21 08:47:28 +02:00
Carlos Satorres	6b63072278	refs #6041 hotfix agricola	2023-08-18 11:52:04 +02:00
Alex Moreno	4fb6d91e54	refs #6126 feat: add changeLog	2023-08-17 09:31:09 +02:00
Alex Moreno	5d6de93d1b	Merge pull request 'refs #6127 hotFix(ticketRefund): get ticketFk front ticketService' (!1707) from 6127_hotFix_ticketRefund into master ... Reviewed-on: #1707 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-17 07:24:01 +00:00
Alex Moreno	9fffa1601a	Merge pull request 'refs #5941 feat: when error can send email to support' (!1670) from 5941-send-to-support into dev ... Reviewed-on: #1670 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-17 07:16:45 +00:00
Alex Moreno	7aee5bafff	Merge branch 'dev' into 5941-send-to-support	2023-08-17 06:42:46 +00:00
Alex Moreno	518d5111e4	refs #6127 hotFix(ticketRefund): get ticketFk front ticketService	2023-08-17 08:42:04 +02:00
Alex Moreno	f1e5051eeb	Merge branch 'test' into dev	2023-08-17 07:32:04 +02:00
Alex Moreno	868fbbfc2e	cau #103812 hotFix(supplier): beforeSave name	2023-08-16 08:04:32 +02:00
Juan Ferrer	f9778c02b7	refs #5483 DB Dockerfile: STAMP removed, not needed anymore	2023-08-14 12:53:56 +02:00
Juan Ferrer	5924303ae2	refs #5483 Dumped fixtures for vn.time removed	2023-08-14 09:53:53 +02:00
Alex Moreno	4719922883	refs #5941 fix(support-dialog): change message, test: fix e2e	2023-08-11 13:20:02 +02:00
Alex Moreno	02dddaeffe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support	2023-08-11 11:55:02 +02:00
Carlos Satorres	674a28d967	Merge pull request 'fix fixtures names, socialnames streets' (!1704) from fix-fixtures_test into dev ... Reviewed-on: #1704 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-11 08:27:03 +00:00
Alex Moreno	00fa5b7ce3	Merge branch 'dev' into fix-fixtures_test	2023-08-11 07:38:53 +00:00
Alex Moreno	afc0c98065	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-10 11:05:37 +02:00
Alex Moreno	e5c47a2057	refs #6054 add changeLog	2023-08-10 10:58:44 +02:00
Alex Moreno	bdf0138c70	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-08-10 10:40:40 +02:00
Guillermo Bonet	0b1f82248a	Merge pull request 'refs #5995 Added getExternalCmrs' (!1703) from 5995-liliumExternalCmr into master ... Reviewed-on: #1703 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-10 08:35:27 +00:00
Guillermo Bonet	b197109556	refs #5995 Requested changes	2023-08-10 10:14:22 +02:00
Carlos Satorres	a11905ee63	Merge branch 'dev' into fix-fixtures_test	2023-08-10 08:00:07 +00:00
Carlos Satorres	8807b9f87f	fix upper	2023-08-10 09:58:48 +02:00
Alex Moreno	de773bc849	Merge branch 'master' into 5995-liliumExternalCmr	2023-08-10 06:55:56 +00:00
Guillermo Bonet	d6b30271f2	refs #5995 Requested changes	2023-08-10 08:12:52 +02:00
Guillermo Bonet	ed88a5b25f	refs #5995 Minor change	2023-08-10 07:54:49 +02:00
Alex Moreno	9e4f80e187	Merge pull request 'refs #5762 feat: multiplatform recover-password and change-password' (!1673) from 5762-recoverPassword-multiplatform into dev ... Reviewed-on: #1673 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-08-09 13:14:53 +00:00
Alex Moreno	209cac2a6a	Merge branch 'dev' into 5762-recoverPassword-multiplatform	2023-08-09 13:05:16 +00:00
Carlos Satorres	aff6668dc9	remove names upper	2023-08-09 13:33:06 +02:00
Carlos Satorres	5653a39e3b	fix fixtures names, socialnames streets	2023-08-09 13:10:05 +02:00
Alex Moreno	d3d5bcbd00	Merge pull request '5976-transferSale_call_setDeleted' (!1681) from 5976-transferSale_call_setDeleted into dev ... Reviewed-on: #1681 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>	2023-08-09 10:34:39 +00:00
Carlos Satorres	f70b767506	Merge branch 'dev' into 5976-transferSale_call_setDeleted	2023-08-09 08:05:46 +00:00
Alex Moreno	aee78960b0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-09 08:00:54 +02:00