5649 Commits

Author	SHA1	Message	Date
Vicent Llopis	a486b1593b	fix: backTest	2022-09-22 13:55:09 +02:00
Vicent Llopis	95e5b1a970	fix: code for search-function	2022-09-22 13:54:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	68f3544477	Claim pickup order	2022-09-22 09:17:14 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Vicent Llopis	0fb7487191	feat: add getItemTypeWorker endpoint	2022-09-22 08:32:18 +02:00
Vicent Llopis	fae1516b33	refactor: correct bleeding	2022-09-21 14:55:43 +02:00
Vicent Llopis	65e15ada69	refator: delete line break	2022-09-21 14:53:02 +02:00
Joan Sanchez	5a43bdb6c9	Delivery note	2022-09-21 13:18:32 +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	5d6459d565	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-21 08:37:20 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +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
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +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
Alex Moreno	54b41faf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss	2022-09-16 08:55:39 +02:00
Vicent Llopis	f5bbe3a9ac	fix: scope updated	2022-09-15 11:55:07 +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	eb7bd3dc59	update brach	2022-09-14 14:03:15 +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	06eab58b3d	is agency	2022-09-14 12:45:40 +02:00
Alex Moreno	8c984b5ebe	refactor(client): change rol manager to financialBoss	2022-09-14 12:32:19 +02:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Alex Moreno	49a7a05310	feat(travel_extra-community): add vn-anchor	2022-09-14 08:08:07 +02:00
Alex Moreno	2b101cf7c1	refactor(travel_extra-community): use smart-table, fix scroll	2022-09-13 15:11:14 +02:00
Vicent Llopis	a6a5a84add	fix: incorrect name of function	2022-09-13 14:42:15 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Vicent Llopis	3bf5f5f86e	fix: tfront	2022-09-13 13:47:54 +02:00
Vicent Llopis	bddc998b86	feat: allow update route.isOk field	2022-09-13 13:34:32 +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	6e31865add	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent	2022-09-13 12:17:30 +02:00
Vicent Llopis	cc6ba8712c	feat: log when a day is excluded	2022-09-13 12:15:28 +02:00
Joan Sanchez	1f850d13e9	Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev ... Reviewed-on: #1035 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:00:36 +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
Vicent Llopis	b02aa8466c	fix: tfront	2022-09-13 10:27:17 +02:00
Vicent Llopis	8c6c7345cd	fix: change GET by POST, to solve "Request Header Fields Too Large"	2022-09-13 10:27:08 +02:00
Joan Sanchez	3210f91bf7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-12 12:20:49 +02:00
Joan Sanchez	de3e14e739	4514 - Write permissions for rrhh	2022-09-12 10:23:17 +02:00
Joan Sanchez	faa3865da1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-09 11:53:57 +02:00
Alex Moreno	8da24a56b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-09 07:52:17 +02:00
Alex Moreno	c9721f4c7f	fix(entry_latestBuys): save chekeds when crudModel load more data	2022-09-08 14:52:43 +02:00
Alex Moreno	a15c051098	fix(monitor_salesFilter): mariadb not optimize query	2022-09-08 08:07:46 +02:00
Alex Moreno	c06d2970ae	test(boxing): getVideoList	2022-09-07 13:58:39 +02:00
Javi Gallego	f0a9441e1f	Merge branch 'dev' into #4226-remove-density	2022-09-07 11:31:47 +02:00
Alex Moreno	886abfd897	fix(monitor): fix left join salesFilter	2022-09-07 08:49:24 +02:00
Alex Moreno	8dd02ab6ee	quit console.logs	2022-09-06 15:08:28 +02:00
Alex Moreno	6fcb1e54b4	refactor(claim_action): set translations	2022-09-06 09:35:01 +02:00
Alex Moreno	43df1e7e10	refactor(boxing): refactor getVideo	2022-09-05 12:06:14 +02:00
Alex Moreno	4a058faaf8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-05 08:12:07 +02:00
Javi Gallego	9fe32788fc	regularizado	2022-08-24 14:38:05 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	cceb456209	Filter by province	2022-08-12 15:31:59 +02:00
Joan Sanchez	d0185017b7	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
Vicent Llopis	f3df373f70	delete: unnecessary code	2022-08-10 13:23:50 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	8f54365350	refator: parametrizardo con ?	2022-08-10 09:19:23 +02:00
Vicent Llopis	31aafc0719	feat: add inserts in printQueue	2022-08-10 09:11:38 +02:00
Joan Sanchez	d2b901d47f	Relative path for master versions	2022-08-09 11:49:28 +02:00
Alex Moreno	6054e0bef3	fix(mdb): use relative path	2022-08-05 13:24:48 +02:00
Alex Moreno	062806b3f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-08-05 13:19:43 +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
Joan Sanchez	1dda78c438	Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master ... Reviewed-on: #1036	2022-08-04 12:23:27 +00: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
Juan Ferrer	22503375b3	Hotfix: User synchronization	2022-08-04 08:53:31 +02:00
Alex Moreno	b4b6d61460	feat(ticket_boxing): fix getVideo	2022-08-03 14:57:39 +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
Alex Moreno	8a08b6f399	feat(ticket_boxing): return video stream	2022-08-02 15:15:05 +02:00
Alex Moreno	7d4dd7bb52	feat(boxing): return stream video	2022-08-01 15:03:17 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Carlos Andrés	918a09ad5c	#3530 Eliminar uso tabla person	2022-07-29 15:17:00 +02:00
Vicent Llopis	1e521f1a8b	feat: delete link	2022-07-29 14:12:53 +02:00
Vicent Llopis	d1e273d1d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-07-29 13:56:01 +02:00
Vicent Llopis	83e5a01649	fix: correct translation	2022-07-29 13:47:42 +02:00
Vicent Llopis	990fe17f48	fix: correct transalte	2022-07-29 13:42:59 +02:00
Vicent Llopis	84036d582f	fic: delete unnecessary acl	2022-07-29 13:42:52 +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	224ea61a62	fix: delete warehouseFk from itemType model	2022-07-29 13:07:25 +02:00
Vicent Llopis	840e792d13	fix: backTest	2022-07-29 12:52:53 +02:00
Vicent Llopis	605da52286	fix: replace it.warehouseFk by userConfig.warehouseFk	2022-07-29 12:22:03 +02:00
Vicent Llopis	21701601e3	fix: update frontTest	2022-07-27 13:01:03 +02:00
Vicent Llopis	3bf7efea16	feat: add phone extension and personal phone. Update bussiness phone	2022-07-27 12:16:41 +02:00
Alex Moreno	4c60303968	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-07-27 11:17:35 +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	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	d3852bac5d	fix(vnInputTime): quit new date(null)	2022-07-26 11:45:12 +02:00
Alex Moreno	3fd34e0861	feat(claim_pickup_order): modify email	2022-07-25 14:49:39 +02:00
Carlos Jimenez Ruiz	f3766edbb7	Merge branch 'dev' into 1781-zoneHoliday	2022-07-22 13:56:19 +00:00
Vicent Llopis	9bd3daf71c	feat: add translate	2022-07-22 13:36:44 +02:00
Vicent Llopis	4076f2908e	refactor: change type of params in endpoints	2022-07-22 13:35:18 +02:00
Carlos Jimenez Ruiz	7d7365c4f3	Merge branch 'dev' into 4270-route.create	2022-07-22 11:07:08 +00:00
Vicent Llopis	5446c960fb	fix: frontTest	2022-07-21 10:11:31 +02:00
Vicent Llopis	699f19b0d4	refactor: change invoice id by refFk	2022-07-21 10:05:37 +02:00
Vicent Llopis	cb3e488df9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat	2022-07-20 14:12:08 +02:00
Vicent Llopis	26f8996936	refactor: set vn-focus and move sql to new folder	2022-07-20 14:02:15 +02:00
Vicent Llopis	af4e7be229	feat: add frontTest	2022-07-20 13:41:33 +02:00
Vicent Llopis	771c86ba4b	fix: shelving log	2022-07-20 12:40:30 +02:00
Vicent Llopis	b4408dc080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create	2022-07-19 14:42:43 +02:00
Vicent Llopis	318b688b67	fix: typo errors	2022-07-19 14:40:41 +02:00
Vicent Llopis	28deb34047	refactor: update translation	2022-07-19 14:40:23 +02:00
Vicent Llopis	7434532636	feat: add translate	2022-07-19 13:38:06 +02:00
Vicent Llopis	c56ac1c192	feat: add log	2022-07-19 13:35:17 +02:00
Carlos Jimenez Ruiz	7437da92a5	Merge branch 'dev' into 4294-zone_getEventsFiltered	2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz	bbfab8d0bd	Merge branch 'dev' into 4270-route.create	2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz	c883f45653	Merge branch 'dev' into 4221-intrastat	2022-07-15 12:18:33 +00:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Vicent Llopis	ac344d6edd	refactor: add column id PK and updated column code UQ	2022-07-14 09:54:28 +02:00
Vicent Llopis	762ec3045f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving	2022-07-14 09:11:43 +02:00
Vicent Llopis	fdf6e04233	change travel.agencyFk by agencyModeFk	2022-07-13 14:36:03 +02:00
Vicent Llopis	dd46a974cc	fix: backTest	2022-07-12 11:57:01 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Vicent Llopis	6f3d4792d5	update backTest	2022-07-12 10:03:58 +02:00
Vicent Llopis	eaa7658b23	delete it.warehouseFk	2022-07-12 10:03:50 +02:00
Vicent Llopis	25dab78ca2	Merge branch 'dev' into 4270-route.create	2022-07-12 06:20:07 +00:00
Alex Moreno	051a849a21	fix(zone): fix getEventsFiltered	2022-07-12 08:10:29 +02:00
Vicent Llopis	2d57b3bd54	Merge branch 'dev' into 4221-intrastat	2022-07-12 06:10:20 +00:00
Vicent Llopis	1eb6ee69cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-07-12 08:09:02 +02:00
Vicent Llopis	e4b04fadbc	fix: set editMode = 'include' by default	2022-07-12 08:00:17 +02:00
Vicent Llopis	2b5550bc6e	feat: add testFront	2022-07-12 07:57:28 +02:00
Carlos Jimenez Ruiz	136dcee214	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds	2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz	44c29aa489	updated file as per convention	2022-07-11 11:25:31 +02:00
Alex Moreno	b3d001bb9d	fix(timeEntry): fix back test	2022-07-11 08:17:32 +02:00
Vicent Llopis	4b65b531fd	feat: add backTest	2022-07-08 10:09:03 +02:00
Vicent Llopis	eb586643ca	refactor: change name of endpoint	2022-07-08 09:47:11 +02:00
Vicent Llopis	94872f8493	fix: show geos checked onSearch	2022-07-07 13:37:36 +02:00
Vicent Llopis	6f7a4fc5ff	refactor title of test	2022-07-05 12:08:16 +02:00
Vicent Llopis	979ee1d956	feat: add backTest	2022-07-05 10:19:22 +02:00
Vicent Llopis	51bd18ac37	feat: update commissionWorkCenterFk when create a route	2022-07-05 10:19:06 +02:00
Joan Sanchez	fc87039571	Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev ... Reviewed-on: #1011	2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	d810b3712b	Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev ... Reviewed-on: #1017 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-30 12:22:41 +00:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Joan Sanchez	ae79163048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-30 13:17:04 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz	dab8c60f77	Merge branch 'dev' into 4268-client_list_scroll	2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz	14350358d6	added max width to email of 400px + title to overflowing content	2022-06-29 15:21:30 +02:00
Vicent Llopis	748dc1b37e	fix: delete engine memory to pass backTest	2022-06-29 14:36:17 +02:00
Vicent Llopis	24159cd3e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary	2022-06-29 14:28:54 +02:00
Vicent Llopis	d49a2666f1	refactor: don´t show 'description' if it is empty	2022-06-29 14:28:23 +02:00
Vicent Llopis	459a1fe518	feat: update instrastat.sql	2022-06-29 14:15:22 +02:00
Carlos Jimenez Ruiz	57a2cd46ce	ticket filter pending uses isNotValidated now	2022-06-29 12:55:11 +02:00
Alex Moreno	22fd0e91b0	title translations, and getWorkedHours test	2022-06-28 12:10:37 +02:00
Alex Moreno	a3f1c36226	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz	bdf4ecdf50	Merge branch 'dev' into 4223-claim_observations	2022-06-28 07:03:44 +00:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	7980a941a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 14:03:24 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	6370471bd5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations	2022-06-27 11:01:42 +02:00
Vicent Llopis	fcf79a507c	Merge branch 'dev' into 4213-item.summary	2022-06-27 05:32:21 +00:00
Alex Moreno	4155b45785	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Vicent Llopis	3e43bf2024	feat(route.index): can edit fields	2022-06-23 14:14:13 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Vicent Llopis	2c721867fc	feat(item.summary): add description	2022-06-22 14:30:25 +02:00
Joan Sanchez	2381a5d09a	Updated e2e tests	2022-06-22 12:40:11 +02:00
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	9751514b10	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-21 11:15:33 +00:00
Joan Sanchez	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Alex Moreno	8d9d64b49d	feat(client_web-access): add email field	2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Vicent Llopis	44e95a00c3	refactor: delete duplicated code	2022-06-17 08:54:40 +02:00
Vicent Llopis	1bd4b02a62	refactor: code	2022-06-17 08:18:23 +02:00
Carlos Jimenez Ruiz	1e504b6b9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor	2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz	e151e35f7e	replaced isActive by active as per it's model and updated original data in controller	2022-06-16 16:25:21 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +02:00
Vicent Llopis	00e48f5257	feat: add backTest	2022-06-16 10:59:31 +02:00
Vicent Llopis	84ffe3f594	feat: delete from ticketCollection and sectorCollection when a ticket is deleted	2022-06-16 09:58:15 +02:00
Vicent Llopis	f41b9b0b57	refator: delete console.log	2022-06-15 14:25:31 +02:00
Vicent Llopis	f3cca1c930	fix: warehouse changed from 'silla' to 'algemesi'	2022-06-15 14:24:35 +02:00
Vicent Llopis	980ac50ba9	feat: add frontTets	2022-06-15 14:03:58 +02:00
Vicent Llopis	f69fb45b90	feat: it only sets the highest priority, in case that ticket doesn't already have the highest priority.	2022-06-15 12:53:13 +02:00
Vicent Llopis	cc23913c9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-06-15 09:40:02 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Vicent Llopis	e61784b6ba	refactor: undo chages about drag&drop	2022-06-14 13:52:32 +02:00
Vicent Llopis	52e78db9ee	feat: group by address in buscaman, delete priority by checked, show notes of tickets	2022-06-14 12:36:08 +02:00
Vicent Llopis	189e8dbab3	feat: order by column enabled	2022-06-14 12:34:32 +02:00
Vicent Llopis	931c4fb259	refactor: translate	2022-06-14 08:03:46 +02:00
Vicent Llopis	c26b09ead3	refactor: create endpoint	2022-06-13 14:33:22 +02:00
Vicent Llopis	dd65f4a468	refator: rewrite conditionals	2022-06-13 13:17:56 +02:00
Vicent Llopis	8d4c735744	refactor: delete duplicated code	2022-06-13 12:26:40 +02:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Joan Sanchez	9ab8b84290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz	096f225656	Merge branch 'dev' into 4024-client_defaulter	2022-06-10 07:21:54 +00:00
Vicent Llopis	06f181e913	feat: add frontTest for calendar	2022-06-10 08:29:10 +02:00
Vicent Llopis	f6ab9d8a31	feat: updated backTest	2022-06-10 08:15:54 +02:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Vicent Llopis	a9badfc1ba	feat: add backTest	2022-06-09 14:59:17 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Vicent Llopis	afd95872c8	feat: drag and drop	2022-06-09 13:48:57 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00
Vicent Llopis	fb7f26216c	feat: update combo "Banck entity"	2022-06-09 08:43:33 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Alex Moreno	61cc3c19f3	refactor(client): creditInsuarnce change creditClassification for creditClassificationFk	2022-06-09 07:13:54 +02:00
Vicent Llopis	409e935cc7	feat: add fields	2022-06-08 15:17:45 +02:00
Vicent Llopis	aa99424476	deleted unnecessary 'await'	2022-06-08 12:50:32 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz	6ebcf4bc02	Merge branch 'dev' into 3817-updatePortfolio	2022-06-07 12:35:31 +00:00
Joan Sanchez	58a1eea642	Merge branch 'dev' into 4111-claim.summary	2022-06-07 12:27:12 +00:00
Vicent Llopis	eba6c149ba	refactor	2022-06-07 13:26:55 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00
Vicent Llopis	5e01ea58e3	fix: backTest	2022-06-02 13:41:51 +02:00
Vicent Llopis	e9c98a98e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-06-02 13:38:27 +02:00
Vicent Llopis	3da9a775bd	feat: add frontTest	2022-06-02 13:36:57 +02:00
Vicent Llopis	8dcd430178	fix: events frontTest	2022-06-02 13:11:26 +02:00
Vicent Llopis	f7be419bbe	refator: updated fixtures	2022-06-02 11:52:53 +02:00
Vicent Llopis	b5fa360960	feat: edit excluded selecetion with specificLocations	2022-06-02 10:40:02 +02:00
Juan Ferrer	ea0a43d0fb	Merge branch 'dev' into 4108-mdb_backend	2022-06-02 06:45:50 +00:00
Joan Sanchez	b6d0d9f210	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 14:26:20 +02:00
Joan Sanchez	fab4705618	Rollback	2022-06-01 14:01:19 +02:00
Vicent Llopis	1235affe2d	fix: show correct css	2022-06-01 13:47:46 +02:00
Joan Sanchez	4ecffc2448	Merge branch 'dev' into 4067-client_detail	2022-06-01 11:45:02 +00:00
Joan Sanchez	a4a9ea45b7	Removed front unit test	2022-06-01 13:44:07 +02:00
Joan Sanchez	571e2f03d3	Removed focus	2022-06-01 13:07:47 +02:00
Joan Sanchez	0faabeb145	Added back unit tests	2022-06-01 13:07:28 +02:00
Joan Sanchez	0bc48dc27b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 09:39:53 +02:00
Joan Sanchez	4ac26895ba	fix(regularizeClaim): refound with negative quantity ... Refs: #4148	2022-06-01 09:36:47 +02:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Vicent Llopis	0c996f7915	fix: excluded backTest fixed	2022-05-31 12:23:56 +02:00
Vicent Llopis	c7471fdac4	refator: variable names changed	2022-05-31 12:21:04 +02:00
Alex Moreno	7c7c64415d	fix(monitor_ticket): add isTooLittle problem	2022-05-31 12:00:15 +02:00
Alex Moreno	cac4e74793	refactor	2022-05-31 09:06:15 +02:00
Joan Sanchez	a5e833af2c	feat(client): detail section with smart-table	2022-05-31 07:56:17 +02:00
Vicent Llopis	da1e188983	fix: put requests	2022-05-27 13:54:35 +02:00
Alex Moreno	1e2f827233	fix	2022-05-27 13:39:33 +02:00
Alex Moreno	863977915e	fix	2022-05-27 13:27:05 +02:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Alex Moreno	ff264ab930	hotFix(client): fiscal-data edit by salesAssistant	2022-05-27 09:45:08 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Joan Sanchez	a5f3580b17	derp	2022-05-26 16:14:10 +02:00
Vicent Llopis	6359c9e5bf	feat: add fixtures	2022-05-26 15:08:23 +02:00
Vicent Llopis	456f167513	feat: fix editExclusion mode	2022-05-26 11:09:03 +02:00
Vicent Llopis	bbdaa7de39	feat: add editExclusion mode	2022-05-26 08:33:45 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +02:00
Vicent Llopis	a907354cc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-05-25 09:03:52 +02:00
Vicent Llopis	4baf1afb83	fix: show videos in claim.summary	2022-05-25 07:51:47 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Vicent Llopis	5880efe966	refator: commented code deleted	2022-05-24 12:51:00 +02:00
Vicent Llopis	f00fb0dc3f	feat: add new module shelving	2022-05-24 12:50:22 +02:00
Vicent Llopis	99c7ad1c1b	refactor: delete section shelving from client	2022-05-24 12:50:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz	c721d9ae82	Merge branch 'dev' into 4022-client.balance.create	2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz	a76dd11825	Merge branch 'dev' into 3870-models	2022-05-23 12:33:08 +00:00
Vicent Llopis	db7638f153	refactor: sectorFk property deleted	2022-05-23 12:45:20 +02:00
Vicent Llopis	9bbdeb2840	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-23 12:41:01 +02:00
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Vicent Llopis	9736a68dd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create	2022-05-20 13:16:58 +02:00
Vicent Llopis	875e9503c3	refactor: request changes	2022-05-20 13:16:47 +02:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz	d86ac41b70	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:54:08 +00:00
Vicent Llopis	f4b080243c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-20 12:53:23 +02:00
Vicent Llopis	fd80fc58fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-20 12:33:23 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz	b3c0aa7933	Merge branch 'dev' into 4082-zone.basic-data	2022-05-20 10:19:00 +00:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	69e12e0dd8	refactor: 'bonus' can be a negative value	2022-05-20 09:21:33 +02:00
Vicent Llopis	c5683ab880	feat: added itemShelving	2022-05-20 09:17:18 +02:00
Carlos Jimenez Ruiz	ed4718922e	prevented logs on non-existent clients	2022-05-17 15:37:52 +02:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Vicent Llopis	605ab2ec62	refactor: delete sms.detinationFk	2022-05-17 12:37:54 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Vicent Llopis	76515bdd3f	add: search-panel	2022-05-17 09:54:49 +02:00
Vicent Llopis	3335cb8a01	feat(item.itemType): add fields	2022-05-17 08:32:45 +02:00
Vicent Llopis	7ad56327a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-17 08:21:49 +02:00
Alex Moreno	a37be3e5fe	refactor(client_defaulter): search in smart-table	2022-05-16 14:30:48 +02:00
Alex Moreno	8bcdf96aad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-05-16 14:15:37 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Vicent Llopis	10cd9c5b87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data	2022-05-16 07:22:16 +02:00
Vicent Llopis	ab13c16948	feat: add dialog	2022-05-16 07:17:29 +02:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Joan Sanchez	9cbee7a38a	Merge branch 'dev' into 3771-ticket.expedition	2022-05-13 13:05:08 +00:00
Joan Sanchez	913b76880a	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-13 12:59:30 +00:00
Joan Sanchez	f8db3c31df	Proper test result	2022-05-13 10:02:34 +02:00
Joan Sanchez	6b18432f87	Force test to fail	2022-05-13 09:53:47 +02:00
Vicent Llopis	06e9a22f40	added search	2022-05-12 15:02:07 +02:00
Alex Moreno	ec49dd67be	refactor(client_defaulter)	2022-05-12 14:18:16 +02:00
Vicent Llopis	b96d9ea4c2	feat(zone.events): add dialog	2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Vicent Llopis	568579f461	refactor: pull request changes	2022-05-12 08:27:04 +02:00
Alex Moreno	7f46d4e50a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-12 08:06:39 +02:00
Alex Moreno	af1fa8051f	refactor(clientCredit): refactor test	2022-05-12 08:06:30 +02:00
Vicent Llopis	16fdf982c8	feat(item.itemtype): add frontTest	2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Vicent Llopis	05b0a5342f	feat(zone.events): new dialog when choose 'exclude'	2022-05-11 14:53:52 +02:00
Vicent Llopis	13a6f1f8c1	feat(item): add section itemType	2022-05-11 14:47:54 +02:00
Joan Sanchez	d39147689d	Merge branch 'dev' into 3771-ticket.expedition	2022-05-11 12:47:33 +00:00
Joan Sanchez	afe4f0ba94	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 12:46:39 +00:00
Vicent Llopis	734f9cb60d	feat(item.itemType): added section itemType	2022-05-11 07:28:17 +02:00
Carlos Jimenez Ruiz	a7b56b3b89	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz	a47c0dbaea	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz	0e65f382f9	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:36:35 +00:00
Alex Moreno	5919c42df2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 11:42:35 +02:00
Joan Sanchez	7f19f0bebe	Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev ... Reviewed-on: #938	2022-05-10 08:26:38 +00:00
Joan Sanchez	866834d1d7	Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev ... Reviewed-on: #956 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-10 08:25:47 +00:00
Joan Sanchez	aa431bbe0f	Merge branch 'dev' into 3795-client_administraive	2022-05-10 08:24:32 +00:00
Joan Sanchez	93829eeff5	Merge branch 'dev' into 3948-invoceIn.index	2022-05-10 08:22:06 +00:00
Joan Sanchez	c0f2b9dca9	Merge branch 'dev' into 3996-entry_summary	2022-05-10 08:09:31 +00:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Alex Moreno	263d0e3f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-05-10 07:55:41 +02:00
Vicent Llopis	bb4dbb60b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz	5c55caaec6	Merge branch 'dev' into 3978-invoiceIn.summary	2022-05-09 14:59:32 +00:00
Carlos Jimenez Ruiz	e71003778a	Merge branch 'dev' into 3950-invoiceIn.create	2022-05-09 14:41:33 +00:00
Carlos Jimenez Ruiz	6fb83f5c65	Merge branch 'dev' into 3941-order.index	2022-05-09 14:21:24 +00:00
Carlos Jimenez Ruiz	9c085fa653	Merge branch 'dev' into 3927-monitor_ticket	2022-05-09 14:14:01 +00:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Carlos Jimenez Ruiz	93d29bb202	Merge branch 'dev' into 3900-client_credit	2022-05-09 13:16:04 +00:00
Vicent Llopis	f08a384a7c	fix: e2e test	2022-05-09 14:49:37 +02:00
Alex Moreno	d9055abca9	fix(entry_summary): get entry.id	2022-05-09 14:44:30 +02:00
Carlos Jimenez Ruiz	efc43c9611	Merge branch 'dev' into 3750-claim_photo	2022-05-09 12:36:27 +00:00
Vicent Llopis	a6b8674302	feat(invoiceIn.tax): add button for create an expence	2022-05-09 14:34:20 +02:00
Alex Moreno	a00728384f	Merge branch '3409-clientCredit_maxRows' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-09 13:19:38 +02:00
Alex Moreno	54fdc4b6e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-09 13:19:20 +02:00
Joan Sanchez	f806a598ea	Updated method path	2022-05-09 13:15:48 +02:00
Vicent Llopis	bd7eb67aeb	fix: add CAST DECIMAL(10,2)	2022-05-09 12:31:38 +02:00
Joan Sanchez	f380d5fd28	Merge pull request '3942-ticket.volume' (#953) from 3942-ticket.volume into dev ... Reviewed-on: #953 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-09 08:29:23 +00:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Alex Moreno	798147ea99	jenkins error	2022-05-05 14:40:13 +02:00
Alex Moreno	1e3b05a95d	remove console.log	2022-05-05 13:32:34 +02:00
Alex Moreno	70aca5d11a	fix(worker): fix getMonth	2022-05-05 13:25:57 +02:00
Vicent Llopis	93e3ea103a	added frontTest	2022-05-04 12:05:46 +02:00
Vicent Llopis	9862960c99	comment frontTest	2022-05-04 12:00:39 +02:00
Vicent Llopis	38f5541ef4	execute jenkins test	2022-05-04 11:27:03 +02:00
Alex Moreno	ac4d4e6db1	test and fixtures	2022-05-04 10:59:37 +02:00
Javi Gallego	dcd5d07a28	menu order	2022-05-04 10:43:40 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Alex Moreno	b5a73ec3a2	fix(monitor_client): clientsFilter refactor	2022-05-04 10:32:14 +02:00
Alex Moreno	0cae852dea	refactor	2022-05-04 10:28:17 +02:00
Alex Moreno	1cc199e26b	refactor(client-credit)	2022-05-04 10:26:13 +02:00
Alex Moreno	800b4984ff	fix(test): use ctx.options	2022-05-04 07:46:47 +02:00
Alex Moreno	e140c9d1f4	console.logs	2022-05-03 15:17:34 +02:00
Alex Moreno	f364c19c70	fix(monitor_client): fix scroll	2022-05-03 14:08:46 +02:00
Javi Gallego	6584a29ce5	create deleteTrashFiles	2022-05-03 11:16:56 +02:00
Joan Sanchez	c6e554c608	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3327-global_invoicing	2022-05-02 14:52:02 +02:00
Alex Moreno	b40b8d931d	feat(client_credit): remove de old rows	2022-05-02 11:18:39 +02:00
Joan Sanchez	ea6b1abdd8	Invoice queue	2022-05-02 09:51:49 +02:00
Alex Moreno	d27a45522b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-04-29 12:49:42 +02:00
Vicent Llopis	fec9554d5b	feat(invoceIn.index): added 'file' and deleted 'account'	2022-04-29 12:13:02 +02:00
Vicent Llopis	48f10c4e53	feat(invoceIn.create): added nif and deleted currency	2022-04-29 09:50:43 +02:00
Carlos Jimenez Ruiz	b2f930911f	fixed problems in two spec files	2022-04-29 09:18:06 +02:00
Vicent Llopis	11a7f48bd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-29 08:32:02 +02:00
Vicent Llopis	c10e4c04b6	refactor: delete file	2022-04-29 08:23:35 +02:00
Javi Gallego	9973eeddb9	Merge remote-tracking branch 'origin/3750-claim_photo' into 3851-dms_delete	2022-04-29 07:51:17 +02:00
Joan Sanchez	fea7df269c	Added invoice schedule method	2022-04-28 14:59:29 +02:00
Vicent Llopis	32ec755a35	fix: check if value.length	2022-04-28 08:26:38 +02:00
Joan Sanchez	c923526342	refactor(invoicing): send invoice to print queue	2022-04-28 08:14:33 +02:00
Vicent Llopis	ab0aba6cfb	refactor: translate	2022-04-28 08:13:43 +02:00
Vicent Llopis	a7b519994d	refactor: updated shrink-datetime	2022-04-28 07:56:14 +02:00
Vicent Llopis	6d4f803cbe	refactor: changed 'expand'	2022-04-28 07:53:06 +02:00
Joan Sanchez	b06b9718dc	Merge branch 'dev' into 3862-ticket_problemItemShortage	2022-04-27 12:58:40 +00:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Vicent Llopis	24fa818cb3	fix(monitor_ticket): filter shipped without time	2022-04-27 09:48:31 +02:00
Vicent Llopis	1766222c12	refactor: updated backTest	2022-04-26 13:25:12 +02:00
Vicent Llopis	b246a119cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-04-26 13:15:45 +02:00
Vicent Llopis	7abceb8564	refactor: add frontTest	2022-04-26 13:08:06 +02:00
Vicent Llopis	5e35783a38	fix: javi's requested	2022-04-26 13:07:50 +02:00
Alex Moreno	165af44d85	fix(zone_delivery-days): await zone.Events.show()	2022-04-26 09:49:18 +02:00
Vicent Llopis	39f4c4a6e8	feat: updated backTest	2022-04-25 12:36:05 +02:00
Vicent Llopis	76ff6330f9	feat(supllier.summary): add two fields	2022-04-25 12:23:03 +02:00
Vicent Llopis	5211a0d9d7	feat(supplier.fiscal-data): add two fields	2022-04-25 11:51:34 +02:00
Alex Moreno	e7cb9cf2da	fix	2022-04-25 10:30:44 +02:00
Vicent Llopis	6d35200607	updated front test	2022-04-25 10:10:59 +02:00
Vicent Llopis	789365799e	refactor: changed name	2022-04-25 08:45:50 +02:00
Alex Moreno	42f02c3b9e	fix(client): socialName unique check client.fi	2022-04-25 08:09:58 +02:00
Vicent Llopis	2b9c656d21	feat(invoiceOut): add refund option	2022-04-22 11:46:28 +02:00
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Carlos Jimenez Ruiz	9d46b4c79c	refactor(SuggestedTickets): added translations and descriptors	2022-04-22 11:26:16 +02:00
Alex Moreno	a46b2113dc	models	2022-04-22 07:39:47 +02:00
Vicent Llopis	d1bd2f9c77	refactor: refund	2022-04-21 14:59:41 +02:00
Vicent Llopis	4a6873a0fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-21 09:34:37 +02:00
Vicent Llopis	0ec51202e0	pull request changed	2022-04-21 09:34:13 +02:00
Vicent Llopis	579ff3aa4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-21 07:13:34 +02:00
Vicent Llopis	5db20ee3e2	refactor: deleteOldFiles in claim	2022-04-20 14:46:37 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	62f7b80ed4	quit $	2022-04-20 08:55:43 +02:00
Alex Moreno	ea2e38af4e	support front filter and front test for component	2022-04-20 08:24:12 +02:00
Alex Moreno	433afb8fe8	change tooltip client descriptor btnFive	2022-04-19 15:21:28 +02:00
Alex Moreno	69530d3019	fix filter	2022-04-19 14:12:31 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Alex Moreno	8432815cb7	refactor	2022-04-13 14:58:46 +02:00
Alex Moreno	04f993e227	fix	2022-04-13 13:55:18 +02:00
Alex Moreno	3d7beba822	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-04-13 13:07:07 +02:00
Alex Moreno	b7931278be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-04-13 13:03:07 +02:00
Joan Sanchez	91f111f609	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-13 11:33:49 +02:00
Carlos Jimenez Ruiz	9085098a04	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Joan Sanchez	c2271b6071	Merge branch 'dev' into 3758-client_unpaid	2022-04-13 09:00:28 +00:00
Vicent Llopis	804f5f4b2f	fix: delete vn-focus and duplicated pagination	2022-04-13 10:37:52 +02:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Alex Moreno	f2ee987dec	fix multi-check	2022-04-13 08:15:47 +02:00
Alex Moreno	8e87ab62a8	feat(entry_latest-buys): add multi-check-dummy	2022-04-12 14:40:25 +02:00
Alex Moreno	73ee790f8d	removed isFarmer property	2022-04-12 14:27:06 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Vicent Llopis	c1edb8206e	refactor	2022-04-12 12:46:26 +02:00
Vicent Llopis	9a171d5202	refactor	2022-04-12 12:45:07 +02:00
Vicent Llopis	ad3b3c44d6	refactor: replace let for const	2022-04-12 12:44:46 +02:00
Vicent Llopis	1e11191e79	fix: frontTest	2022-04-12 12:32:48 +02:00
Vicent Llopis	5921891161	refactor: updated css	2022-04-12 12:20:36 +02:00
Vicent Llopis	4872407723	fix test	2022-04-12 11:57:56 +02:00
Vicent Llopis	e1de41f801	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-12 10:09:36 +02:00
Vicent Llopis	313e911940	fix(claim_action): smart-table	2022-04-12 10:09:00 +02:00
Alex Moreno	ad149b3024	intro	2022-04-12 07:58:37 +02:00
Alex Moreno	4a714a4b6f	feat(client): add privileges to administrative role	2022-04-12 07:56:03 +02:00
Alex Moreno	c9e8826627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz	018047b6be	Merge branch 'dev' into 3347-worker_basic-data	2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz	56e52c35d8	Merge branch 'dev' into 3802-ticket_sale_mana	2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz	b087d275dc	Merge branch 'dev' into 3605-invoiceIn_intrastat3	2022-04-11 10:29:01 +00:00
Vicent Llopis	6e999302bf	refactor: replace let for const	2022-04-11 10:09:54 +02:00
Vicent Llopis	fefff80af4	pull request changes	2022-04-11 10:01:15 +02:00
Vicent Llopis	d88a404ce6	refactor: pull request changes	2022-04-11 10:01:00 +02:00
Vicent Llopis	a348762153	refactor: pull request changes	2022-04-11 09:09:05 +02:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Vicent Llopis	d8a1bd1b1c	fix: pull request changes	2022-04-11 08:23:54 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Vicent Llopis	ddd6d61d9e	fix(claim_photos): consider other image types in html	2022-04-11 07:58:23 +02:00
Vicent Llopis	5431dbdc3e	refactor: resize vide0s	2022-04-08 14:33:00 +02:00
Vicent Llopis	c00be015ab	feat(claim_photo): add fixtures and backTest	2022-04-08 13:53:25 +02:00
Vicent Llopis	90b079a0ac	refactor: description back routes	2022-04-08 12:25:06 +02:00
Vicent Llopis	ea4266ef8c	feat: add deleteOldFiles	2022-04-08 12:20:39 +02:00
Alex Moreno	c7b8b61a08	feat(item): add model itemPackingType	2022-04-08 10:34:36 +02:00
Vicent Llopis	5567e07773	feat(claim_photo): can upload videos	2022-04-08 09:34:46 +02:00
Joan Sanchez	b93f44b220	Merge branch 'dev' into 3756-client_address_isLogifloraAllowed	2022-04-08 07:29:00 +00:00
Joan Sanchez	d2ecbe898e	Merge branch 'dev' into 3863-client_name	2022-04-08 07:03:23 +00:00
Alex Moreno	90a19d52fb	use variable	2022-04-08 09:02:27 +02:00
Alex Moreno	8c2bc76b88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3756-client_address_isLogifloraAllowed	2022-04-08 09:01:38 +02:00
Alex Moreno	238a9fd5da	feat(client.defaulter&claim): change socialName to name	2022-04-08 08:52:21 +02:00
Joan Sanchez	a11bcd3669	Merge branch 'dev' into 3832-client_balance_create	2022-04-08 06:48:46 +00:00
Joan Sanchez	381b37b1ff	Merge branch 'dev' into 3043-client_search-panel	2022-04-08 06:31:16 +00:00
Vicent Llopis	5ddce43dd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-08 07:57:02 +02:00
Vicent Llopis	df26a40e63	feat(claim_action): add smart-table and 'change destinantion' to all rows	2022-04-08 07:37:17 +02:00
Alex Moreno	574729b7c5	test(client_unpaid): add front test and e2e	2022-04-07 15:05:10 +02:00
Vicent Llopis	1915850a09	feat(claim_photo): added videos	2022-04-07 14:12:56 +02:00
Joan Sanchez	fa1fb37795	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-07 12:24:41 +02:00
Alex Moreno	c312eff12e	fix(claim_search-panel): filter	2022-04-07 12:09:11 +02:00
Alex Moreno	b8a954caec	feat(client): section unpaid	2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz	d83e77fada	Merge branch 'dev' into 3848-item.compression	2022-04-07 08:56:58 +00:00
Carlos Jimenez Ruiz	6216d6fa9b	Merge branch 'dev' into 3467-travelThermograph	2022-04-07 08:29:26 +00:00
Carlos Jimenez Ruiz	47ef80b1c3	Merge branch 'dev' into 3686-client_create	2022-04-07 08:25:06 +00:00
Joan Sanchez	287aa0c3c6	Updated unit tests	2022-04-07 08:53:03 +02:00
Joan Sanchez	0e75555bcd	Updated unit tests	2022-04-07 08:51:07 +02:00
Vicent Llopis	4350ea0af5	refactor: changed default date to tomorrow	2022-04-07 08:32:31 +02:00
Alex Moreno	e44de0246d	extract ids to variable	2022-04-06 14:58:17 +02:00
Alex Moreno	bcbe264f0a	refactor(client_updateAddress): refactor ctx variable	2022-04-06 14:55:59 +02:00
Alex Moreno	afc03fc60e	feat(client_address): add LogifloraIsAllowed	2022-04-06 14:48:22 +02:00
Joan Sanchez	f5a6521f20	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-06 14:34:23 +02:00
Alex Moreno	98755656dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-04-06 12:43:12 +02:00
Alex Moreno	37b8bcbb9e	remove relation	2022-04-06 12:38:49 +02:00
Alex Moreno	dd9a38d1bf	feat(client_search-panel): filter by province	2022-04-06 12:29:00 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +02:00
Alex Moreno	ade5e9256d	feat(client_search-panel): add zone and province	2022-04-05 15:21:20 +02:00
Joan Sanchez	4be3f9c00f	Open client summary	2022-04-05 09:58:15 +02:00
Alex Moreno	d616367714	fix(test): use static dates	2022-04-05 07:46:49 +02:00
Vicent Llopis	a8f4192b4c	feat: update salix fonts	2022-04-04 14:15:55 +02:00
Vicent Llopis	c5efc17fe9	refactr: update test	2022-04-04 13:56:36 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Vicent Llopis	86b24ecd1d	feat(client): add backTest	2022-04-01 12:13:24 +02:00
Vicent Llopis	d4136cde0b	fix: excluded backTest	2022-04-01 11:22:38 +02:00
Vicent Llopis	39e5f8b418	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3686-client_create	2022-04-01 10:04:54 +02:00
Vicent Llopis	3de9ea2ce5	refactor(client_create): added checks on back route	2022-04-01 10:04:15 +02:00
Vicent Llopis	da14d6064b	refactor(client_create): deteled checks on hook	2022-04-01 10:02:23 +02:00
Alex Moreno	d86f4da425	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-01 07:37:29 +02:00
Vicent Llopis	2c54f31985	refactor: uppercase	2022-03-31 10:54:30 +02:00
Vicent Llopis	443db55f58	feat(worker_basic-data): add new fields	2022-03-31 09:18:18 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	b29261cb75	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3686-client_create	2022-03-30 12:35:37 +02:00
Vicent Llopis	23cb8c1215	refactor(ticket_sale): update frontTest	2022-03-30 09:54:01 +02:00
Vicent Llopis	b78ecc06d2	fix(ticker_sale): only show mana options if currentWorker has mana	2022-03-30 09:29:57 +02:00
Vicent Llopis	98fb3c1a67	refactor(client_updatePorfolio): included backTest	2022-03-30 08:09:52 +02:00
Vicent Llopis	5b1d610f2f	refator: updated translate	2022-03-30 07:55:37 +02:00
Vicent Llopis	572cc30a4e	refactor: updated translate	2022-03-30 07:53:00 +02:00
Vicent Llopis	d06b2e8bb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3	2022-03-30 07:30:39 +02:00
Vicent Llopis	8e27ab612d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana	2022-03-29 15:08:48 +02:00
Vicent Llopis	86350b2afa	feat(ticket_sale): add backTest	2022-03-29 14:00:53 +02:00
Vicent Llopis	c15aea213f	feat(ticket_sale): add front test	2022-03-29 13:42:56 +02:00
Vicent Llopis	a5ca116571	feat(ticket_sale): add mana options	2022-03-29 13:42:37 +02:00
Carlos Jimenez Ruiz	b68e458890	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 10:21:31 +00:00
Joan Sanchez	bbbb0df1cd	Merge branch 'dev' into 3781-export_database	2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz	9ad782cb59	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 08:39:21 +00:00
Carlos Jimenez Ruiz	e2aaa616af	Merge branch 'dev' into 3734-item_diary_scroll	2022-03-29 08:34:35 +00:00
Carlos Jimenez Ruiz	7d3f8844cc	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz	b27a7ca263	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +00:00
Vicent Llopis	8c744a0135	refacto: translate corrected	2022-03-29 10:17:26 +02:00
Carlos Jimenez Ruiz	7209bc52de	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 08:10:30 +00:00
Alex Moreno	fd02038c8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar	2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz	407fe2850b	Merge branch 'dev' into 3408-worker_calendar	2022-03-29 08:06:25 +00:00
Carlos Jimenez Ruiz	e4ae263d42	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-29 07:54:00 +00:00
Vicent Llopis	6c43ea716e	fix: update test failed	2022-03-29 09:10:42 +02:00
Vicent Llopis	133152460a	fix: translate	2022-03-28 14:14:41 +02:00
Alex Moreno	1959340163	remove $applyAsync test	2022-03-28 14:04:26 +02:00
Vicent Llopis	b72d26f214	fix: update backTest	2022-03-28 13:40:52 +02:00
Vicent Llopis	f4d53c4040	pull request changes required	2022-03-28 13:35:36 +02:00
Vicent Llopis	64ae7ee8ea	feat: modify filter	2022-03-28 13:24:26 +02:00
Vicent Llopis	a5b3bdfa8d	feat: add backTest	2022-03-28 13:24:11 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	49ae4d0e74	Merge branch 'dev' into 3734-item_diary_scroll	2022-03-28 10:14:34 +00:00
Carlos Jimenez Ruiz	fd3ade4a29	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-28 10:14:15 +00:00
Carlos Jimenez Ruiz	8d70bac5c6	Merge branch 'dev' into 3621-worker_calendar	2022-03-28 10:13:21 +00:00
Vicent Llopis	1e587be2ed	(fix): filter repaired	2022-03-28 11:57:19 +02:00
Alex Moreno	89d7d27061	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-28 11:47:09 +02:00
Carlos Jimenez Ruiz	29f8fd1fc6	Merge branch 'dev' into 3686-client_create	2022-03-28 09:33:24 +00:00
Carlos Jimenez Ruiz	b4dbbc53b2	Merge branch 'dev' into 3615-print_deliveryNote	2022-03-28 09:21:10 +00:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Vicent Llopis	ad7bcd7cc2	delete two filter fields	2022-03-28 09:28:01 +02:00
Alex Moreno	79c74d92b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-25 13:22:04 +01:00
Vicent Llopis	4bdc29e283	refactor: calculate holidays through db procedures	2022-03-24 10:59:23 +01:00
Alex Moreno	968ecab9b2	fix(item_diary): apply async scroll	2022-03-24 10:28:28 +01:00
Alex Moreno	ad4c89af5f	feat(department): add hasToMistake in model	2022-03-23 14:12:47 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00
Alex Moreno	0963b66560	fix(worker_calendar): absence in holiday day	2022-03-23 13:06:17 +01:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Alex Moreno	79e0543c26	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote	2022-03-23 12:47:59 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Alex Moreno	aeb1eed421	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote	2022-03-23 12:31:38 +01:00
Joan Sanchez	b8910e38ea	Merge pull request '3682-item_fixed-price' (#901) from 3682-item_fixed-price into dev ... Reviewed-on: #901	2022-03-23 11:29:44 +00:00
Joan Sanchez	d5c2fb9857	Merge pull request '3685-fix(invoiceIn_descriptor): add necessary relations to filter' (#909) from 3685-invoiceIn_descriptor into dev ... Reviewed-on: #909 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:27:57 +00:00
Alex Moreno	3b80f6dec9	renaming	2022-03-23 12:26:58 +01:00
Alex Moreno	193f97aa41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:25:01 +01:00
Joan Sanchez	f74c80cf21	Merge pull request '3683-feat(monito_clients): smart-table and filter by date' (#904) from 3683-monitor_clients into dev ... Reviewed-on: #904 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:24:51 +00:00
Joan Sanchez	6e9db8b1cd	Merge pull request '3597-feat(print_deliveryNote): add proforma type' (#906) from 3597-ticket_descriptor_proforma into dev ... Reviewed-on: #906 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:22:57 +00:00
Vicent Llopis	c8ae5bca82	check if email, phone or mobile already exists in another client	2022-03-23 12:19:49 +01:00
Joan Sanchez	d1d48f8beb	Merge branch 'dev' into 3683-monitor_clients	2022-03-23 11:15:51 +00:00
Alex Moreno	dc03a66c6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:01:50 +01:00
Joan Sanchez	e85c0c53c6	Merge pull request '3684-agencyTerm_search-panel' (#900) from 3684-agencyTerm_search-panel into dev ... Reviewed-on: #900 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:50:50 +00:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Alex Moreno	7a17fe2cba	fix(invoiceIn_descriptor): add necessary relations to filter	2022-03-23 10:36:00 +01:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Alex Moreno	0dc1848870	feat(print_deliveryNote): add withoutPrices type	2022-03-22 15:13:34 +01:00
Alex Moreno	7fc82cbfeb	feat(ticket_descriptor-menu): add show proforma	2022-03-22 10:32:26 +01:00
Alex Moreno	05be19de2d	fix(zone_delivery-days): agencyModeName and defaulter pagination	2022-03-22 10:03:56 +01:00
Alex Moreno	ca35c88be4	feat(print_deliveryNote): add proforma type	2022-03-22 07:38:14 +01:00
Vicent Llopis	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00
Vicent Llopis	fae267f539	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	920bff30c8	modify filter sql	2022-03-21 12:02:17 +01:00
Vicent Llopis	aba7136f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 11:47:33 +01:00
Alex Moreno	8eebe1abbb	feat(monito_clients): smart-table and filter by date	2022-03-21 11:32:26 +01:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Joan Sanchez	00c53a7709	3668 - Deprecated field "isOfficial"	2022-03-18 11:06:16 +01:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Vicent Llopis	894f95cb1f	update consulte sql	2022-03-17 15:05:13 +01:00
Vicent Llopis	bc65beaa76	add frontTest	2022-03-17 14:51:49 +01:00
Vicent Llopis	a32f7b5ef1	add new row	2022-03-17 14:27:55 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	21198820fc	refactor translate	2022-03-17 09:54:19 +01:00
Vicent Llopis	c3fe2dc52b	update filter test	2022-03-17 09:54:08 +01:00
Vicent Llopis	14eacec0ff	included test	2022-03-17 09:53:50 +01:00
Alex Moreno	e8b4896e98	feat(item_fixed-price): add search, and defaultSerach	2022-03-17 09:13:09 +01:00
Vicent Llopis	7e8c15e413	modify test updatePortfolio	2022-03-17 09:00:01 +01:00
Vicent Llopis	a9b6dcacfe	included sms test	2022-03-17 08:13:18 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Alex Moreno	b4e5631cc7	feat(item_fixed-price): implement smart-table	2022-03-16 14:58:07 +01:00
Vicent Llopis	1094bbe92b	correction panel-search	2022-03-16 14:42:19 +01:00
Vicent Llopis	26f77ca07e	add panel-search	2022-03-16 13:02:48 +01:00
Alex Moreno	7a45b6014a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-16 07:45:09 +01:00
Alex Moreno	e0924ea373	refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh	2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz	3098fc36fb	Merge branch 'dev' into 3604-route_agencyTerm	2022-03-15 14:14:16 +00:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Vicent Llopis	1ecc76067a	code to correct insert in model	2022-03-15 14:50:09 +01:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Vicent Llopis	656efa2be9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-15 12:23:28 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	ec41123772	button for insert rows	2022-03-15 09:36:48 +01:00
Alex Moreno	f774b1f784	typo	2022-03-15 09:13:35 +01:00
Alex Moreno	bacfa3f1f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3689-deliveryBoss	2022-03-14 10:27:00 +01:00
Vicent Llopis	97f856afcc	corrected comment	2022-03-11 12:24:53 +01:00
Vicent Llopis	6a91fe6c11	solved backTest	2022-03-10 14:43:07 +01:00
Vicent Llopis	7f5b30aa87	delete frontTest	2022-03-10 10:40:52 +01:00
Vicent Llopis	ba31d96cdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-10 10:36:02 +01:00
Vicent Llopis	16208a5e11	especify PK	2022-03-10 10:35:35 +01:00
Vicent Llopis	189fe2ed41	update acl	2022-03-10 08:14:50 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Juan Ferrer	d49d1b437c	User.login() error fixed	2022-03-09 15:34:26 +01:00
Vicent Llopis	91a23088c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-09 08:40:55 +01:00
Alex Moreno	9c4d58fc1a	refactor(ticket-popup): extends from dialog	2022-03-09 08:08:13 +01:00
Alex Moreno	b11a6a7c5c	feat(route): add ticket-popup and tests	2022-03-08 15:17:18 +01:00
Alex Moreno	c8a512db4e	unnecessary	2022-03-08 15:16:36 +01:00
Vicent Llopis	97f2341ae0	pull request changes	2022-03-08 13:42:44 +01:00
Carlos Jimenez Ruiz	4fc6da5ba9	Merge branch 'dev' into 3626-client_basic-data	2022-03-08 08:53:03 +00:00
Vicent Llopis	527387aad5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-03-08 08:45:40 +01:00
Alex Moreno	e8d7ce7cc7	refactor(ticket): change role productionBoss to deliveryBoss	2022-03-07 14:50:51 +01:00
Vicent Llopis	6b51b7ddd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-07 13:54:33 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	4e3fe180ca	feat(client_descriptor): add supplier quick-link	2022-03-07 13:25:55 +01:00
Vicent Llopis	f88f60ef27	refactor code and icons	2022-03-07 12:43:05 +01:00
Alex Moreno	0359e05def	description	2022-03-07 11:22:16 +01:00
Alex Moreno	56bdb85af5	translations	2022-03-07 10:28:55 +01:00
Alex Moreno	a136d8b03d	accept array in params	2022-03-07 10:10:45 +01:00
Alex Moreno	b421038bbe	typo	2022-03-07 08:11:21 +01:00
Alex Moreno	dedbccae19	description	2022-03-07 08:07:34 +01:00
Alex Moreno	2c853a7885	test(zone): getZoneClosing() front and back	2022-03-07 08:02:59 +01:00
Alex Moreno	efa32a3dc7	export structure	2022-03-04 13:04:28 +01:00
Alex Moreno	138e2ee9b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 12:25:05 +01:00
Alex Moreno	a658969afa	feat(zone_delivery-days): get real closing hour	2022-03-04 12:24:01 +01:00
Vicent Llopis	b58020978a	fix: check cannot attach more than one file	2022-03-04 11:59:45 +01:00
Alex Moreno	a434d9268b	fix(zone_upcoming-deliveries): fix backgroundcolor	2022-03-04 11:48:18 +01:00
Vicent Llopis	d22be6620c	feat: add backTest	2022-03-04 11:28:45 +01:00
Vicent Llopis	cff1e6cfbf	feat: check cannot attach more than one pdf	2022-03-04 11:28:26 +01:00
Carlos Jimenez Ruiz	93ab24e853	Merge branch 'dev' into 3671-supplier_account	2022-03-04 08:39:52 +00:00
Vicent Llopis	f972afb13e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-04 09:38:33 +01:00
Vicent Llopis	02aeb84c0c	jgallego change	2022-03-03 14:42:29 +01:00
Vicent Llopis	2f87ac8c96	add test	2022-03-03 14:42:12 +01:00
Alex Moreno	6748426f67	correct loopback form	2022-03-03 13:48:18 +01:00
Alex Moreno	29d63d1e4d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3671-supplier_account	2022-03-03 13:05:08 +01:00
Alex Moreno	e082d18564	change description	2022-03-03 13:03:43 +01:00
Alex Moreno	f143619777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3669-order_search-panel	2022-03-03 13:03:13 +01:00
Carlos Jimenez Ruiz	63fc58b6ba	Merge branch 'dev' into 3649-claim_log	2022-03-03 12:00:02 +00:00
Joan Sanchez	9b4d091692	Merge branch 'dev' into 3669-order_search-panel	2022-03-03 10:38:16 +00:00
Vicent Llopis	4811254ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-02 15:07:38 +01:00
Vicent Llopis	ade34c1e0a	add section Autonomous	2022-03-02 14:59:30 +01:00
Alex Moreno	619baf2896	refactor claim_main controller	2022-03-02 11:07:35 +01:00
Alex Moreno	7c3945a921	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-03-02 10:47:56 +01:00
Alex Moreno	a05223681e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-03-02 10:43:06 +01:00
Alex Moreno	5efb678a53	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:32:18 +01:00
Alex Moreno	ccb5261ff6	Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:31:27 +01:00
Alex Moreno	26ed4b3c30	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:24:11 +01:00
Carlos Jimenez Ruiz	2b0f54c3aa	Merge branch 'dev' into 3646-claim-summary	2022-03-02 09:17:19 +00:00
Alex Moreno	44318903e7	feat(claim): add log section	2022-03-01 15:15:58 +01:00
Alex Moreno	2026e909e9	disable search observation	2022-03-01 11:43:35 +01:00
Alex Moreno	5a906d075a	Merge branch '3622-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter	2022-03-01 11:39:20 +01:00
Alex Moreno	772c85e5cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter	2022-03-01 11:39:09 +01:00
Joan Sanchez	10af48a739	Merge branch 'dev' into 3015-route_tickets_unlink	2022-03-01 10:13:41 +00:00
Joan Sanchez	b71e7440b3	Merge branch 'dev' into 3634-rocketchat_status	2022-03-01 09:49:11 +00:00
Alex Moreno	a27a48f251	fix(supplier_account): fix setWireTransfer and add test	2022-03-01 10:44:46 +01:00
Alex Moreno	2137a34b36	feat(supplier-account): isPayMethodChecked false when change model	2022-03-01 10:44:04 +01:00
Joan Sanchez	b7dd4952df	Merge branch 'dev' into 3622-client_defaulter	2022-03-01 09:33:38 +00:00
Alex Moreno	3f483d36f2	refactor(order_search-panel): change orderFk to ticketFk	2022-02-28 14:28:16 +01:00
Alex Moreno	4046617eab	short form	2022-02-28 13:37:44 +01:00
Alex Moreno	ab6b5aa803	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware	2022-02-28 13:14:34 +01:00
Alex Moreno	c9188658ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-02-28 12:40:52 +01:00
Alex Moreno	60e908d82a	feat(claim_summary): parentReload(), and test	2022-02-28 12:40:44 +01:00
Carlos Jimenez Ruiz	2647b4e423	Merge branch 'dev' into 3595-item-waste-folding	2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz	d1c884deb2	Merge branch 'dev' into 3609-ticket_basic-data	2022-02-28 09:58:27 +00:00
Carlos Jimenez Ruiz	4b963804c6	added transalation to item waste	2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz	bf0734ca67	excluded 3 test suites until db export	2022-02-28 10:46:14 +01:00
Carlos Jimenez Ruiz	a2d2e79738	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding	2022-02-28 10:21:21 +01:00
Alex Moreno	5434dd3baf	feat(claim_index): implemented smart-table and change state in summary	2022-02-28 07:57:46 +01:00
Alex Moreno	62286c2f9a	refactor(defaulter): simple route	2022-02-25 10:34:17 +01:00
Alex Moreno	bf712ba5af	feat(worker): absences can return all absences of worker	2022-02-25 10:33:47 +01:00
Vicent Llopis	90dc3bc5b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-02-25 08:22:15 +01:00
Vicent Llopis	7aa6601ec1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-02-25 07:52:22 +01:00
Juan Ferrer	c3e480b2e7	MariaDB user sync disabled in dev environment	2022-02-24 15:02:16 +01:00
Vicent Llopis	19887bdd16	feat: add section autonomous	2022-02-24 14:52:32 +01:00
Alex Moreno	fc3a46eb26	refactor(claim): removed importTicketSales and fix tests	2022-02-24 13:52:26 +01:00
Carlos Jimenez Ruiz	9ba13f90d3	#3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route	2022-02-23 16:12:29 +01:00
Vicent Llopis	ca40eee5ad	feat: add backTest	2022-02-23 14:53:49 +01:00
Alex Moreno	c33b8fbb83	refactor(worker): absences return one or all abscences	2022-02-23 14:50:59 +01:00
Vicent Llopis	9e06538fd0	fix: execute updatePortfolio after submit changes	2022-02-23 12:57:43 +01:00
Alex Moreno	52cf79516a	refactor(claim_summary): move responsability and improve fixtures	2022-02-23 12:23:47 +01:00
Joan Sanchez	9d298c2a5e	Updated unit tests	2022-02-23 12:07:05 +01:00
Alex Moreno	a5614e5d5d	change client.name for client.socialName	2022-02-23 09:52:45 +01:00
Vicent Llopis	c7db8c6b06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-02-23 09:12:25 +01:00
Vicent Llopis	30763e5c08	fix: backTest	2022-02-23 09:05:53 +01:00
Alex Moreno	8a8951b8b0	feat(client_defaulter): add columns to search	2022-02-23 08:53:25 +01:00
Alex Moreno	4e89c66e2c	refactor(client_defaulter): add column date	2022-02-22 08:58:22 +01:00
Alex Moreno	812d79f2d5	feat(client_defaulter): implemented smart-table	2022-02-21 15:11:39 +01:00
Alex Moreno	8bbb5d5c27	variable name	2022-02-21 11:28:00 +01:00
Alex Moreno	6a5d49a535	tabulations	2022-02-21 08:59:42 +01:00
Alex Moreno	71ddccb9a1	tabulations	2022-02-21 08:57:43 +01:00
Alex Moreno	32e3af0c25	tabulations	2022-02-21 08:53:37 +01:00
Alex Moreno	0f4649c50f	feat(ticket_descriptor-menu): docuware implemented	2022-02-21 08:48:53 +01:00
Alex Moreno	06255e0a07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware	2022-02-21 08:12:40 +01:00