1023 Commits

Author	SHA1	Message	Date
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Pablo Natek	1c40e01fcb	refactor: refs #6005 move the logic to the report	2024-02-20 13:49:42 +01:00
Pablo Natek	ab7eb88913	merge(dev): refs #6005 merge dev	2024-02-20 09:34:08 +01:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Alex Moreno	4d7bc482ec	refs #6742 fix(invoice_pdf): incotermsFk	2024-02-12 10:10:30 +01:00
Javier Segarra	a756c3bc3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 08:51:58 +01:00
Guillermo Bonet	2cab007f57	fix: refs #6184 Requested changes	2024-02-06 12:12:45 +01:00
Guillermo Bonet	d6ae1fd1f8	Merge branch 'dev' into 6184-saveCmr	2024-02-06 06:39:51 +01:00
Javi Gallego	693a39d34a	fix: hotfix puppeteer CONCURRENCY_PAGE	2024-02-05 13:19:44 +01:00
Javi Gallego	5c9589ba7b	Merge branch 'dev' into 6742-incoterm-error	2024-02-05 11:13:37 +00:00
Juan Ferrer	43c245b45b	Merge branch 'dev' into 6706-optimizeHooks	2024-02-05 10:27:53 +00:00
Guillermo Bonet	1d596b63a0	Merge branch 'dev' into 6184-saveCmr	2024-02-02 12:24:28 +01:00
Juan Ferrer	4eb53614bc	build: refs #6706 Migration to pnPM	2024-02-02 09:49:39 +01:00
Alex Moreno	9ac0ffb85a	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-02 07:30:59 +00:00
Javi Gallego	fd98348a4d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6742-incoterm-error	2024-02-02 08:06:06 +01:00
Juan Ferrer	5dec9ff4a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:39:44 +01:00
Juan Ferrer	2aa801bc0f	refs #5483 Unused deps removed	2024-02-01 12:39:43 +01:00
Alex Moreno	a9a1f97366	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:17:48 +01:00
Carlos Satorres	91c3c8f04d	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-02-01 10:51:11 +00:00
Juan Ferrer	cf3159fe5a	build: refs #6706 print/package-lock.json added	2024-02-01 10:59:09 +01:00
Pablo Natek	550e3991cd	fix(warning): refs #6684 fix vue warning	2024-01-31 12:50:32 +01:00
Pablo Natek	4ba76291c1	remove(console.log): refs #6684 driverRouteFix	2024-01-31 12:33:52 +01:00
Pablo Natek	7d4b6132ec	fix(css): refs #6684 driverRouteReport	2024-01-31 12:30:57 +01:00
Carlos Satorres	509d5cea14	refs #6270 fix back	2024-01-30 15:54:03 +01:00
Pablo Natek	4fc71b9798	fix(driverRoute): refs #6684 driverRouteHotFix	2024-01-29 08:04:52 +01:00
Guillermo Bonet	5828fa9657	feat: #6184 Refactor saveSign	2024-01-26 10:05:24 +01:00
Pablo Natek	e43210af9c	fix(driver-route): refs #6684 manage word overflow with wordBreak	2024-01-26 09:23:43 +01:00
Guillermo Bonet	0c5225e3d0	fix: #6634 Line count previa collection-label	2024-01-26 07:42:53 +01:00
Guillermo Bonet	a676607e29	feat: #6184 Added email cmr	2024-01-23 14:13:40 +01:00
Javi Gallego	540c76005e	fix: #6742 calcula hasIncoterm a partir de la serie	2024-01-23 12:30:04 +01:00
Guillermo Bonet	12bfb8ca77	feat: #6184 Added tests and process.env.IS_SPEC_RUNNING	2024-01-23 11:05:39 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	84134d671f	refs #5525 remove as	2024-01-16 12:47:58 +01:00
Guillermo Bonet	4ead2345c4	Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia	2024-01-15 10:03:06 +01:00
Guillermo Bonet	a900e0fff6	feat: refs #6634 Minor change	2024-01-15 10:03:05 +01:00
Guillermo Bonet	1cd9b85ddf	Merge branch 'dev' into 6634-collectionLabelPrevia	2024-01-15 09:00:08 +00:00
Guillermo Bonet	be1a94c283	feat: refs #6634 Modified collection-label	2024-01-15 09:59:32 +01:00
Guillermo Bonet	4673145c58	fix: ticket 147437: Fix packages in incoterms	2024-01-11 10:09:35 +01:00
Carlos Satorres	bbf1bb50e9	refs #5525 fix sql supplier for sepacore	2023-12-28 13:27:38 +01:00
Carlos Satorres	bfb31ad7c3	refs #5525 supplier	2023-12-28 11:46:34 +01:00
Carlos Satorres	df1c9e3d9f	refs #5525 suppliercif	2023-12-27 17:46:46 +01:00
Pablo Natek	3e2cac5544	Merge branch 'dev' into 6005-backupLabeler	2023-12-19 14:05:45 +01:00
Carlos Satorres	18e87a05c4	refs #5525 st and nd	2023-12-19 10:07:17 +01:00
Javier Segarra	72e9b69d7e	Merge branch 'dev' into 5858-zone_Collisions	2023-12-19 07:04:41 +00:00
Javier Segarra	2d4fb9d2f8	refs #5858 perf: remove unused methods	2023-12-19 08:04:11 +01:00
Javier Segarra	dbc3fc8007	refs #5858 perf: remove bad comments	2023-12-19 08:02:38 +01:00
Javier Segarra	cc88fcbd9d	refs #5858 feat: update notification template	2023-12-19 07:54:12 +01:00
Carlos Satorres	ea31d3bebb	refs #5525 debtor-nd	2023-12-13 11:46:48 +01:00
Carlos Satorres	556b403a5b	refs #5525 letter debtor st	2023-12-13 11:29:50 +01:00
Carlos Satorres	9165995ee5	Merge branch 'dev' into 5971-addressInvoiceOut	2023-12-11 07:07:45 +00:00
Sergio De la torre	64ecf2e229	Merge branch 'dev' into 5867-Driver-Route-Pdf	2023-12-11 05:48:21 +00:00
Carlos Satorres	7e9134ecc3	refs #5971 change sql address	2023-12-07 13:47:07 +01:00
Carlos Satorres	102ea1ee65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-12-07 07:35:18 +01:00
Javier Segarra	c40dc134f8	refs #5858 feat: sql files for new version	2023-11-29 12:15:38 +01:00
Pablo Natek	d5fcfdfd79	fix(yml): refs #6005 backUpLabeler yml fix	2023-11-28 12:24:54 +01:00
Javier Segarra	4383ebd7f1	refs #5858 feat: email notification	2023-11-24 12:30:44 +01:00
Javier Segarra	a2329e1276	refs #5858 feat: update template notification	2023-11-23 15:17:40 +01:00
Pablo Natek	3788d160a6	Merge branch 'dev' into 6005-backupLabeler	2023-11-22 11:30:44 +01:00
Javier Segarra	1b60cd33d5	ref #5858 feat: notification template	2023-11-22 09:25:35 +01:00
Pablo Natek	fc653746f0	remove(barcode): refs #5228 remove barcode from report	2023-11-21 07:54:25 +01:00
Pablo Natek	9c896c835f	refactor(printer-notification): refs #6005 refactor de la notificación	2023-11-09 07:56:35 +01:00
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Sergio De la torre	60ffc21d5a	Merge branch 'dev' into 5867-Driver-Route-Pdf	2023-10-27 04:49:16 +00:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Sergio De la torre	fa08ebf416	refs #5867 fix: tickets sql	2023-10-17 08:57:45 +02:00
Jorge Penadés	737eca2771	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-13 13:13:52 +02:00
Carlos Satorres	cba8a48d18	Merge branch 'dev' into 5768-incoterms	2023-10-11 10:05:45 +00:00
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	22c7714abc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2023-07-20 10:20:00 +02:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Alex Moreno	8c84f006b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-20 07:15:30 +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	69c3a49cce	warnFix: smtp prevents the sending of emails depending on the condition	2023-07-13 08:05:10 +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
Alex Moreno	31d637c8a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:19:04 +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
Juan Ferrer	665339c8d2	refs #5772 Fix for unhandled ENOENT error	2023-06-23 22:02:33 +02:00
Juan Ferrer	c9f11830a2	refs #5772 smtp.send() error throw flow fix	2023-06-23 20:03:56 +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
Carlos Andrés	10a25ff590	refs #5772	2023-06-22 07:49:35 +02:00
Alex Moreno	6ab431f8ef	refs #5475 tests	2023-06-21 14:17:25 +02:00
Carlos Satorres	9ef12d129b	Merge branch 'dev' into 5537-refactorFootnotes	2023-06-21 10:57:03 +00: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
Alex Moreno	a8fafacb82	refs #5475 send email force	2023-06-20 15:06:02 +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
Carlos Satorres	a7d9bbc582	refs #5537 change cl c	2023-06-20 10:22:30 +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	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00: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
Alex Moreno	9a5511f083	REFACTOR(node_version)! update to v20	2023-05-23 13:31:09 +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
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +02:00
Alex Moreno	ba763abc26	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev	2023-05-18 07:17:31 +02:00
Alex Moreno	058f828b92	refs #4548 fix(invoiceIn): report use invoiceIn.issued	2023-05-17 11:54:59 +02:00
Carlos Satorres	43ab07d954	refs move reports views	2023-05-11 11:57:13 +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
Joan Sanchez	cdf092a989	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 11:52:17 +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	7a02a3213a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-13 13:47:34 +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