4933 Commits

Author	SHA1	Message	Date
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
Juan Ferrer	17b178b6bf	Merge branch 'test' into dev	2022-02-19 14:06:18 +01:00
Juan Ferrer	6f1bfbd955	roleConfig: fixes & refactor	2022-02-19 14:05:35 +01:00
Vicent Llopis	578685e05e	feat(client): add back route 'updatePortfolio'	2022-02-18 13:56:18 +01:00
Alex Moreno	6b1bd4ee92	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware	2022-02-18 10:17:18 +01:00
Vicent Llopis	05aa579156	fix: add role salesBoss to filter	2022-02-17 12:29:09 +01:00
Alex Moreno	89eee042b5	refactor(ticket_basic-data): zeroFill and move getMovable	2022-02-17 08:02:02 +01:00
Alex Moreno	d4b06d2d1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data	2022-02-17 07:31:31 +01:00
Alex Moreno	3aeb2adb56	feat(ticket): docuware pdf	2022-02-16 14:57:47 +01:00
Vicent Llopis	34730f48ed	fix: add role salesBoss to filter	2022-02-16 12:51:45 +01:00
Vicent Llopis	d7f252a57d	feat(invoiceIn): add section intrastat	2022-02-16 10:30:56 +01:00
Alex Moreno	651c92698f	feat(docuware): start download docuware	2022-02-15 16:48:37 +01:00
Carlos Jimenez Ruiz	401174b27a	removed focus on describe	2022-02-15 13:46:25 +01:00
Carlos Jimenez Ruiz	71875070e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding	2022-02-15 13:00:10 +01:00
Carlos Jimenez Ruiz	ac0e55107a	3595 feat(toggleHidden): itemWaste now can hide panels	2022-02-15 12:59:57 +01:00
Joan Sanchez	633679e26e	Merge branch 'dev' into 3315-notify_metrics	2022-02-15 10:52:34 +00:00
Joan Sanchez	5518fac357	Updated unit tests	2022-02-14 08:44:22 +01:00