17347 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	9ef4ba9bef	refs #5134 feat: add saleMistake model	2023-08-11 12:32:49 +02:00
Sergio De la torre	6eb88f8ab7	refs #5134 feat: models	2023-08-11 11:58:30 +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	c8a60cab40	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-08-11 08:27:54 +00: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
Carlos Satorres	3b1f10d466	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-08-10 10:45:08 +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
Alex Moreno	765ab054a1	refs #5934 fix(clientSms): add vn-tooltip	2023-08-09 07:41:38 +02:00
Alex Moreno	ce78fc8e5d	refs #5986 feat: state model add classColor properties	2023-08-08 15:06:28 +02:00
Alex Moreno	19c09d60a2	refs #5986 feat(ticket_filter): add classColor column	2023-08-08 15:04:21 +02:00
Guillermo Bonet	2f64a41f64	refs #5995 Added getExternalCmrs	2023-08-08 14:16:47 +02:00
Alex Moreno	c5e853b028	refs #5976 correct sql folder	2023-08-08 13:35:36 +02:00
Alex Moreno	76404066ef	Merge pull request 'TEST refs #6083 feat: add lilium ticketSms' (!1702) from 6083-ticketSms_test into test ... Reviewed-on: #1702 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-08-08 06:52:45 +00:00
Alex Moreno	8e961fc25c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted	2023-08-08 08:51:48 +02:00
Alex Moreno	61e3b71bbf	init version 233401 after revert(version) in test	2023-08-08 08:51:03 +02:00
Alex Moreno	5804064c8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-08 08:48:16 +02:00
Alex Moreno	a93351f42c	Merge branch 'test' into 6083-ticketSms_test	2023-08-08 06:41:53 +00:00
Alex Moreno	bf5b421a43	refs #5976 warnFix(client_create): socialName to upperCase	2023-08-08 08:39:13 +02:00
Alex Moreno	0d5c6ffdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted	2023-08-08 07:10:25 +02:00
Alex Moreno	00fcd3a800	refs #6083 feat: add lilium ticketSms	2023-08-07 14:03:07 +02:00
Alex Moreno	abd6045bf6	warnFix: revert(version): remove changelog and change package.json	2023-08-07 13:52:46 +02:00
Alex Moreno	b3ac98d751	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-07 10:19:49 +02:00
Alex Moreno	e85cddec3c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-07 10:19:27 +02:00
Alex Moreno	26d6bbff4c	refs #5929 hotFix: add UserError	2023-08-07 10:04:46 +02:00
Alex Moreno	4191d2529d	refs #5712 warnFix: getById condition	2023-08-07 07:57:38 +02:00
Alex Moreno	4c199f66b2	refs #5762 refactor: recoverPassword use app param	2023-08-04 14:33:38 +02:00
Alex Moreno	75d3d12ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform	2023-08-04 14:31:56 +02:00
Guillermo Bonet	f26ab787cc	Merge pull request 'test → dev' (!1701) from test into dev ... Reviewed-on: #1701 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-04 09:39:32 +00:00
Guillermo Bonet	eeb68e1ad9	Merge branch 'dev' into test	2023-08-04 08:54:41 +00:00
Carlos Satorres	44fe6940e5	Merge pull request 'refs #5690 ticketproblems' (!1646) from 5690-redondeo_ticketProblems into dev ... Reviewed-on: #1646 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-04 01:30:47 +00:00
Carlos Satorres	1308efb98d	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-04 01:21:52 +00:00
Alex Moreno	83d0a394e3	refs #5973 refactor(item_fetched-tags): restyle empty tags	2023-08-03 15:59:09 +02:00
Guillermo Bonet	fd62f90640	Merge pull request 'master' (!1699) from master into test ... Reviewed-on: #1699 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-03 12:01:42 +00:00