825 Commits

Author	SHA1	Message	Date
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +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	68f3544477	Claim pickup order	2022-09-22 09:17:14 +02: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
Joan Sanchez	793705413e	#452 - Dumped db	2022-09-16 07:05:27 +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
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
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	31aafc0719	feat: add inserts in printQueue	2022-08-10 09:11:38 +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
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
Alex Moreno	8a08b6f399	feat(ticket_boxing): return video stream	2022-08-02 15:15:05 +02: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	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
Alex Moreno	3fd34e0861	feat(claim_pickup_order): modify email	2022-07-25 14:49:39 +02:00
Alex Moreno	8048d4ce90	feat(notification): basic functionality and test	2022-07-25 08:25:10 +02:00
Alex Moreno	f432d64f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-07-25 07:45:26 +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
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	9035123c53	feat: update structure	2022-07-21 10:36:21 +02:00
Alex Moreno	9b48cbb078	feat(notification): send	2022-07-20 14:54:50 +02:00
Alex Moreno	7895decf4e	feat(notification): create models	2022-07-19 15:17:22 +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	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	48d4d4e964	try jenkins backTest	2022-07-12 14:26:28 +02:00
Vicent Llopis	f73012486c	try jenckins backTest	2022-07-12 13:43:13 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Alex Moreno	051a849a21	fix(zone): fix getEventsFiltered	2022-07-12 08:10:29 +02: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	189d0a27bc	refactor: delete unnecessary sql	2022-07-05 11:44:03 +02:00
Vicent Llopis	5f2f5b9b25	feat: add sql changes	2022-07-05 10:18:26 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Alex Moreno	c02433faab	typo	2022-06-30 13:24:26 +02:00
Alex Moreno	c88df46b4f	typo	2022-06-30 13:23:57 +02:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Alex Moreno	f6b9327fb5	try	2022-06-29 08:43:43 +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
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	0197f08c48	typo	2022-06-27 14:13:50 +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	212c351064	fix(item_create): fixtures and test	2022-06-27 13:17:22 +02:00
Carlos Jimenez Ruiz	57fd528e9b	removed fixtures from deprecated column	2022-06-27 12:20:17 +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
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
Alex Moreno	9acd98e7b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4233-export-database	2022-06-27 07:15: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
Alex Moreno	86eb31ce65	fix(db_structure): change vn.VN_ to util.VN_	2022-06-23 14:22:28 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Juan Ferrer	7d67ca0e89	DB structure & data export, DB Dockerfile version changed to 10.7.3	2022-06-23 12:14:16 +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	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Vicent Llopis	c49f563299	feat: add fixtures	2022-06-16 10:59:17 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Joan Sanchez	0e89616089	incoterms report refactor	2022-06-13 11:03:11 +02:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz	cd5dba6fcb	Merge branch 'dev' into 4040-chat_sendQueued	2022-06-09 08:44:22 +00: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	3eac002fb4	feat: add queue to send rocket messages	2022-06-03 12:22:07 +02:00
Vicent Llopis	f6028316f4	feat: endpoint sendQueued addded	2022-06-02 14:55:39 +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	f7be419bbe	refator: updated fixtures	2022-06-02 11:52:53 +02:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Vicent Llopis	6359c9e5bf	feat: add fixtures	2022-05-26 15:08:23 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +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
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	ab6a0425f5	refactor: translate fixtures	2022-05-23 12:47:43 +02:00
Vicent Llopis	875e9503c3	refactor: request changes	2022-05-20 13:16:47 +02:00
Vicent Llopis	c9bfbe990a	refactor: request changues	2022-05-20 12:53:10 +02:00
Vicent Llopis	c5683ab880	feat: added itemShelving	2022-05-20 09:17:18 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	9eae1f479c	add table vn.printer	2022-05-17 10:39:46 +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	7ad56327a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-17 08:21:49 +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
Joan Sanchez	9cbee7a38a	Merge branch 'dev' into 3771-ticket.expedition	2022-05-13 13:05:08 +00:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +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
Carlos Jimenez Ruiz	442644d3f1	Merge branch 'dev' into 3940-export_database	2022-05-11 12:57:29 +00: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
Vicent Llopis	a0af774837	fix: test	2022-05-06 09:02:52 +02:00
Juan Ferrer	bfd8c8d47a	DB export	2022-05-04 15:58:36 +02:00
Alex Moreno	ac4d4e6db1	test and fixtures	2022-05-04 10:59:37 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Juan Ferrer	6d5d9ca0e4	DB export	2022-05-04 07:54:45 +02:00
Vicent Llopis	d0f9613b4e	delete hedera fixtures	2022-05-04 07:19:45 +02:00
Alex Moreno	b40b8d931d	feat(client_credit): remove de old rows	2022-05-02 11:18:39 +02:00
Juan Ferrer	6bdcdbb13c	DB structure & data export ... Hedera tables added to data export	2022-05-02 10:57:13 +02:00
Vicent Llopis	ad80d0501c	add fixtures	2022-04-28 07:48:09 +02:00
Vicent Llopis	5211a0d9d7	feat(supplier.fiscal-data): add two fields	2022-04-25 11:51:34 +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
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +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	b087d275dc	Merge branch 'dev' into 3605-invoiceIn_intrastat3	2022-04-11 10:29:01 +00:00
Vicent Llopis	c00be015ab	feat(claim_photo): add fixtures and backTest	2022-04-08 13:53:25 +02:00
Alex Moreno	dd9a38d1bf	feat(client_search-panel): filter by province	2022-04-06 12:29:00 +02:00
Alex Moreno	d616367714	fix(test): use static dates	2022-04-05 07:46:49 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +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	5f29b272e1	feat: add fixtures	2022-03-31 11:38:08 +02:00
Vicent Llopis	bb267dad16	feat: add fixtures	2022-03-31 09:17:27 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +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
Joan Sanchez	bbbb0df1cd	Merge branch 'dev' into 3781-export_database	2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +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
Vicent Llopis	889dcf8763	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database	2022-03-29 08:56:59 +02:00
Alex Moreno	f853696d03	change fixture name	2022-03-28 13:59:39 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	8d70bac5c6	Merge branch 'dev' into 3621-worker_calendar	2022-03-28 10:13:21 +00:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Juan Ferrer	85de742630	Export data & structure	2022-03-28 09:44:29 +02:00
Vicent Llopis	e02ab9dd2d	feat: add fixtures	2022-03-24 11:39:19 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00