656 Commits

Author	SHA1	Message	Date
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Guillermo Bonet	47747ee236	Merge branch 'dev' into 5662-CollectionVolumetryNotify	2023-10-06 06:55:14 +00:00
Pablo Natek	f52a6cb0c7	refs #4764 fixReport	2023-10-05 15:04:39 +02:00
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
Guillermo Bonet	a5103c18eb	Merge branch 'dev' into 5662-CollectionVolumetryNotify	2023-10-03 11:39:53 +00: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
Carlos Satorres	f4ac6f68c0	refs #5525 trad en	2023-09-20 13:03:49 +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
Guillermo Bonet	9112237277	Merge branch 'dev' into 5662-CollectionVolumetryNotify	2023-09-20 05:57:50 +00:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Javi Gallego	e1b03172fb	Merge pull request 'test' (!1744) from test into dev ... Reviewed-on: #1744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 07:32:24 +00:00
Carlos Satorres	d26a73bdd9	refs #5525 sql correct	2023-09-13 11:02:47 +02:00
Carlos Satorres	b5d882ae5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-09-11 10:26:32 +02:00
Carlos Andrés	4784e71350	refs #6176 book entry deleted	2023-09-07 13:21:03 +02:00
Guillermo Bonet	e20a8d215d	refs #5662 Add email modified-collection-volumetry	2023-09-07 11:47:33 +02:00
Carlos Andrés	0d2db7749f	refs #6176 book entry deleted	2023-09-06 21:22:10 +02:00
Carlos Satorres	8678d2b1e0	refs #5525 new sql	2023-09-06 17:23:31 +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	8141cd7834	refs #6194 url verdnatura	2023-09-04 14:08:17 +02:00
Carlos Satorres	b81dd1a9e8	refs #6194 new url verdnatura	2023-09-04 14:01:36 +02:00
Carlos Satorres	2711ed579c	refs #6194 generical url	2023-09-04 13:26:08 +02:00
Carlos Satorres	eb6917c10d	refs #6194 change link	2023-09-04 13:08:01 +02:00
Carlos Andrés	40468b70e6	refs #6176 book entry deleted	2023-09-04 11:59:55 +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
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +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
Alex Moreno	305caaf8aa	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-27 07:20:34 +02:00
Carlos Satorres	1277af1399	hotfix mod path	2023-07-26 13:53:15 +02:00
Carlos Satorres	2a0c363dc5	hotfix change model	2023-07-26 13:28:40 +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
Carlos Satorres	cc6ffff018	refs #5525 nd debtor	2023-07-19 07:14:01 +02:00
Carlos Satorres	56bbdd66ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-07-19 06:02:19 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Carlos Satorres	5b5191a6a5	refs #5525 findOne sql	2023-07-11 13:49:39 +02:00
Alex Moreno	6978339fd3	refs #5475 fix email translations	2023-07-11 08:03:36 +02:00
Alex Moreno	1bcd3039cd	refs #5475 redesign 2FA email	2023-07-11 07:41:05 +02:00
Carlos Satorres	c453935ddd	refs #5525 sql	2023-07-11 06:38:44 +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	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +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
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +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
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Carlos Andrés	b7cd32f4ce	refs #5772 eliminar tags en report invoice	2023-06-22 13:18:16 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Robert Ferrús	e83396de11	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-20 10:00:34 +00:00
Juan Ferrer	2649db852f	refs #5772 Invoice PDF size reduced	2023-06-20 11:50:36 +02:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Robert Ferrús	503054fe05	refs #5112 modificaciones entry_updateComission	2023-06-20 08:58:22 +02:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Robert Ferrús	068eca80ab	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-19 05:21:18 +00:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Vicent Llopis	ef0ae335e8	fix: muestra las observaciones de los tickets	2023-06-16 11:56:36 +02:00
Alexandre Riera	2a34abac61	refs #5513 minor fixes	2023-06-15 12:06:42 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Alexandre Riera	703c224e91	refs #5513 modified-entry email	2023-06-12 10:26:50 +02:00
Robert Ferrús	77c7e58f80	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5112-entryUpdateComission	2023-06-12 10:25:46 +02:00
Alex Moreno	051269d646	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-12 09:11:17 +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
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02:00
Carlos Satorres	790de4f05f	refs #5525 trad fr pt	2023-05-25 13:08:24 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alex Moreno	058f828b92	refs #4548 fix(invoiceIn): report use invoiceIn.issued	2023-05-17 11:54:59 +02:00
Alexandre Riera	3166a9e420	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:23:10 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +02:00
Carlos Satorres	eb3003e0f5	Merge branch 'dev' into 5580-buttonLink	2023-05-10 06:46:39 +00:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Carlos Satorres	49233eefcd	refs #5580 add button, yml	2023-05-04 10:18:37 +02:00
Carlos Satorres	2467534d1f	refs #5090 mod golabel	2023-05-03 09:23:16 +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
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Guillermo Bonet	fd36592c70	Merge branch 'dev' into 5237-greugeAlarmNotification	2023-04-26 10:18:53 +00: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
Guillermo Bonet	43bb762129	Merge branch 'dev' into 5237-greugeAlarmNotification	2023-04-26 07:46:15 +00: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
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Alex Moreno	f738d1659b	Merge branch 'dev' into 5456-client-welcome_email_añadirTraducciones	2023-04-21 11:31:00 +00:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Vicent Llopis	89cca5ee9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5456-client-welcome_email_añadirTraducciones	2023-04-20 15:12:23 +02: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
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
Guillermo Bonet	6f96820168	refs #5237 Ahora lee un conjunto de arrays	2023-04-19 10:16:37 +02:00
Carlos Satorres	3c639b9a2b	refs # cambios entrantes	2023-04-18 10:48:41 +02:00
Alex Moreno	560b5b374f	Merge branch 'dev' into 5075-client_balance	2023-04-18 05:37:12 +00: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
Joan Sanchez	f5d26bdb99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-13 12:00: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
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
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
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +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	e1f7ba1343	refs #5456 feat: actualizada traduccion en castellano y añadida en portugues	2023-03-23 10:37:46 +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
Joan Sanchez	28730f3262	Attachment fixes	2023-03-14 09:01:05 +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
Joan Sanchez	63694f4478	Merge branch 'dev' into 5090-renameGoLabel	2023-03-08 09:47:47 +00: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
Carlos Satorres	ea9a15ece1	Merge branch 'dev' into 5090-renameGoLabel	2023-03-02 10:44:24 +00: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