14134 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	ef7a0508ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-20 08:29:42 +01:00
Joan Sanchez	208f6f50d0	Updated package version	2023-01-20 07:43:27 +01:00
Joan Sanchez	fbbca1dc2e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-20 07:42:51 +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
Joan Sanchez	a5decd3166	Updated version	2023-01-20 07:42:15 +01:00
Joan Sanchez	9072f3696d	Merge pull request '4903-workerTimeControl_sendMail' (!1261) from 4903-workerTimeControl_sendMail into dev ... Reviewed-on: #1261 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-20 06:21:02 +00:00
Vicent Llopis	dfcacdad71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail	2023-01-19 08:56:39 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00
Vicent Llopis	38e4349e17	borrado comentario	2023-01-18 14:25:24 +01:00
Vicent Llopis	2c995208d1	fix: transaccionado por trabajador y día	2023-01-18 14:23:05 +01:00
Vicent Llopis	7368b572a0	fix: añadidos await y actualizado condicional permissionRate	2023-01-18 13:05:02 +01:00
Pau	5507b2de21	Merge pull request 'closes 4732 etiquetas con QR para previa y item' (!1163) from 4732-previa-label into dev ... Reviewed-on: #1163 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2023-01-18 08:26:10 +00:00
Pau	5e198b8541	Merge branch 'dev' into 4732-previa-label	2023-01-18 08:15:45 +00:00
Alexandre Riera	52b12d52b1	Merge pull request 'fixes #5020 Borrado lógico en la tabla ItemPackingType' (!1257) from 5020-borradoLogico-IPT into dev ... Reviewed-on: #1257 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-18 08:15:08 +00:00
Alexandre Riera	4aaa5b2687	refs #5020 isActive Not Null	2023-01-18 09:08:09 +01:00
Alexandre Riera	98d6322b0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT	2023-01-18 08:00:20 +01:00
Pau	eb4ad206d0	Merge branch 'dev' into 4732-previa-label	2023-01-18 06:20:14 +00:00
Alexandre Riera	5473b2ca2e	Merge pull request 'fixes #4930 Añadir Zona en la info del cliente, en las reclamaciones' (!1226) from 4930-add-zone into dev ... Reviewed-on: #1226 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-17 12:01:35 +00:00
Joan Sanchez	1597c40a16	Merge branch 'dev' into 4930-add-zone	2023-01-17 11:33:56 +00:00
Pau	f0cc28d698	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:46:55 +00:00
Alex Moreno	1f042d01ba	Merge pull request 'fixes #4523 item_fixed-price_rate2' (!1218) from 4523-item_fixed-price_rate2 into dev	2023-01-17 10:45:28 +00:00
Alex Moreno	bc9510a317	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 09:46:16 +00: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
Pau	ba1e46f8d7	Merge pull request 'closes #4605 Create-Model-PackagingMistake' (!1247) from 4605-Create-Model-PackagingMistake into dev ... Reviewed-on: #1247 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-17 09:05:19 +00:00
Pau	3a1aea2afd	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-17 09:01:45 +00:00
Alexandre Riera	c371c2fe92	refs #4930 refresh structure	2023-01-17 09:03:13 +01:00
Alexandre Riera	e97a02a871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-17 09:02:27 +01:00
Alexandre Riera	c47cac7d55	refs #5020 isActive column added, filter in front	2023-01-17 08:54:26 +01:00
Alexandre Riera	abf4c4e59b	Merge pull request 'fixes #4866 más detalle en faltas' (!1201) from 4866-detalle-faltas into dev ... Reviewed-on: #1201 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-01-17 07:37:49 +00:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alexandre Riera	be1f9bdd1b	Merge pull request 'fixes #4951 Comprobar longitud de cuentas contables al generar asientos' (!1238) from 4951-longitud-cuentaContables into dev ... Reviewed-on: #1238 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-17 07:30:36 +00:00
Alexandre Riera	ba3335b9a2	Merge branch 'dev' into 4951-longitud-cuentaContables	2023-01-17 06:59:33 +00:00
Alexandre Riera	8314f48b8d	Merge pull request 'fixes #5061 Cambios en Tickets a Futuro' (!1256) from 5061-cambios-ticketsFuturo into dev ... Reviewed-on: #1256 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-17 06:56:04 +00:00
Alex Moreno	ff39a81b8c	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 06:07:14 +00:00
Alexandre Riera	dab94ff535	refs #5061 refresh structure	2023-01-16 14:48:45 +01:00
Alexandre Riera	7da42a30f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5061-cambios-ticketsFuturo	2023-01-16 14:34:34 +01:00
Alexandre Riera	30e8abcc8a	Merge branch '4930-add-zone' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-16 14:27:47 +01:00
Alexandre Riera	57c5ea98bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-16 14:27:40 +01:00
Alexandre Riera	4d12e29b3d	refs #5061 fix filter	2023-01-16 14:24:53 +01:00
Alexandre Riera	0c8a99793c	Merge branch 'dev' into 4930-add-zone	2023-01-16 13:16:46 +00:00
Guillermo Bonet	5d81cfc121	Merge pull request '4975-mdbVersion-last-method' (!1245) from 4975-mdbVersion-last-method into dev ... Reviewed-on: #1245 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-16 11:40:22 +00:00
Guillermo Bonet	5ebe31c9e5	Merge branch '4975-mdbVersion-last-method' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-16 12:26:19 +01:00
Guillermo Bonet	3d4600d70d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-16 12:26:10 +01:00
Alexandre Riera	b78bebf27c	refs #5061 added hour in date, changed ipt filter	2023-01-16 12:22:22 +01:00
Alex Moreno	1db69d4183	Merge pull request 'fixes #4839 - docuware_send' (!1254) from 4839-docuware_send into dev	2023-01-16 07:20:08 +00:00
Pau	34508425a9	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-16 07:08:19 +00:00
Alex Moreno	73c3f05377	refactor(docuware_upload): simplify json	2023-01-16 07:36:06 +01:00