15178 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	4c6b4ea6c8	refactor: eliminada la doble paginación en los logs	2023-04-21 10:15:00 +02:00
Vicent Llopis	5af961ac69	fix: maneja si se elimina la sale	2023-04-21 09:53:21 +02:00
Juan Ferrer	6f35eb0ce3	Merge pull request '231401_test_to_production' (!1464) from 231401_test_to_production into master ... Reviewed-on: #1464 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-04-20 06:45:45 +00:00
Alex Moreno	7df4a2b15d	fix(231401): fix tests and fixtures	2023-04-20 08:25:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Juan Ferrer	a85135b1c8	refs #5553 New parameter to skip lock	2023-04-18 21:27:09 +02:00
Juan Ferrer	5dd7c7e3bd	refs #5553 Improve error handling	2023-04-18 20:53:49 +02:00
Juan Ferrer	dc853213b8	refs #5553 Allow to skip default transaction timeout	2023-04-18 20:33:39 +02:00
Juan Ferrer	8763dc32c4	refs #5553 Code syntax refactor	2023-04-18 17:25:37 +02:00
Juan Ferrer	26faab6a84	refs #5553 Exclusive lock fix, don't stop when unlink fails	2023-04-18 17:23:38 +02:00
Joan Sanchez	90b38d02a0	Default username property	2023-04-18 13:16:25 +02:00
Joan Sanchez	1d7c1f8d41	Merge pull request 'hotfix expedition-pallet template' (!1458) from hotfix_arcRfid2 into master ... Reviewed-on: #1458 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-04-18 11:00:00 +00:00
Vicent Llopis	6b72d88256	test	2023-04-18 12:55:18 +02:00
Joan Sanchez	a5f6991511	continue	2023-04-18 10:18:44 +02:00
Joan Sanchez	aabc4ec58d	fix(consumption): continue queue if client mailing fails	2023-04-18 10:08:04 +02:00
Joan Sanchez	6c71bda814	Merge pull request 'masterHotfix_arcRfid' (!1455) from masterHotfix_arcRfid into master ... Reviewed-on: #1455 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 07:00:09 +00:00
Vicent Llopis	d99815356a	refs #5144 manejado que el usuario sea NULL	2023-04-18 07:26:35 +02:00
Joan Sanchez	a41cf2f3f9	Merge pull request 'refs #5553 Don't save image extension' (!1453) from 5553-dontSaveImageExtension into master ... Reviewed-on: #1453 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-18 05:05:12 +00:00
Juan Ferrer	1c4f919e89	refs #5553 Don't save image extension	2023-04-17 22:24:19 +02:00
Juan Ferrer	378400c6d2	refs #5553 Image scrubing method improved ... Remove & dryRun options, check that collection exists, performance improved, exclusive lock	2023-04-17 18:19:25 +02:00
Juan Ferrer	0423fac88c	refs #5553 Image clean method Image/scrub	2023-04-17 14:33:07 +02:00
Joan Sanchez	f4e696675d	Merge pull request 'reafactor(image): upload image using gm library' (!1445) from 5558-image_refactor into master ... Reviewed-on: #1445 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-15 11:07:44 +00:00
Joan Sanchez	6e7b452792	Max quality	2023-04-14 13:19:17 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Alexandre Riera	32c5ced55b	Merge pull request 'hotfix rollback delivery.sql' (!1435) from hotfix-rollback-delivery into master ... Reviewed-on: #1435	2023-04-11 13:06:59 +00:00
Alexandre Riera	245b0e70f4	hotfix rollback delivery.sql	2023-04-11 14:51:39 +02:00
Joan Sanchez	a4126eca56	Merge pull request 'hotfix-apply-changes-procedure' (!1434) from hotfix-apply-changes-procedure into master ... Reviewed-on: #1434 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 11:27:34 +00:00
Alexandre Riera	3ee08e0300	changed folder	2023-04-11 12:34:26 +02:00
Alexandre Riera	c6db5f1a4b	hotfix apply changes procedure	2023-04-11 12:29:09 +02:00
Joan Sanchez	0d4c2db0ac	Merge pull request 'hotfix apply SQL delivery.sql' (!1433) from hotfix-moveSQL-minorVersion-delivery into master ... Reviewed-on: #1433 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 09:28:06 +00:00
Alexandre Riera	d5d18d5376	hotfix apply SQL delivery.sql	2023-04-11 11:02:08 +02:00
Joan Sanchez	936d66f8b8	Merge pull request 'hotfix_kmPrice_addDecimals' (!1427) from hotfix_kmPrice_addDecimals into master ... Reviewed-on: #1427 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 06:45:46 +00:00
Vicent Llopis	6fc2867551	permite decimales	2023-04-06 08:05:37 +02:00
Joan Sanchez	ca30aaa18a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-04-05 08:39:43 +02:00
Juan Ferrer	d0c94b985d	Merge pull request 'fixes #5529 Fixes: missing awaits, buffer-to-file' (!1422) from 5529-invoicingFixes into master ... Reviewed-on: #1422 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-04 13:13:30 +00:00
Carlos Andrés	e342852ed8	Merge branch 'master' into 5529-invoicingFixes	2023-04-04 13:05:49 +00:00
Joan Sanchez	d464818ddb	Merge pull request 'hotfix_sendMail_insertsIntoWorkerTimeControlMail' (!1419) from hotfix_sendMail_insertsIntoWorkerTimeControlMail into master ... Reviewed-on: #1419 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-04 13:02:18 +00:00
Carlos Andrés	0372d44415	fixes #5529 Fixes: missing awaits, buffer-to-file	2023-04-04 15:00:28 +02:00
Vicent Llopis	14f966ab9a	Merge branch 'master' into hotfix_sendMail_insertsIntoWorkerTimeControlMail	2023-04-04 12:32:56 +00:00
Joan Sanchez	b49307463e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-04 13:53:25 +02:00
Joan Sanchez	e8f0a49f0c	fix(resetPassword): increased token TTL for password recovery ... Refs #5474	2023-04-04 13:51:44 +02:00
Vicent Llopis	0bfa4c54aa	fix: inserta en workerTimeControlMail	2023-04-04 09:52:46 +02:00
Joan Sanchez	f4ff869c4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-03 08:55:51 +02:00
Joan Sanchez	02a1bcbfd3	fix(setPassword): proper access type ... Refs #5471	2023-04-03 08:54:15 +02:00
Joan Sanchez	6aca23e466	Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev ... Reviewed-on: #1386 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:23:29 +00:00
Joan Sanchez	cafb21d90b	Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev ... Reviewed-on: #1384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:21:24 +00:00
Joan Sanchez	26bddef5e5	Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev ... Reviewed-on: #1394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:50 +00:00
Joan Sanchez	ea60e31361	Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev ... Reviewed-on: #1396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:28 +00:00
Joan Sanchez	3bab90f9e5	Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev ... Reviewed-on: #1411 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:07 +00:00
Joan Sanchez	30a4356139	Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev ... Reviewed-on: #1414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:18:44 +00:00