1493 Commits

Author	SHA1	Message	Date
Joan Sanchez	71f8e73e55	Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev ... Reviewed-on: #1056 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:46:24 +00:00
Joan Sanchez	5d6459d565	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-21 08:37:20 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Vicent Llopis	a330e9d64a	refactor: change acl	2022-09-16 12:02:04 +02:00
Vicent Llopis	6367f1ef05	refator: delete sensitive info	2022-09-16 11:46:55 +02:00
Vicent Llopis	afeed9757c	refactor: change acl	2022-09-16 10:39:59 +02:00
Vicent Llopis	a695468bb7	refator: deleted sensitive information	2022-09-16 10:32:37 +02:00
Vicent Llopis	cfe5c66fe4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-09-16 09:23:56 +02:00
Vicent Llopis	503e78d4f0	fix: rollback mariadb version	2022-09-16 09:07:43 +02:00
Joan Sanchez	793705413e	#452 - Dumped db	2022-09-16 07:05:27 +00:00
Joan Sanchez	9d5351c84c	Updated db image	2022-09-15 07:31:49 +00:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Joan Sanchez	5cff983d4c	Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev ... Reviewed-on: #1040 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:33:04 +00:00
Vicent Llopis	1fd97f167c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-09-13 11:35:15 +02:00
Javi Gallego	9fe32788fc	regularizado	2022-08-24 14:38:05 +02:00
Joan Sanchez	6b6d00cf95	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-08-10 12:23:28 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Joan Sanchez	69ca28ae14	Added SQL version	2022-08-05 11:42:36 +02:00
Joan Sanchez	cabc30ef87	Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev ... Reviewed-on: #1029 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-05 09:18:53 +00:00
Joan Sanchez	624428212b	Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev ... Reviewed-on: #1026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-08-04 12:51:41 +00:00
Vicent Llopis	a82bc7a8e8	delete: old versions of db changes	2022-08-04 13:55:30 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Vicent Llopis	998176f03c	fix: fixtures	2022-08-04 08:23:39 +02:00
Vicent Llopis	82f2ef768f	fix: fixtures	2022-08-04 08:15:20 +02:00
Vicent Llopis	ede6da1a15	fix: db fixtures	2022-08-03 15:14:02 +02:00
Juan Ferrer	539d9617e6	export	2022-08-03 09:40:48 +02:00
Joan Sanchez	eed0ac66c6	Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev ... Reviewed-on: #1023 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-08-03 07:09:08 +00:00
Joan Sanchez	0de2c08739	Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev ... Reviewed-on: #1034 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-03 06:45:58 +00:00
Joan Sanchez	1b9de5cc95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create	2022-08-03 08:44:43 +02:00
Joan Sanchez	185ce60bef	Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev ... Reviewed-on: #994 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-08-03 06:41:22 +00:00
Carlos Andrés	6f825ee3bc	#3530 Eliminar uso de person	2022-07-29 17:03:31 +02:00
Carlos Andrés	67feac7c6c	#3530 Eliminar uso tabla person	2022-07-29 16:04:18 +02:00
Carlos Andrés	918a09ad5c	#3530 Eliminar uso tabla person	2022-07-29 15:17:00 +02:00
Vicent Llopis	537c383cd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-07-29 13:38:23 +02:00
Vicent Llopis	cd78afb539	fix: db changes	2022-07-29 12:03:59 +02:00
Vicent Llopis	538c04e8c5	feat: db connection and query	2022-07-29 11:59:03 +02:00
Vicent Llopis	3bf7efea16	feat: add phone extension and personal phone. Update bussiness phone	2022-07-27 12:16:41 +02:00
Joan Sanchez	468da0c5a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-07-27 08:12:06 +02:00
Joan Sanchez	882c4cc3d7	fix(insurance): force script execution	2022-07-26 13:19:57 +02:00
Vicent Llopis	3fd289ff51	update chat	2022-07-26 13:03:03 +02:00
Carlos Jimenez Ruiz	b8183748ce	Merge branch 'dev' into 1781-zoneHoliday	2022-07-22 13:58:52 +00:00
Carlos Jimenez Ruiz	f3766edbb7	Merge branch 'dev' into 1781-zoneHoliday	2022-07-22 13:56:19 +00:00
Vicent Llopis	7ad555c73f	restart backTest Jenkins	2022-07-22 13:59:36 +02:00
Vicent Llopis	7809d9dd7e	fix: typo	2022-07-22 13:41:18 +02:00
Vicent Llopis	fc6e51e91f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4091-dms_clean	2022-07-22 13:41:02 +02:00
Vicent Llopis	465a5e4d73	refactor: mo ve folder of sql chagues	2022-07-22 13:12:54 +02:00
Carlos Jimenez Ruiz	7d7365c4f3	Merge branch 'dev' into 4270-route.create	2022-07-22 11:07:08 +00:00
Vicent Llopis	8ea09a0449	jenkins testBack	2022-07-21 14:08:18 +02:00
Vicent Llopis	eccbd942f7	feat: can close a ticket	2022-07-21 13:11:24 +02:00