756 Commits

Author	SHA1	Message	Date
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
Carlos Satorres	7b7dcddce0	refs #5090 solucion de error yml	2023-03-02 09:51:15 +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 Satorres	1c3aa29642	refs #5090 model.ezp nuevo	2023-03-01 11:56:41 +01:00
Carlos Satorres	968f422054	refs #5090 Renamed QLabel to GoLabel	2023-03-01 11:43:07 +01:00
Guillermo Bonet	e231b0e12b	refs #5237 Added greuge notify	2023-03-01 10:11:22 +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
Alex Moreno	bbf68a88a7	feat: sendEmail checkBox and docuware open clientBalanceCreate with default data	2023-02-09 10:26:55 +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
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alexandre Riera	765e4ed332	refs #4564 all reports refactored	2023-01-23 13:15:30 +01:00
Alexandre Riera	6e5728eead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-23 10:11:07 +01:00
Alex Moreno	ce06274d0a	Merge branch 'dev' into 4658-createWorker	2023-01-23 07:12:26 +00: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
Joan Sanchez	052e7b3c4a	Merge branch 'dev' into #5110-qlabel	2023-01-23 06:47:02 +00:00
Alexandre Riera	ab7989911a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-23 07:44:09 +01:00
Javi Gallego	30885a499e	link	2023-01-21 07:29:27 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +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
Robert Ferrús	d5daa172d5	refs #5112 feat(print): create entry-update-comission template	2023-01-17 11:53:29 +01:00
Robert Ferrús	31d23f7dd1	feat(print): create entry-update-comission template ... refs #5112	2023-01-17 11:50:27 +01:00
Robert Ferrús	759a140e61	feat(print): create entry-update-comission template ... refs #4586	2023-01-17 11:45:50 +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
Alex Moreno	2cc89d9ae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-13 13:54:16 +01:00
Alex Moreno	d7e8c4fafd	fix(print_invoiceIn): translation invoice to receipt	2023-01-13 09:28:44 +01: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
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Pau	7cc4a2e635	cambiar report body y estilos para centrar mas la label	2023-01-05 14:39:53 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +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
Joan Sanchez	7c33cd2691	Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev ... Reviewed-on: #1188 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 10:43:20 +00: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	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +00:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Vicent Llopis	1ddaf7ff08	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-20 10:52:23 +01:00
Alexandre Riera	cd71a59dfe	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-20 07:01:45 +00: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
Vicent Llopis	1b30ee9d2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-15 14:32:51 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +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
Alexandre Riera	f4ed7781b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-14 08:30:36 +01:00
Guillermo Bonet	b7a369a41c	refs #4204 Added param URL labelCount and ... changes in the css	2022-12-13 18:05:29 +01:00
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +01:00
Vicent Llopis	e4dbeb0b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-13 09:54:56 +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
Alex Moreno	bb944f9fee	feat(newWorker): use worker-welcome	2022-12-12 15:05:49 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +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
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +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
Vicent Llopis	f056c26b0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-11-30 08:03:16 +01:00
Vicent Llopis	c258587e02	feat: plantilla email para asientos contables importados incorrectamente	2022-11-29 15:06:21 +01:00
Guillermo Bonet	b7fa4dca4c	refs #4550 changed font-family of collection-label	2022-11-29 14:16:44 +01:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Pau	18a23cf8b5	add some right padding to prevent the printer from cutting the label	2022-11-29 13:47:53 +01:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00: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
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Pau	02f2724f2b	Merge branch 'dev' into 4732-previa-label	2022-11-25 06:35:15 +00:00
Alex Moreno	42adba3538	mail content	2022-11-23 15:11:46 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Joan Sanchez	7e12938de3	Merge branch 'dev' into test	2022-11-22 12:53:03 +00:00
Guillermo Bonet	3c6ed672f5	refs #4550 added xmldom module and bugs fixed	2022-11-22 12:33:12 +01:00
Alex Moreno	7c75eaadce	feat: worker-welcome	2022-11-21 15:15:25 +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
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +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
Joan Sanchez	d7729654ee	fix(ordersFilter): wrong table schema	2022-11-17 16:48:31 +01:00
Joan Sanchez	f501707adf	fix(ordersFilter): wrong table schema	2022-11-17 16:47:01 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alex Moreno	7a7da9508f	feat: workerWelcomeEmail	2022-11-15 12:56:30 +01:00
Alex Moreno	8f4ac8fcc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 10:12:29 +01:00
Pau	6eaee8faca	Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es	2022-11-15 06:06:20 +00:00
Alex Moreno	6113ea398d	feat: worker-welcome	2022-11-14 15:19:38 +01:00
Alex Moreno	db3a6df23d	feat(worker): new worker	2022-11-14 15:19:16 +01:00
Vicent Llopis	a30f50ffe5	refactor: borrado console.log	2022-11-14 12:20:27 +01:00
Pau	3c771fc771	refactor missing URL's refs #4609	2022-11-14 08:53:00 +01:00
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	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	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
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
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
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
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
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	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