455 Commits

Author	SHA1	Message	Date
Carlos Satorres	5b6eb0a2a6	refs #5768 add address, nickname, pdf, email	2023-10-05 14:01:07 +02:00
Carlos Satorres	f2adbc1716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-04 13:54:18 +02:00
Jorge Penadés	c35899542d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-04 08:40:44 +02:00
Carlos Satorres	ed3871f75c	refs #5861 edit css	2023-10-03 14:03:59 +02:00
Carlos Satorres	bd46a77cb7	refs #5768 incoterms addressFk	2023-10-03 10:15:16 +02:00
Jorge Penadés	f64f7a975d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-22 14:51:20 +02:00
Jorge Penadés	82f14e62ad	ref #5914 tests fixed	2023-09-21 16:08:55 +02:00
Carlos Satorres	7b246b1bac	refs #5768 trad choose address	2023-09-21 13:15:00 +02:00
Jorge Penadés	87cee57e56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 10:47:53 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Carlos Satorres	3bc26b228e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-08-31 13:37:10 +02:00
Jorge Penadés	3d4a99b07e	refs 5914 transferInvoice created	2023-08-24 10:51:34 +02:00
Carlos Satorres	b1b6bd13ea	refs #5843 change userFk	2023-08-22 10:45:41 +02:00
Carlos Satorres	6b63072278	refs #6041 hotfix agricola	2023-08-18 11:52:04 +02:00
Guillermo Bonet	602f57bca9	Merge branch 'test' into master	2023-08-03 08:54:32 +00:00
Guillermo Bonet	688a72ddb3	refs #5995 Modify sql	2023-08-03 08:39:37 +02:00
Guillermo Bonet	4a0b8f37cd	refs #5995 Load blob	2023-08-02 13:41:44 +02:00
Guillermo Bonet	84624935d6	refs #5995 Load blob	2023-08-02 09:09:50 +02:00
Guillermo Bonet	16353dfddc	refs #5995 First commit	2023-08-02 07:35:40 +02:00
Carlos Satorres	344b5d984a	refs #5525 add nif iban	2023-07-27 17:19:44 +02:00
Carlos Satorres	2f9979046d	refs #5525 iban	2023-07-26 13:10:18 +02:00
Carlos Satorres	b2702d8567	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-07-25 14:41:11 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Carlos Satorres	a54e9ca87f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-07-10 13:08:47 +02:00
Alex Moreno	040e9e4197	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-05 12:50:45 +02:00
Carlos Satorres	72bae89224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-06-28 06:53:02 +02:00
Carlos Andrés	b7cd32f4ce	refs #5772 eliminar tags en report invoice	2023-06-22 13:18:16 +02:00
Juan Ferrer	2649db852f	refs #5772 Invoice PDF size reduced	2023-06-20 11:50:36 +02:00
Vicent Llopis	ef0ae335e8	fix: muestra las observaciones de los tickets	2023-06-16 11:56:36 +02:00
Carlos Satorres	7fd87c4b04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-06-09 10:49:21 +02:00
Alex Moreno	058f828b92	refs #4548 fix(invoiceIn): report use invoiceIn.issued	2023-05-17 11:54:59 +02:00
Carlos Satorres	26872c28e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-04-27 14:19:20 +02:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Carlos Satorres	a524d7837d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-26 11:45:20 +02:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Carlos Satorres	57ec0f8587	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-04-26 09:03:37 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Alexandre Riera	d8fff8f3c4	refs #5527	2023-04-20 10:51:21 +02:00
Alexandre Riera	5a4fcc2728	refs #5527 header fixed	2023-04-20 10:43:35 +02:00
Carlos Satorres	3c639b9a2b	refs # cambios entrantes	2023-04-18 10:48:41 +02:00
Carlos Satorres	f76727903a	update insert	2023-04-17 15:17:05 +02:00
Carlos Satorres	d399cda050	refs #5316 quitar comment	2023-04-17 10:34:08 +02:00
Carlos Satorres	60d3729b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-17 08:55:22 +02:00
Carlos Satorres	1ce2705869	refs #5316 last kkentry	2023-04-11 15:04:49 +02:00
Carlos Satorres	d21ab7a5a7	refs #5316 primer kkeo	2023-04-11 10:32:21 +02:00
Carlos Satorres	014998952e	refs #084200 recipientId	2023-04-05 14:39:51 +02:00
Alexandre Riera	7e42bd1116	refs #5379 referencia a vn2008 quitada	2023-04-05 12:01:42 +02:00
Carlos Satorres	b51710fb31	refs #5525 mod yml y sql	2023-04-03 15:44:12 +02:00
Vicent Llopis	cbe79a964c	refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures	2023-03-24 10:31:02 +01:00
Vicent Llopis	dd412606ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5013-observaciones_facturas	2023-03-24 08:26:06 +01:00
Joan Sanchez	4762f3b54f	fix(deliveryNote): ticket without delivery address	2023-03-23 13:33:14 +01:00
Vicent Llopis	9ef5c0c560	refs #5013 mostrar las observaciones del ticket	2023-03-22 09:07:22 +01:00
Vicent Llopis	1d0024c538	refs #5013 feat: añadida observacion para cada ticket	2023-03-21 14:08:34 +01:00
Joan Sanchez	d373d80b12	Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev ... Reviewed-on: #1389 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:34:02 +00:00
Joan Sanchez	e911f7a127	Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev ... Reviewed-on: #1391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:27:33 +00:00
Vicent Llopis	286bc541b6	refs #5120 delete console.log	2023-03-15 11:27:01 +01:00
Vicent Llopis	da5886243e	refs #5120 refactor: no utilizar receipt directamente	2023-03-15 10:22:34 +01:00
Vicent Llopis	50ccb61728	refactor: el report llama directamente al filtro de extra-community	2023-03-14 09:59:29 +01:00
Carlos Andrés	67f9cae2f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-14 09:04:45 +01:00
Vicent Llopis	29df1ba894	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-14 08:00:02 +01:00
Carlos Satorres	36e18ff28c	Merge branch 'dev' into 084200-footerAlbaranReport	2023-03-13 12:03:04 +00:00
Carlos Satorres	b5394d3925	refs #084200 footer finalizado, web personalizado	2023-03-13 12:52:41 +01:00
Vicent Llopis	1ef454681c	fix: faltaba this delante de formateDate	2023-03-10 12:51:25 +01:00
Vicent Llopis	19fcf5d536	feat: add column 'description'	2023-03-10 07:46:36 +01:00
Vicent Llopis	b24b6d4121	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-10 07:46:16 +01:00
Carlos Satorres	b1c8f51e35	refs: #084200 mod del footer y readapatacion heade	2023-03-09 13:41:05 +01:00
Guillermo Bonet	0c22c1b0de	refs #5368 Fix expedition-pallet-label	2023-03-08 17:30:28 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Juan Ferrer	47f1ad9a0c	Merge pull request 'master' (!1367) from master into test ... Reviewed-on: #1367	2023-03-06 08:28:29 +00:00
Vicent Llopis	8ac575419a	fix: no mostraba la factura rectificada correcta	2023-03-03 12:31:20 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Guillermo Bonet	a5d236257b	refs #4965 Hotfix	2023-03-01 14:03:47 +01:00
Guillermo Bonet	fdf97b1fc7	refs #4965 Hotfix collection-label	2023-03-01 12:59:46 +01:00
Carlos Andrés	01ade6eb03	refs #5000 Merge with dev	2023-02-23 09:23:06 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Joan Sanchez	d4cecb9c25	Merge pull request 'refs #4965 Added routeFk' (!1251) from 4965-collection-label-add-routeFk into dev ... Reviewed-on: #1251 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-15 07:53:28 +00:00
Alexandre Riera	7876d4611c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado	2023-02-14 12:44:03 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Vicent Llopis	ac3faddac1	fix: actulizada sql intrastat y se muestra solamente cuando toca	2023-02-10 12:09:51 +01:00
Vicent Llopis	e61af5286b	fix: actualizada sql intrastat	2023-02-10 10:10:48 +01:00
Alex Moreno	d8acf45e0d	fix(client-debt-statment): typo	2023-02-10 09:34:42 +01:00
Alex Moreno	0529d56d4e	fix(delivery-note_report): fix taxes	2023-02-09 13:30:52 +01:00
Vicent Llopis	4754dc7bda	feat: actualizada sql intrastat	2023-02-09 11:03:22 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Joan Sanchez	461799f137	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-02-09 08:56:30 +01:00
Alexandre Riera	21281e09db	hotfix removed supplier	2023-02-02 15:13:53 +01:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Alexandre Riera	17bb4b6072	refs #5088 added receiptId	2023-02-01 07:17:16 +01:00
Alex Moreno	d2b21d401a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:27:22 +01:00
Alexandre Riera	46ee12de6d	refs #5088 text deleted	2023-01-30 09:45:10 +01:00
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Alexandre Riera	765e4ed332	refs #4564 all reports refactored	2023-01-23 13:15:30 +01: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
Alexandre Riera	a8a564431a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-19 11:38:34 +01:00
Alexandre Riera	c6f805bbe3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-17 15:11:22 +01:00
Pau	51b2e5a3bc	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:37:07 +01:00
Pau	ffad1a6d79	eliminadas las comillas de template	2023-01-17 10:35:19 +01:00
Pau	f7a25c64b5	format sql	2023-01-17 10:13:41 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Guillermo Bonet	40109639ab	Merge branch 'dev' into 4965-collection-label-add-routeFk	2023-01-16 06:28:58 +00:00
Guillermo Bonet	85dd7adcd8	refs #4965 Minor change	2023-01-13 08:48:33 +01:00
Guillermo Bonet	52026376a6	refs #4965 Added routeFk	2023-01-13 08:44:58 +01:00
Pau	176005fcdc	requested changes	2023-01-12 13:54:22 +01:00
Pau	7cc4a2e635	cambiar report body y estilos para centrar mas la label	2023-01-05 14:39:53 +01:00
Pau	7a5993b4fe	Merge branch 'dev' into 4732-previa-label	2022-12-26 07:12:13 +01:00
Vicent Llopis	906d8c5df7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat	2022-12-23 10:01:44 +01:00
Vicent Llopis	c98b5a969d	feat: actualizada consulta intrastat	2022-12-23 09:16:26 +01:00
Guillermo Bonet	d391946f57	refs #4898 Added barcode and changes in structure	2022-12-22 08:04:03 +01:00
Pau	a713cf92cf	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 08:00:33 +01:00
Pau	f6f6d0866d	requested changes refs #4732 @1h	2022-12-22 08:00:18 +01:00
Pau	6b3876b200	Merge branch 'dev' into 4732-previa-label	2022-12-19 12:26:52 +00:00
Pau	f652e86c78	Merge branch 'dev' into 4732-previa-label	2022-12-19 07:47:08 +01:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Joan Sanchez	c004a2917d	Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev ... Reviewed-on: #1204 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:24:34 +00:00
Joan Sanchez	e6867f6004	Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev ... Reviewed-on: #1203 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:20:00 +00:00
Guillermo Bonet	76001ec022	refs #4204 labelCount argument not required	2022-12-14 16:15:41 +01:00
Guillermo Bonet	b7a369a41c	refs #4204 Added param URL labelCount and ... changes in the css	2022-12-13 18:05:29 +01:00
Guillermo Bonet	6ca8b646c2	refs #4898 Added userFk in QR	2022-12-12 19:36:11 +01:00
Guillermo Bonet	d7a6350995	refs #4898 Created report expedition-pallet-label	2022-12-12 18:27:45 +01:00
Vicent Llopis	14a3a815da	fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE	2022-12-02 12:05:25 +01:00
Pau	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Joan Sanchez	12cfa05696	fix(invoicePdf): invoice correction	2022-12-02 08:33:56 +01:00
Guillermo Bonet	23f429d94a	refs #4550 fixed no ellipsize in agencyDescription	2022-11-30 12:44:33 +01:00
Guillermo Bonet	497e3e54a2	refs #4550 changes	2022-11-30 10:52:52 +01:00
Guillermo Bonet	d0acd3e4c0	refs #4550 collection-label changes	2022-11-30 08:18:37 +01:00
Guillermo Bonet	b7fa4dca4c	refs #4550 changed font-family of collection-label	2022-11-29 14:16:44 +01:00
Pau	18a23cf8b5	add some right padding to prevent the printer from cutting the label	2022-11-29 13:47:53 +01:00
Guillermo Bonet	2faacb169a	refs #4550 collection-label more fixes	2022-11-29 11:56:05 +01:00
Guillermo Bonet	b262b29627	refs #4550 collection-label fixes	2022-11-29 08:22:32 +01:00
Pau	97cdbc4118	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-11-28 14:34:15 +01:00
Pau	884286015f	fix labels not working on test data refs #4732 @2h	2022-11-28 14:01:38 +01:00
Pau	02f2724f2b	Merge branch 'dev' into 4732-previa-label	2022-11-25 06:35:15 +00:00
Guillermo Bonet	3c6ed672f5	refs #4550 added xmldom module and bugs fixed	2022-11-22 12:33:12 +01:00
Pau	b1e12d7128	Merge branch '4732-new-label' into 4732-previa-label	2022-11-21 13:33:52 +01:00
Pau	2567a1fab3	refs #4732 @4h30m	2022-11-21 13:31:55 +01:00
Pau	d41269bbbe	Change fixtures so the provider is present in the label	2022-11-18 11:58:46 +01:00
Pau	bc5940b036	Label show provider	2022-11-18 11:46:13 +01:00
Alex Moreno	d1dce73a33	feat: creat email/vehicle-event-expired	2022-11-14 08:50:38 +01:00
Joan Sanchez	1f05e6fb3b	Label without header & footer	2022-11-10 14:50:08 +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	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