18710 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	f9fdf80350	refs #5667 Item translations added	2023-05-17 12:06:31 +02:00
Alex Moreno	c8c7f52408	Merge branch 'master' into hotFix_invoiceIn_issued	2023-05-17 09:56:21 +00:00
Alex Moreno	058f828b92	refs #4548 fix(invoiceIn): report use invoiceIn.issued	2023-05-17 11:54:59 +02:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Carlos Satorres	adafd7444b	refs #5334 worker-department	2023-05-17 10:04:44 +02:00
Vicent Llopis	c7da71d8c0	Merge pull request '5594-sendPdf_whenMakeInvoice' (!1489) from 5594-sendPdf_whenMakeInvoice into dev ... Reviewed-on: #1489 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-17 07:37:34 +00:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Alex Moreno	cc23fd1337	refs #5579 fix mockTimes and remove userLog_add	2023-05-17 09:23:37 +02:00
Carlos Satorres	f63dd0f9a3	refs #5334 datos	2023-05-17 09:05:28 +02:00
Alex Moreno	c9af22780b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export	2023-05-17 08:24:23 +02:00
Juan Ferrer	dd9699e120	refs #5667 Translation fix	2023-05-16 20:54:13 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	7f881409fc	refs #5579 fix mockTime	2023-05-16 15:00:31 +02:00
Carlos Satorres	5c9ee21cfc	refs #5334 department.card	2023-05-16 14:00:05 +02:00
Vicent Llopis	191fb72331	test jenkins	2023-05-16 13:54:09 +02:00
Alexandre Riera	62d0af25d3	refs #5642 uncommented tests	2023-05-16 13:31:22 +02:00
Carlos Satorres	9f9963af56	refs #5334 descriptor	2023-05-16 13:10:26 +02:00
Pablo Natek	addd53feca	Merge pull request 'refs #5153' (!1483) from 5153-worker-sin-tr into dev ... Reviewed-on: #1483 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-16 10:36:48 +00:00
Pablo Natek	3d05b79748	Merge branch 'dev' into 5153-worker-sin-tr	2023-05-16 10:30:28 +00:00
Carlos Satorres	d09889b08a	refs #5334 fix summary route	2023-05-16 12:12:25 +02:00
Carlos Satorres	3dcdbe0223	refs #5334 summary basic data	2023-05-16 11:41:42 +02:00
Carlos Satorres	612d0a2dfb	refs #5334 fix index	2023-05-16 09:52:48 +02:00
Alexandre Riera	ccdc43d4a3	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-16 07:22:13 +00:00
Alex Moreno	799045314f	Merge pull request 'refs #5160 increase jasmine timeout' (!1524) from 5160-increase_jasmine_timeout into dev ... Reviewed-on: #1524 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-16 07:21:01 +00:00
Alex Moreno	9f0d5097fe	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00
Alex Moreno	1dcce0f3ee	Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master ... Reviewed-on: #1523 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-16 07:01:44 +00:00
Carlos Satorres	fd4d04756a	refs #5334 routes index fix	2023-05-16 08:54:54 +02:00
Alex Moreno	504791fd6d	typo	2023-05-16 08:48:25 +02:00
Alex Moreno	a1a3f910d3	hotFix(reset-passowrd): use model vnUser	2023-05-16 08:46:16 +02:00
Alex Moreno	3e33030b1d	refs #5579 update mariadb version to 10.7.6	2023-05-15 15:16:22 +02:00
Alexandre Riera	2c254cbc08	refs #4797 added fields	2023-05-15 14:34:32 +02:00
Alexandre Riera	f0cd01fe7d	Merge branch '4797-worker-notification-selector' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:57 +02:00
Alexandre Riera	d4e2049bc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:49 +02:00
Vicent Llopis	6300ee4be4	refs #5600 foto de los trabajadores cuadrada	2023-05-15 14:24:31 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	443821b5c2	refs #5334 ?q	2023-05-15 13:59:54 +02:00
Carlos Satorres	071849065a	refs #5334 fix main	2023-05-15 13:55:35 +02:00
Carlos Satorres	598067f757	refs #5334 routes	2023-05-15 13:15:33 +02:00
Vicent Llopis	9ce3e79e00	refs #5594 eliminado archivo ducplicado	2023-05-15 11:50:51 +02:00
Vicent Llopis	d5f5115980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-15 11:50:09 +02:00
Alex Moreno	931514a8e8	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-15 09:41:10 +00:00
Carlos Satorres	87e1caa4eb	refs #5334 department seccion	2023-05-15 10:43:06 +02:00
Alex Moreno	7d589d5101	Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master ... Reviewed-on: #1520 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-15 08:12:29 +00:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +02:00
Alex Moreno	248caf8519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-15 07:20:53 +02:00
Carlos Satorres	8a6881bf73	refs #4764 mod tabindex	2023-05-12 15:50:32 +02:00
Carlos Satorres	ce62b51b29	refs #4764 remove br	2023-05-12 15:08:04 +02:00
Alex Moreno	ea6837e33a	refs #5579 export structure and data	2023-05-12 13:07:24 +02:00