281 Commits

Author	SHA1	Message	Date
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	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
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
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	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	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	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 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	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	9ab8b84290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-10 13:16:27 +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
Alex Moreno	dbc5c61050	fix(diver-route): supplierAgencyTerm	2022-05-02 14:53:03 +02:00
Alex Moreno	3f07400705	fix(delivery-note): type not required	2022-05-02 12:28:17 +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	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	3e33436bf6	fix(report): Check ticket property first	2022-02-16 09:53:38 +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
Joan Sanchez	41b92bdc21	Added report file names	2022-01-18 13:45:29 +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	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
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	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	da5be333d9	fix(osticket): don't show resolved tickets by other deparments	2021-10-18 08:22:14 +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