842 Commits

Author	SHA1	Message	Date
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
Joan Sanchez	1f05e6fb3b	Label without header & footer	2022-11-10 14:50:08 +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	55b90d8a80	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template	2022-11-10 13:43:04 +01:00
Joan Sanchez	800d98a5b5	Removed unused components	2022-11-10 13:34:23 +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
Joan Sanchez	b8add5b0bc	Report template	2022-11-10 08:57:42 +01:00
Joan Sanchez	89e49c3843	Template component	2022-11-10 07:48:24 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +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
Joan Sanchez	f9eee431b4	fix(driver-route): routes with empty lines	2022-11-09 10:27:00 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Alex Moreno	2165ca0f34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-07 09:34:24 +01:00
Joan Sanchez	2f22753a65	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-04 13:06:55 +01:00
Joan Sanchez	785e7aa9fa	Enabled puppeteer cluster	2022-11-04 12:52:25 +01:00
Joan Sanchez	4d2003c714	Cluster rollback	2022-11-04 11:27:20 +01:00
Joan Sanchez	f5d24b9a9e	Changed param	2022-11-04 11:21:35 +01:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Alexandre Riera	d1636376d8	Merge branch 'dev' into 4650-observaciones-albaranes	2022-11-03 08:03:59 +00:00
Joan Sanchez	009e9e3bb7	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 07:35:02 +00:00
Alexandre Riera	b73fe06043	Merge branch 'dev' into 4497-services-intrastat	2022-11-03 07:22:57 +00:00
Alexandre Riera	84eb87e02a	refs #4547 cambios sql	2022-11-03 08:08:24 +01:00
Alexandre Riera	908908a643	refs #4547 correcciones	2022-11-02 15:54:23 +01:00
Alex Moreno	59e66e1f49	typo	2022-11-02 13:55:06 +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	5cefc82113	Merge branch 'dev' into 4650-observaciones-albaranes	2022-11-02 11:57:40 +00:00
Guillermo Bonet	af6acbd066	Merge branch 'dev' into 4550-printServer	2022-11-02 11:50:53 +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
Joan Sanchez	ea5c081a73	Merge pull request 'refs #4716 tipos actualizados' (!1115) from 4716-tipos-aceptados into dev ... Reviewed-on: #1115 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:26:03 +00:00
Joan Sanchez	67f2c00663	Merge branch 'dev' into 4497-services-intrastat	2022-11-02 06:24:03 +00:00
Alexandre Riera	b5889d2f40	refs #4497 servicios añadidos	2022-10-31 10:35:43 +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	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Alex Moreno	3a2fc984dd	refs #4564	2022-10-26 15:18:14 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Alex Moreno	a07a45c1b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-26 08:40:49 +02:00
Alexandre Riera	7948523685	refs #4650 cambios en la query	2022-10-25 15:03:09 +02:00
Alexandre Riera	67402dfe5e	refs #4650 observaciones añadidas	2022-10-25 13:27:04 +02:00
Alex Moreno	e8500f926c	feat(invoiceIn): add email	2022-10-25 08:19:56 +02:00
Joan Sanchez	4520443734	fix: Intl polyfill for spanish locale	2022-10-25 08:16:56 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Alex Moreno	6c38835e8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-24 08:20:25 +02:00
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Joan Sanchez	04be661b68	Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev ... Reviewed-on: #1094	2022-10-21 10:38:11 +00:00
Alex Moreno	c23d58da69	fix if not ticket	2022-10-20 14:21:36 +02:00
Alex Moreno	4b12405586	feat: report invoiceInPdf	2022-10-19 15:15:54 +02:00
Alex Moreno	192e61a70d	hotFix(route_index): fix driverRoutePdf	2022-10-19 14:54:13 +02:00
Joan Sanchez	dcd858c7d5	feat(print): 4690 - Puppeteer cluster	2022-10-19 14:30:36 +02:00
Guillermo Bonet	bd10c01550	Merge branch 'test' into 4550-printServer	2022-10-18 16:25:49 +02:00
Alex Moreno	c9073641aa	feat(invoiceInPdf): content	2022-10-18 14:58:38 +02:00
Alex Moreno	eb58839839	feat(invoiceIn): invoiceInPdf	2022-10-17 15:13:27 +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	143f713f2d	Package-lock	2022-10-06 12:56:48 +02:00
Joan Sanchez	9764b79f81	Restored engine versions	2022-10-06 12:52:50 +02:00
Joan Sanchez	123810c866	Removed strict	2022-10-06 12:45:44 +02:00
Joan Sanchez	137ee568df	Removed node requirements	2022-10-06 12:43:19 +02:00
Joan Sanchez	bfc67ed79b	Engine requirements	2022-10-06 12:40:28 +02:00
Joan Sanchez	22187c1450	Enforce npm node version	2022-10-06 11:32:13 +02:00
Joan Sanchez	11da463972	Renamed puppeteer method	2022-10-06 10:38:44 +02:00
Joan Sanchez	b8615fef46	Upgraded puppeteer	2022-10-05 14:30:13 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Guillermo Bonet	2c7cce4b36	second commit	2022-10-04 13:06:59 +02:00
Guillermo Bonet	23726b6e60	first commit	2022-10-04 10:55:13 +02:00
Pau	3f9ba6b853	Refactor to verdnatura.es and shop.verdnatura.es	2022-10-03 14:22:52 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	e4b61f81a9	Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev ... Reviewed-on: #1066 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-03 07:41:58 +00:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Joan Sanchez	7fd4728c33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-30 14:13:16 +02:00
Joan Sanchez	4005d6f82a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-09-30 13:55:53 +02:00
Joan Sanchez	12f4ef0850	fix(print): log sent mails	2022-09-30 13:55:41 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	3601881026	Client consumption queue	2022-09-29 14:43:27 +02:00
Joan Sanchez	d7b563c5ec	Debug logs	2022-09-29 10:09:01 +02:00
Joan Sanchez	4172229051	Closure hotfix	2022-09-29 09:35:57 +02:00
Joan Sanchez	5aec280adb	Closure migration	2022-09-29 09:07:18 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Joan Sanchez	d7ab95fcc8	closure	2022-09-27 15:00:12 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Javi Gallego	426ff5f753	selector con weightByPieceCheckbox	2022-09-27 11:26:36 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +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	5a43bdb6c9	Delivery note	2022-09-21 13:18:32 +02:00
Vicent Llopis	888f70abcc	fix: required is true	2022-09-21 08:12:08 +02:00
Vicent Llopis	c17e0fd38b	feat: add new report	2022-09-21 08:11:04 +02:00
Vicent Llopis	9f1c90387b	feat: add new report vehicleExpired	2022-09-20 08:18:44 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Joan Sanchez	f3fe19360a	Closure refactor	2022-09-13 13:20:18 +02:00
Joan Sanchez	27ecff685e	fix(report): debtor letter with portuguese IBAN	2022-09-12 12:45:52 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Javi Gallego	5e54e27718	quito left en taxes	2022-08-17 12:19:54 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Joan Sanchez	398df267a7	Item-label locale	2022-08-09 11:58:42 +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
Vicent Llopis	2d57b3bd54	Merge branch 'dev' into 4221-intrastat	2022-07-12 06:10:20 +00:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Vicent Llopis	459a1fe518	feat: update instrastat.sql	2022-06-29 14:15:22 +02:00
Joan Sanchez	121efcca2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-28 12:57:01 +02:00
Joan Sanchez	ae8aae6c20	Changed scope	2022-06-28 11:58:01 +02:00
Joan Sanchez	5714eb80f2	fix(closure): Wrong error handler scope	2022-06-28 11:21:47 +02:00
Joan Sanchez	099189fdfb	Added translation	2022-06-22 14:17:41 +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	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	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	4118f52a2f	Force master update	2022-06-20 10:04:00 +02:00
Joan Sanchez	0e89616089	incoterms report refactor	2022-06-13 11:03:11 +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
Alex Moreno	7dffe4edcb	quit vn_curdate of sql in print	2022-06-10 07:58:56 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +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
Joan Sanchez	a5f3580b17	derp	2022-05-26 16:14:10 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +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
Carlos Jimenez Ruiz	a7b56b3b89	Merge branch 'dev' into 3327-global_invoicing	2022-05-10 12:19:31 +00:00
Alex Moreno	dbc5c61050	fix(diver-route): supplierAgencyTerm	2022-05-02 14:53:03 +02:00
Joan Sanchez	d156cb1c30	Queue transaction	2022-05-02 13:52:57 +02:00
Alex Moreno	3f07400705	fix(delivery-note): type not required	2022-05-02 12:28:17 +02:00
Joan Sanchez	ea6b1abdd8	Invoice queue	2022-05-02 09:51:49 +02:00
Joan Sanchez	fea7df269c	Added invoice schedule method	2022-04-28 14:59:29 +02:00
Joan Sanchez	c923526342	refactor(invoicing): send invoice to print queue	2022-04-28 08:14:33 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Carlos Jimenez Ruiz	7209bc52de	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 08:10:30 +00:00
Vicent Llopis	64ae7ee8ea	feat: modify filter	2022-03-28 13:24:26 +02:00
Vicent Llopis	1e587be2ed	(fix): filter repaired	2022-03-28 11:57:19 +02: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	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
Alex Moreno	2d9163ea1b	use computed function	2022-03-23 09:48:09 +01:00
Alex Moreno	ebfd0bdb29	use computed function	2022-03-23 09:46:44 +01:00
Alex Moreno	1051a9cafb	traductions	2022-03-23 09:42:00 +01:00
Alex Moreno	4a323d2cfb	report-footer use function	2022-03-23 09:27:10 +01:00
Alex Moreno	0dc1848870	feat(print_deliveryNote): add withoutPrices type	2022-03-22 15:13:34 +01:00
Alex Moreno	4112fe84c0	change footer	2022-03-22 14:59:57 +01:00
Alex Moreno	ca35c88be4	feat(print_deliveryNote): add proforma type	2022-03-22 07:38:14 +01:00
Alex Moreno	a2b06e7248	feat(print_claim-pickup-order): add claimConfig	2022-03-18 13:22:39 +01:00
Alex Moreno	62aeea04bc	refactor(print): report driver-route remove ticket.import	2022-03-08 15:15:59 +01:00
Carlos Jimenez Ruiz	d2871ff3a6	Merge branch 'dev' into 3623-reportInvoice_intrastat	2022-02-28 10:12:36 +00:00
Joan Sanchez	b4c4c6dfff	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-18 08:50:50 +01:00
Joan Sanchez	c260917e20	fix(closure): removed transaction	2022-02-18 08:49:31 +01:00
Joan Sanchez	2bdb1075fb	fix(invoice): prevent report empty pages	2022-02-17 11:25:20 +01:00
Joan Sanchez	743972e9c3	fix(invoice): prevent report empty pages	2022-02-17 11:23:27 +01:00
Vicent Llopis	72f4ef70ed	recalculate neto in sql	2022-02-17 10:18:47 +01:00
Joan Sanchez	8b60dbacfa	fix(report): Check ticket property first	2022-02-17 09:27:11 +01:00
Joan Sanchez	3e33436bf6	fix(report): Check ticket property first	2022-02-16 09:53:38 +01:00
Joan Sanchez	5518fac357	Updated unit tests	2022-02-14 08:44:22 +01:00
Joan Sanchez	f4ff854a1f	feat(notification): notify client metrics ... Refs: 3315	2022-02-09 14:06:06 +01: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
Javi Gallego	5fbbae7ac6	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-24 15:40:37 +01:00
Joan Sanchez	f657299229	Merge branch 'dev' into 3519-hide_logo	2022-01-21 12:45:10 +00:00
Joan Sanchez	f5217c3ebc	Removed package-lock files	2022-01-21 10:43:47 +01:00
Joan Sanchez	5ff950d078	refactor(invoice): hide report logo for non group companies #3519	2022-01-21 10:33:40 +01:00
Joan Sanchez	cb8b0e9657	Removed comments	2022-01-20 11:56:04 +01:00
Joan Sanchez	e3795ea072	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-20 11:05:25 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Joan Sanchez	071d15b79d	puppeter not longer launch instances at service boot	2022-01-19 12:29:00 +01:00
Joan Sanchez	38965ba50e	Removed package-lock	2022-01-19 09:16:02 +01:00
Joan Sanchez	4db6ddba54	Updated closure queries	2022-01-19 09:12:10 +01:00
Joan Sanchez	d626a69175	Read routes from file	2022-01-19 08:40:13 +01:00
Joan Sanchez	0b2d62b2bf	Added axios as http package	2022-01-18 17:08:58 +01:00
Joan Sanchez	41b92bdc21	Added report file names	2022-01-18 13:45:29 +01:00
Joan Sanchez	47c7b36936	CSV method refactor	2022-01-18 13:15: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
Carlos Jimenez Ruiz	f20f2ecf03	package-locks due to loopback vn-mysql error	2022-01-14 16:14:48 +01:00
Joan Sanchez	63ea0902d1	refactor(print): print service refactor with better router handler ... Refs: 3245, 3477, 2800	2022-01-05 14:48:21 +01:00
Alex Moreno	5d3fedcbed	feat(print_claim-pickup-order): add client.phone	2021-12-22 12:52:14 +01:00
Joan Sanchez	805cdd6418	3112 - addd cmr-authorization report	2021-12-13 08:23:44 +01:00
Javi Gallego	c8e9416448	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-19 07:33:54 +01:00
Joan Sanchez	03c7b3f743	fix(smtp): exclude png files on attachments	2021-11-18 11:13:10 +01:00
Javi Gallego	dc42c18ead	after gulp	2021-11-18 07:38:49 +01:00
Joan Sanchez	b7e58aa9cd	fix(smtp): log attachment files sent through email	2021-11-16 11:00:48 +01:00
Joan Sanchez	02e651eac8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-12 09:45:05 +01:00
Joan Sanchez	f32db33ed9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-12 09:43:50 +01:00
Joan Sanchez	bcaa11a3c4	fix(invoice): order by shipped	2021-11-12 08:45:02 +01:00
Joan Sanchez	cae69a2ce4	fix(invoice): order tickets by id on invoice report	2021-11-12 08:35:00 +01:00
Joan Sanchez	06b72ae708	fix(pickup-order): changed sql query from pickup order	2021-11-08 07:41:10 +01:00
Joan Sanchez	026e5d706f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-10-29 11:43:05 +02:00
Joan Sanchez	3f73084c7d	Changed report translations	2021-10-29 11:42:03 +02:00
Joan Sanchez	6578a498ca	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 12:13:33 +02:00
Joan Sanchez	66830f32fd	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 11:58:23 +02:00
Joan Sanchez	2cdc22bc4d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-22 11:46:16 +02:00
Joan Sanchez	8a679b2c8b	fix(invoice): fixed error for invoice with incoterms	2021-10-22 10:26:40 +02:00
Joan Sanchez	9986d4eb03	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 15:11:20 +02:00
Joan Sanchez	5209414613	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 13:46:17 +02:00
Joan Sanchez	ee1a7952ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-18 09:44:27 +02:00
Joan Sanchez	b970214a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-18 09:31:50 +02:00
Joan Sanchez	da5be333d9	fix(osticket): don't show resolved tickets by other deparments	2021-10-18 08:22:14 +02:00
Carlos Jimenez Ruiz	1ba2a924e6	refactor(print): chrimoum is now a single process on each instance with no child processes	2021-10-15 16:15:00 +02:00
Joan Sanchez	e641a947b3	Updated unit tests	2021-10-08 09:51:42 +02:00
Joan Sanchez	4610ed83d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-07 10:28:06 +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	8828247b0d	fix(invoice): prevented error for invoiced tickets without sales	2021-10-04 08:41:34 +02:00
Joan Sanchez	1ec20e250c	feat(invoice): Send invoice and delivery-note on CSV format	2021-10-01 12:41:31 +02:00
Joan Sanchez	39ff9d0ddb	Removed package-lock	2021-09-24 08:19:12 +02:00
Joan Sanchez	8c3a3d83e0	Removed vn-mysql package	2021-09-23 07:59:56 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Joan Sanchez	32d492efd3	refactor(deliveryNote): updated report translations	2021-09-21 13:03:07 +02:00
Joan Sanchez	c9cda92fbf	refactor(smtp): replaced field "sender" with "receiver"	2021-09-20 14:32:15 +02:00
Joan Sanchez	f90eb4c39d	refactor(deliveryNote): added warning text for non returned packagings ... Refs: 3097	2021-09-20 08:57:51 +02:00
Joan Sanchez	560993cc8c	Removed unused translation	2021-09-17 11:34:26 +02:00
Joan Sanchez	f5b1eb3ccd	feat(closure): send to driver the route report on route closure	2021-09-10 10:38:19 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Joan Sanchez	2bf55f04bc	fix(osticket): Filter by non-merged tickets	2021-09-07 12:12:58 +02:00
Javi Gallego	cffe25d41f	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-08-18 12:38:41 +02:00
Javi Gallego	bb764e206a	test	2021-08-18 12:36:18 +02:00
Joan Sanchez	7ebabfdc24	Removed empty translations	2021-08-13 16:34:54 +02:00
Joan Sanchez	6143992238	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-22 08:39:47 +02:00
Joan Sanchez	50629804cb	HOTFIX: Changed param order on insert email into queue	2021-07-22 08:39:15 +02:00
Joan Sanchez	dbe680a58c	3004 - Deprecated ticket_closeAll()	2021-07-20 13:06:31 +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	724da74204	removed footer unused bindings and added date	2021-07-19 10:57:08 +02:00
Carlos Jimenez Ruiz	4ed31f5172	added footerr to report	2021-07-19 10:42:12 +02:00
Carlos Jimenez Ruiz	9a2fe0260e	last steps to preview credit request	2021-07-19 10:16:15 +02:00
Carlos Jimenez Ruiz	347c1ae197	Merge branch 'dev' into 2974-receipt_amountUnpaid	2021-07-01 08:20:36 +00:00
Joan Sanchez	d09ab13ba1	Replaced customer_risk with clientRisk	2021-07-01 09:56:22 +02:00
Joan Sanchez	2643d79781	Reformat rollback	2021-07-01 08:41:04 +02:00
Joan Sanchez	9cd6728956	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2847-driver_route	2021-07-01 08:35:17 +02:00
Joan Sanchez	c8bfc911c2	2974 - Get amount unpaid from customer_risk	2021-07-01 08:33:56 +02:00
Carlos Jimenez Ruiz	08360bfdc4	deprecated alertLevel.alertLevel now using alertLevel.id	2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz	625722e4da	package-lock up to date in all services	2021-06-23 13:40:22 +02:00
Joan Sanchez	3ae520d247	2847 - Driver route now shows item packaging type	2021-06-21 09:10:47 +00:00
Joan Sanchez	325afe2245	2906 - Number of packages	2021-06-18 08:42:55 +02:00
Joan Sanchez	9c09d60775	Updated var name	2021-06-16 13:14:13 +02:00
Joan Sanchez	e7c62d2e71	2956 - Fix for extra community report	2021-06-16 13:04:54 +02:00
Joan Sanchez	f6c4ef8150	HOTFIX: Compatible SQL with MySQL	2021-06-07 07:32:07 +02:00
Joan Sanchez	83071d163f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-27 10:50:22 +02:00
Joan Sanchez	c533973398	HOTFIX: Invoice regeneration error	2021-05-27 10:49:19 +02:00
Joan Sanchez	a376ca32df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-21 14:23:50 +02:00
Joan Sanchez	95073183e9	Email rollback	2021-05-21 14:19:39 +02:00
Joan Sanchez	dcebe94294	Show supplier name on route-driver report	2021-05-18 14:21:49 +02:00
Joan Sanchez	7e4b540af1	Updated company address	2021-05-12 14:47:00 +02:00
Carlos Jimenez Ruiz	c12a2ceec9	instructions added to sepa core report	2021-05-04 11:53:47 +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
jorgebl	868a0dbff7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-23 09:43:34 +01:00
jorgebl	fb5af479e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order	2021-03-22 10:58:13 +01:00
jorgebl	5f95bf4e15	Removed vn-horizontal and styles in the spans	2021-03-22 10:23:52 +01:00
Joan Sanchez	41ce834264	Removed unused require	2021-03-16 14:00:15 +01:00
Joan Sanchez	db9d1c84e0	Requested changes	2021-03-16 13:37:59 +01:00
jorgebl	37c29584af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order	2021-03-16 11:23:49 +01:00
jorgebl	7da8f21777	Put new email	2021-03-16 11:23:44 +01:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Carlos Jimenez Ruiz	0aaf7b32ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance	2021-03-15 12:32:08 +01:00
Joan Sanchez	1acd5dc838	Closure to dayEnd	2021-03-15 12:03:19 +01:00
Joan Sanchez	893cca52cc	Changes	2021-03-15 11:49:35 +01:00
Joan Sanchez	060fc2ac21	Closure by date	2021-03-15 11:07:44 +01:00
Carlos Jimenez Ruiz	2b8286eb28	deprecated dependencies, replaced babel/polyfill	2021-03-12 17:15:26 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Joan Sanchez	1e36b460a1	Added invoice incoterms report	2021-03-01 11:25:37 +01:00
Joan Sanchez	cc00587b66	Small refactor	2021-02-25 09:00:49 +01:00
Joan Sanchez	bb45d78062	Changes made	2021-02-24 07:51:05 +01:00
Joan Sanchez	20d9a99f6b	Changes	2021-02-18 13:01:01 +01:00
Joan Sanchez	af5f0db7f8	2734 - Added invoice report	2021-02-17 13:00:06 +01:00
Carlos Jimenez Ruiz	7ec1e4272a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-19 20:56:40 +01:00
Carlos Jimenez Ruiz	b28b9be3d8	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 13:51:58 +00:00
Joan Sanchez	3625ea2c36	Updated delivery note with botanical field	2021-01-19 14:43:40 +01:00
Joan Sanchez	dfbf114161	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 12:10:06 +00:00
Carlos Jimenez Ruiz	464366fdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01: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
Joan Sanchez	1353a0987d	2700 - Closure by multiple agencies	2021-01-04 09:22:32 +01:00
Joan Sanchez	6416b0ad79	2666 - Closure invalid email notification	2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz	ffc9b8dba9	Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev ... Reviewed-on: #470 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-21 09:55:45 +00:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Bernat Exposito	ac6d97c026	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption	2020-12-18 10:10:09 +01:00
Bernat Exposito	b9344832d6	cr changes	2020-12-18 10:08:51 +01:00
Bernat Exposito	a13b554a26	supplier consumption email and fix report	2020-12-16 14:42:57 +01:00
Joan Sanchez	8ee68d9fae	Added unit test & updated translation	2020-12-16 12:21:15 +01:00
Joan Sanchez	56ec7714ed	Updated reports	2020-12-16 11:40:51 +01:00
Joan Sanchez	5ecd589106	Updated delivery note	2020-12-16 09:24:11 +01:00
Bernat Exposito	e1ac64a8d9	supplier consumption	2020-12-16 08:05:41 +01:00
Joan Sanchez	d959dbc058	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-11 07:34:34 +01:00
Joan Sanchez	637116b17d	Added descriptor-menu component	2020-11-09 14:52:25 +01:00
Joan Sanchez	a30cfd2218	Added unit test	2020-11-05 09:21:20 +01:00
Juan Ferrer	9b563cb8bf	LDAP & Samba synchronization fixes + improvements	2020-10-31 00:02:27 +01:00
Joan Sanchez	2842b66cbd	Delivery note signature hotfix	2020-10-19 08:10:32 +02:00
Joan Sanchez	5680e86363	2437 - Changed to "EN" default locale	2020-10-07 08:03:21 +02:00
Joan Sanchez	2ab7999816	Removed unused param dirname	2020-09-29 14:10:13 +02: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
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Joan Sanchez	cf2c8ca0c8	Updated translation	2020-09-17 09:16:13 +02:00
Joan Sanchez	27a1a45d71	Añadido CIF/NIF	2020-09-16 14:46:37 +02:00
Joan Sanchez	652812bca4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 13:37:20 +02:00
Joan Sanchez	26f0958838	Trigger build	2020-09-14 13:25:37 +02:00
Joan Sanchez	c077afcfed	Changed var	2020-09-14 12:34:13 +02:00
Joan Sanchez	076ee50c0f	Config file path fix	2020-09-14 12:14:22 +02:00
Joan Sanchez	559a2e9721	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 11:56:58 +02:00
Joan Sanchez	7043b833d0	Pdf optimization	2020-09-14 11:44:10 +02:00
Joan Sanchez	ea6aed351a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 09:56:48 +02:00
Joan Sanchez	279120dd03	Launch puppeteer browser on app start	2020-09-14 09:38:48 +02:00
Joan Sanchez	21c4b8db14	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 08:59:59 +02:00
Joan Sanchez	edf3f1e96e	Removed temporary table on ticket closure	2020-09-14 08:51:46 +02:00
Juan Ferrer	4b5d2cd0dd	2177 account module ... LDAP test RC1 SQL version changed Tests fixes Back & front tests fixed All tests passed Front and back tests plus some fixes	2020-09-11 14:36:16 +02:00
Joan Sanchez	7b9205ee1e	Actualizados títulos de albarán	2020-09-07 15:06:00 +02:00
Joan Sanchez	c3e8c0cc58	Changes	2020-09-07 12:51:49 +02:00
Joan Sanchez	fa634d2dad	2285 - Added closure paths	2020-09-07 12:51:38 +02:00
Joan Sanchez	f3a7fc514a	Changes	2020-09-07 10:54:39 +02:00
Joan Sanchez	66f4674392	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure	2020-09-07 10:05:52 +02:00
Joan Sanchez	9ef58cabd4	Removed console log	2020-08-25 14:10:38 +02:00
Joan Sanchez	cd74e9684a	Download route PDF on route index	2020-08-25 10:00:21 +02:00
Joan Sanchez	55b3e962a4	Merge branch 'dev' into 1361-calendar_date_filter	2020-08-18 12:03:31 +00:00
Joan Sanchez	cacf562954	Audit fix	2020-08-18 14:01:43 +02:00
Carlos Jimenez Ruiz	f38701bb43	unit testing filter	2020-08-13 10:03:50 +02:00
Joan Sanchez	debd2a8693	Added puppeteer no-sandbox	2020-08-12 07:52:43 +02:00
Joan Sanchez	cff9a64e54	puppeteer 2.0	2020-08-11 15:07:41 +02:00
Joan Sanchez	91fb2e954c	Added puppeteer to package.json	2020-08-11 13:51:18 +02:00
Joan Sanchez	0335d6c51e	Removed commented lines	2020-07-09 08:45:17 +02:00
Joan Sanchez	11ae95daba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2162-print_pdf_puppeteer	2020-07-06 13:06:46 +02:00
Joan Sanchez	b9cc71aeba	There's no way to prevent tbody page-break	2020-07-06 12:59:16 +02:00
Joan Sanchez	c6dc1b6b23	Label report fixes & report options are not longer shared	2020-07-06 08:27:05 +02:00
Carlos Jimenez Ruiz	f2e1f00ae3	using csss variables plus a traduction	2020-07-03 16:43:45 +02:00
Joan Sanchez	6fe50dc040	Switch to puppeteer	2020-07-02 16:07:26 +02:00
Joan Sanchez	5d9ed49451	2285 - Added closure paths	2020-06-16 08:17:01 +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	e25b87213b	2305 - Added noReply param	2020-06-05 08:23:52 +02:00
Joan Sanchez	ba3a52d7bb	Fixed request args	2020-06-03 18:06:30 +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
Joan Sanchez	562ebceebe	Fixed closure sql	2020-06-03 14:56:34 +02:00
Joan Sanchez	539afcd19b	2287 - Notify to sales person	2020-06-03 11:32:30 +02:00
Joan Sanchez	59e0336474	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-02 19:11:37 +02:00
Joan Sanchez	6e371da2ad	Removed waiting request	2020-06-02 18:28:13 +02:00
Joan Sanchez	3d8bc3b7b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-01 13:32:35 +02:00
Joan Sanchez	554619093c	Changed closure procedure	2020-06-01 12:50:50 +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	959417e681	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to	2020-05-18 16:27:39 +02:00
Joan Sanchez	ad861c2db3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-04-09 20:05:12 +02:00
Joan Sanchez	87f0a7e417	delivery-note get ticket address fix	2020-04-09 20:03:45 +02:00
Joan Sanchez	e826cdfee4	Some changes	2020-03-31 08:18:10 +02:00
Joan Sanchez	676033060d	2152 - Show identifier at file name on downloads	2020-03-16 09:51:29 +01:00
Bernat Exposito Domenech	6aa1a5137b	fix report	2020-03-06 13:00:03 +01:00
Joan Sanchez	b650643b38	Removed param	2020-03-06 11:19:18 +01:00
Joan Sanchez	30d5370080	Rmoved space	2020-03-05 14:37:52 +01:00
Joan Sanchez	1f714718bb	1878 - Implementar autenticación en servicio print	2020-03-05 13:56:45 +01:00
Joan Sanchez	675fa807e6	Added authentication	2020-03-05 09:28:20 +01:00
Joan Sanchez	b736303610	2144 - Prevent page break on data tables	2020-03-03 13:22:36 +01:00
Bernat Exposito Domenech	c48da59314	report entry-order	2020-02-24 08:44:43 +01:00
Bernat Exposito Domenech	aecfe2b8a9	report entry-order	2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech	2be5e04a39	changed title in report driver-route	2020-02-12 13:20:08 +01:00
Bernat Exposito Domenech	1d73d9f89d	refactor campaing report	2020-02-11 13:25:41 +01:00
Joan Sanchez	57acca2f5e	refactor & updated tests	2020-01-23 13:31:07 +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	1fcd54e8d7	Merge branch 'test' into dev	2020-01-17 13:33:57 +01:00
Joan Sanchez	6b314d8dbe	fixed date bug	2020-01-17 13:22:32 +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
Joan Sanchez	2b2e6532f6	changes to percentage filter	2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech	bc40473e9b	modificar plantilla	2020-01-15 08:48:17 +01:00
Joan Sanchez	0999c7e2ca	renamed field	2020-01-09 07:54:34 +01:00
Joan Sanchez	a702d14fa9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1972-buyer_week_waste	2020-01-09 07:52:35 +01:00
Juan Ferrer	a979a17482	Merge branch 'test' into dev	2020-01-08 13:53:10 +01:00
Joan Sanchez	4f32333894	Updated report phone extension	2020-01-08 12:29:52 +01:00
Joan Sanchez	6c9def9c6c	changed translation	2020-01-08 09:06:19 +01:00
Joan Sanchez	e7433fab24	some fixes	2020-01-08 08:53:07 +01:00
Joan Sanchez	d815948795	Added buyer week-waste email #1972	2020-01-03 13:52:42 +01:00
Joan Sanchez	b4e7a1e3e0	Changed sepa-core title	2019-12-27 10:29:20 +01:00
Juan Ferrer	4f0a54329a	Print read config from local	2019-12-24 09:03:15 +01:00