279 Commits

Author	SHA1	Message	Date
Carlos Satorres	2467534d1f	refs #5090 mod golabel	2023-05-03 09:23:16 +02:00
Guillermo Bonet	43bb762129	Merge branch 'dev' into 5237-greugeAlarmNotification	2023-04-26 07:46:15 +00:00
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Vicent Llopis	681b027098	refs #5456 añadida traducción al francés y corregida la de portugués	2023-04-20 15:11:01 +02:00
Guillermo Bonet	6f96820168	refs #5237 Ahora lee un conjunto de arrays	2023-04-19 10:16:37 +02:00
Joan Sanchez	b0f1bae33e	Added unit test	2023-04-11 08:56:50 +02:00
Joan Sanchez	b9e48f2102	Added translations & enable through departments	2023-04-11 07:39:43 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +02:00
Vicent Llopis	e1f7ba1343	refs #5456 feat: actualizada traduccion en castellano y añadida en portugues	2023-03-23 10:37:46 +01:00
Joan Sanchez	28730f3262	Attachment fixes	2023-03-14 09:01:05 +01:00
Carlos Satorres	1ef78ce8be	refs #5090 ultimo commit	2023-03-02 10:58:01 +01:00
Carlos Satorres	ab14cfde21	refs #5090 solucion final yml tab	2023-03-02 10:26:52 +01:00
Carlos Satorres	3df45c77e5	refs #5090 error linea26 solve	2023-03-02 10:04:14 +01:00
Carlos Satorres	9843b06e6e	refs #5090 correction error multiline	2023-03-02 10:01:15 +01:00
Carlos Satorres	892e3319b0	refs #5090 solucion error yml2	2023-03-02 09:57:09 +01:00
Carlos Satorres	7b7dcddce0	refs #5090 solucion de error yml	2023-03-02 09:51:15 +01:00
Carlos Satorres	1c3aa29642	refs #5090 model.ezp nuevo	2023-03-01 11:56:41 +01:00
Carlos Satorres	968f422054	refs #5090 Renamed QLabel to GoLabel	2023-03-01 11:43:07 +01:00
Guillermo Bonet	e231b0e12b	refs #5237 Added greuge notify	2023-03-01 10:11:22 +01:00
Alex Moreno	bbf68a88a7	feat: sendEmail checkBox and docuware open clientBalanceCreate with default data	2023-02-09 10:26:55 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alex Moreno	ce06274d0a	Merge branch 'dev' into 4658-createWorker	2023-01-23 07:12:26 +00:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Joan Sanchez	052e7b3c4a	Merge branch 'dev' into #5110-qlabel	2023-01-23 06:47:02 +00:00
Javi Gallego	30885a499e	link	2023-01-21 07:29:27 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Robert Ferrús	d5daa172d5	refs #5112 feat(print): create entry-update-comission template	2023-01-17 11:53:29 +01:00
Robert Ferrús	31d23f7dd1	feat(print): create entry-update-comission template ... refs #5112	2023-01-17 11:50:27 +01:00
Robert Ferrús	759a140e61	feat(print): create entry-update-comission template ... refs #4586	2023-01-17 11:45:50 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	2cc89d9ae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-13 13:54:16 +01:00
Alex Moreno	d7e8c4fafd	fix(print_invoiceIn): translation invoice to receipt	2023-01-13 09:28:44 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Vicent Llopis	1ddaf7ff08	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-20 10:52:23 +01:00
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +01:00
Alex Moreno	bb944f9fee	feat(newWorker): use worker-welcome	2022-12-12 15:05:49 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Vicent Llopis	c258587e02	feat: plantilla email para asientos contables importados incorrectamente	2022-11-29 15:06:21 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Alex Moreno	42adba3538	mail content	2022-11-23 15:11:46 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Alex Moreno	7c75eaadce	feat: worker-welcome	2022-11-21 15:15:25 +01:00
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +01:00
Joan Sanchez	d7729654ee	fix(ordersFilter): wrong table schema	2022-11-17 16:48:31 +01:00
Joan Sanchez	f501707adf	fix(ordersFilter): wrong table schema	2022-11-17 16:47:01 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alex Moreno	7a7da9508f	feat: workerWelcomeEmail	2022-11-15 12:56:30 +01:00
Alex Moreno	8f4ac8fcc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 10:12:29 +01:00
Pau	6eaee8faca	Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es	2022-11-15 06:06:20 +00:00
Alex Moreno	6113ea398d	feat: worker-welcome	2022-11-14 15:19:38 +01:00
Alex Moreno	db3a6df23d	feat(worker): new worker	2022-11-14 15:19:16 +01:00
Vicent Llopis	a30f50ffe5	refactor: borrado console.log	2022-11-14 12:20:27 +01:00
Pau	3c771fc771	refactor missing URL's refs #4609	2022-11-14 08:53:00 +01:00
Alex Moreno	d1dce73a33	feat: creat email/vehicle-event-expired	2022-11-14 08:50:38 +01:00
Vicent Llopis	7e50f23563	refacor code	2022-11-11 08:55:56 +01:00
Juan Ferrer	e7f26e8502	Merge branch 'master' into test	2022-11-11 00:56:20 +01:00
Juan Ferrer	ad741ba738	Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es	2022-11-10 20:37:11 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Joan Sanchez	303020a731	Attachment fixes	2022-11-10 11:51:14 +01:00
Joan Sanchez	133897c29f	Updated templates	2022-11-10 10:38:54 +01:00
Joan Sanchez	83798dfadb	Email template slots	2022-11-10 09:51:28 +01:00
Alex Moreno	cace29f75c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-09 14:20:17 +01:00
Alexandre Riera	ff2ee4401e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion	2022-11-09 13:26:54 +01:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alexandre Riera	908908a643	refs #4547 correcciones	2022-11-02 15:54:23 +01:00
Alex Moreno	2c3b735650	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-11-02 13:49:09 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Joan Sanchez	2fba17ab15	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 09:33:27 +00:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alexandre Riera	57e74fab38	refs #4716 tipos actualizados	2022-10-28 15:53:57 +02:00
Alexandre Riera	1246a65f32	refs #4547 informe y email generados	2022-10-28 14:49:22 +02:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Alex Moreno	e8500f926c	feat(invoiceIn): add email	2022-10-25 08:19:56 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Alex Moreno	2b060a1437	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-17 07:32:32 +02:00
Alex Moreno	2e36164a98	fix(recover-password): use pint/Email	2022-10-11 10:06:25 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Pau	3f9ba6b853	Refactor to verdnatura.es and shop.verdnatura.es	2022-10-03 14:22:52 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Joan Sanchez	410e651edd	Buyer waste	2022-09-27 07:24:45 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Joan Sanchez	92a476bd05	credit request	2022-09-22 09:42:04 +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
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Joan Sanchez	27ecff685e	fix(report): debtor letter with portuguese IBAN	2022-09-12 12:45:52 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	3fd34e0861	feat(claim_pickup_order): modify email	2022-07-25 14:49:39 +02:00
Vicent Llopis	699f19b0d4	refactor: change invoice id by refFk	2022-07-21 10:05:37 +02:00
Joan Sanchez	099189fdfb	Added translation	2022-06-22 14:17:41 +02:00
Joan Sanchez	cffff93cdc	Updated translations	2022-06-22 10:57:28 +02:00
Joan Sanchez	b2d57f4022	Added portuguese translation	2022-06-22 09:25:21 +02:00
Joan Sanchez	0e89616089	incoterms report refactor	2022-06-13 11:03:11 +02:00
Joan Sanchez	a5f3580b17	derp	2022-05-26 16:14:10 +02:00
Joan Sanchez	6586595976	feat(closure): send incoterms authorization	2022-05-19 07:31:00 +02:00
Joan Sanchez	558585fd15	Updated redmine link	2022-05-12 12:08:12 +02:00
Joan Sanchez	2fa284cd4b	Updated report anchor	2022-02-03 12:02:20 +01:00
Joan Sanchez	e618423ef8	Updated unit tests	2022-01-31 12:27:42 +01:00
Joan Sanchez	a8f56dce58	Updated prop types	2022-01-17 12:44:43 +01:00
Joan Sanchez	7d16d7aaf2	Closure refactor	2022-01-17 12:33:11 +01:00
Joan Sanchez	3f73084c7d	Changed report translations	2021-10-29 11:42:03 +02:00
Joan Sanchez	da5be333d9	fix(osticket): don't show resolved tickets by other deparments	2021-10-18 08:22:14 +02:00
Joan Sanchez	33754b7d67	Updated osticket report sql	2021-10-04 09:07:47 +02:00
Joan Sanchez	8d9a6b7f44	Changed invalid alias for osticket report	2021-10-04 08:53:35 +02:00
Joan Sanchez	560993cc8c	Removed unused translation	2021-09-17 11:34:26 +02:00
Joan Sanchez	2bf55f04bc	fix(osticket): Filter by non-merged tickets	2021-09-07 12:12:58 +02:00
Joan Sanchez	f24e7cafce	Merge branch 'dev' into 2989-client_debt_sample	2021-07-20 09:07:36 +00:00
Carlos Jimenez Ruiz	af321be095	Merge branch 'dev' into 3026-send_invoice	2021-07-20 07:52:42 +00:00
Joan Sanchez	bfd6c995ad	2989 - Added client deb statement sample	2021-07-20 09:09:46 +02:00
Joan Sanchez	e9b6c6b63e	3026 - Send invoice PDF	2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz	9a2fe0260e	last steps to preview credit request	2021-07-19 10:16:15 +02:00
Joan Sanchez	f6c4ef8150	HOTFIX: Compatible SQL with MySQL	2021-06-07 07:32:07 +02:00
Joan Sanchez	3ed6e65f33	Style fixes to osticket report	2021-05-03 07:31:06 +02:00
Joan Sanchez	38af26aca2	Mysql pool refactor	2021-04-27 10:29:09 +02:00
Joan Sanchez	65dc0e3780	2615 - Waste breakdown	2021-04-06 13:46:38 +02:00
Joan Sanchez	302dedef0f	Missing translations & attachment fix	2021-03-24 14:25:57 +01:00
Joan Sanchez	dfbf114161	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 12:10:06 +00:00
Joan Sanchez	ddf5993277	2708 - Added report	2021-01-18 08:33:20 +01:00
Joan Sanchez	946d0e8209	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-13 11:05:48 +01:00
Joan Sanchez	0e9160f61b	Letter debtor hotfix	2021-01-13 11:05:30 +01:00
Bernat Exposito	a13b554a26	supplier consumption email and fix report	2020-12-16 14:42:57 +01:00
Joan Sanchez	f17e9058b3	Refactor	2020-09-28 13:54:02 +02:00
Joan Sanchez	4d25fe88cf	Added functions to call sql from def	2020-09-25 14:45:00 +02:00
Joan Sanchez	7b9205ee1e	Actualizados títulos de albarán	2020-09-07 15:06:00 +02:00
Joan Sanchez	279677bda9	Removed report from descriptor	2020-06-15 09:07:13 +02:00
Joan Sanchez	b3db5681fe	2290 - Added consumption section	2020-06-12 09:18:19 +02:00
Joan Sanchez	9615fb063d	Fixed translation	2020-06-03 16:43:51 +02:00
Joan Sanchez	e606f95b65	Fixed translations	2020-06-03 16:14:18 +02:00
Carlos Jimenez Ruiz	98157fc45a	Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-27 07:10:27 +00:00
Joan Sanchez	23ec99d0f8	2274 - Added english translation	2020-05-26 08:24:38 +02:00
Joan Sanchez	e9e7ae08f2	Locale refactor	2020-05-22 15:20:55 +02:00
Joan Sanchez	f6efa7160e	2141 ReplyTo param	2020-05-20 16:23:53 +02:00
Joan Sanchez	1f714718bb	1878 - Implementar autenticación en servicio print	2020-03-05 13:56:45 +01:00
Joan Sanchez	0355d9bc27	Merge branch 'test' into dev	2020-01-20 07:58:34 +01:00
Joan Sanchez	40172e5c8c	corrección de formato	2020-01-20 07:39:11 +01:00
Joan Sanchez	826dfe8092	changes to percentage filter	2020-01-17 11:46:45 +01:00
Carlos Jimenez Ruiz	8807f64e09	Merge branch '1972-buyer_week_waste' of verdnatura/salix into dev	2020-01-17 11:42:53 +01:00