12544 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	f81b2775a0	add fixture	2022-09-30 09:36:51 +02:00
Alex Moreno	eec1d6df4a	add translation	2022-09-30 09:06:43 +02:00
Alex Moreno	e931414bb7	unnecessary code	2022-09-30 08:59:49 +02:00
Alex Moreno	203b223cc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-28 12:24:40 +02:00
Joan Sanchez	ae2bc91cb5	Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev ... Reviewed-on: #1067 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:38:46 +00:00
Joan Sanchez	93f5bf089d	Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev ... Reviewed-on: #1031 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:10:55 +00:00
Pau	901007d34b	change test case to expect the image to be defined	2022-09-27 13:58:27 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Joan Sanchez	ba3abf0a09	Merge pull request '4571-fix(puppeteer): update version' (#1065) from 4571-puppeteer_show into dev ... Reviewed-on: #1065 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-27 08:37:36 +00:00
Alex Moreno	5e40bb0749	fix(puppeteer): update version	2022-09-27 09:37:09 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Joan Sanchez	becb1bcc86	Merge pull request '3584-Modelo-Sector' (#1062) from 3584-Modelo-Sector into dev ... Reviewed-on: #1062 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-23 12:20:58 +00:00
Pau	26a16bf846	ACL para sector,añadido sector al model-config	2022-09-23 13:53:33 +02:00
Pau	620162aec7	Añadido el modelo de sector a shelving	2022-09-23 12:24:11 +02:00
Joan Sanchez	9d7e12d861	Merge pull request '4308-report_vehicleEventExpired' (#1058) from 4308-report_vehicleEventExpired into dev ... Reviewed-on: #1058 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 12:24:31 +00:00
Joan Sanchez	423cf5bdad	Merge pull request '4091-dms_clean_fix' (#1059) from 4091-dms_clean_fix into dev ... Reviewed-on: #1059 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 12:23:41 +00:00
Vicent Llopis	04676d5d98	fix: jump to next iteration if file not found	2022-09-21 08:56:13 +02:00
Vicent Llopis	62d5514798	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4308-report_vehicleEventExpired	2022-09-21 08:50:41 +02:00
Joan Sanchez	284524e3fa	Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev ... Reviewed-on: #1054 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:49:44 +00:00
Joan Sanchez	fcce73086e	Merge pull request '2805-fix(entry_latestBuys): save chekeds when crudModel load more data' (#1045) from 2805-entry_latestBuy_saveChekeds into dev ... Reviewed-on: #1045 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:47:29 +00:00
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
Vicent Llopis	888f70abcc	fix: required is true	2022-09-21 08:12:08 +02:00
Vicent Llopis	c17e0fd38b	feat: add new report	2022-09-21 08:11:04 +02:00
Joan Sanchez	2876ea6d5e	Merge pull request '4527-db_dump_MASTER' (#1057) from 4527-db_dump into master ... Reviewed-on: #1057	2022-09-20 10:04:01 +00:00
Vicent Llopis	9f1c90387b	feat: add new report vehicleExpired	2022-09-20 08:18:44 +02:00
Alex Moreno	55d6dacebb	test(ticket_listPackaging):enable back test	2022-09-19 10:11:44 +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	7480bf8a69	feat: do nothing if user and password are empty in osTicketConfig	2022-09-16 10:31:02 +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
Joan Sanchez	fe71e485aa	Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev ... Reviewed-on: #1055	2022-09-16 07:15:41 +00:00
Joan Sanchez	9f9581c722	Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev ... Reviewed-on: #1048 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:12:41 +00:00
Joan Sanchez	1b09f3bf7f	Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev ... Reviewed-on: #1052 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:11:59 +00:00
Joan Sanchez	f9f09440ec	Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev ... Reviewed-on: #1053 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:10:48 +00: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
Alex Moreno	54b41faf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss	2022-09-16 08:55:39 +02:00
Alex Moreno	24e4a606d7	remove change	2022-09-16 08:49:18 +02:00
Vicent Llopis	f5bbe3a9ac	fix: scope updated	2022-09-15 11:55:07 +02:00
Joan Sanchez	9d5351c84c	Updated db image	2022-09-15 07:31:49 +00:00
Vicent Llopis	5fce5b3e4f	refator: delete console.log	2022-09-15 08:38:00 +02:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Alex Moreno	e72c0ae919	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-09-14 13:09:00 +02:00
Alex Moreno	4f7218ab76	translation	2022-09-14 13:01:40 +02:00