15269 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	5a2dbbabfd	template string	2023-04-18 07:19:33 +02:00
Alexandre Riera	b3fb661f12	hotfix minor version delivery	2023-04-18 07:17:36 +02:00
Joan Sanchez	9e4c261a87	Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test ... Reviewed-on: #1440 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 05:39:57 +00:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00
Joan Sanchez	6d5167ab7f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-13 13:47:18 +02:00
Juan Ferrer	847d0f6c43	Merge pull request 'fixes #5522 Loggable - Deadlock en inserción múltiple' (!1430) from 5522-loggable-deadlock into dev ... Reviewed-on: #1430 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-04-12 15:43:30 +00:00
Juan Ferrer	7e1d6f4339	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-12 15:33:23 +00: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
Pablo Natek	736d0375f6	Merge pull request 'refs #5211' (!1385) from 5211-cleanItemShelvings into dev ... Reviewed-on: #1385 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-04-11 12:08:54 +00:00
Pablo Natek	ccf26c5413	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-11 11:56:33 +00: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
Vicent Llopis	5ab2913c39	Merge pull request 'fix intermittent backTest' (!1431) from fix_backTest into dev ... Reviewed-on: #1431 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-04-11 08:36:02 +00:00
Vicent Llopis	ec03c6edfa	fix intermittent backTest	2023-04-11 10:23:33 +02:00
Alexandre Riera	53bd6cd729	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-11 07:52:16 +00:00
Alexandre Riera	ce28339973	refs #5522 deleted trigger afterInsert, added hook beforeInsert	2023-04-11 09:48:31 +02:00
Joan Sanchez	5732f9a33b	Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ... Reviewed-on: #1407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:07:55 +00:00
Joan Sanchez	fe0d861dc0	Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev ... Reviewed-on: #1418 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:06:04 +00:00
Vicent Llopis	5e6cccbf57	Merge pull request '5275-item.fixed-price_refactor' (!1426) from 5275-item.fixed-price_refactor into dev ... Reviewed-on: #1426 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-11 05:18:14 +00:00
Vicent Llopis	ba31613ac9	Merge branch 'dev' into 5275-item.fixed-price_refactor	2023-04-06 09:58:07 +00:00
Carlos Satorres	b3f946e15f	Merge branch 'dev' into 5250-observacionesWorker	2023-04-06 08:32:05 +00:00
Alexandre Riera	49300b6f19	Merge pull request 'fixes #4954 cliente datos comprobados' (!1421) from 4954-client-isTaxDataChecked-businessTypeFk into dev ... Reviewed-on: #1421 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-04-06 08:12:31 +00:00
Vicent Llopis	d9ae24c927	Merge branch 'dev' into 4856-worker.time-control_2	2023-04-06 08:08:10 +00:00
Vicent Llopis	8a297469d6	refs #4856 añadido myOptions	2023-04-06 10:06:29 +02:00
Alexandre Riera	05912610f8	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:47:06 +00:00
Carlos Satorres	30761781fa	Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-04-06 09:34:49 +02:00
Carlos Satorres	f307f79dc2	refs #5250 cambio a ult version de changes	2023-04-06 09:34:46 +02:00
Carlos Satorres	68a24b7335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-04-06 09:33:50 +02:00
Joan Sanchez	213766afdf	Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev ... Reviewed-on: #1423 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:27:13 +00:00
Alexandre Riera	5cbc826281	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:16:00 +00:00
Joan Sanchez	b71ad207ff	Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ... Reviewed-on: #1420 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:07:35 +00:00
Joan Sanchez	a8af280de5	Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev ... Reviewed-on: #1406 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:05:18 +00:00
Joan Sanchez	033927d5b4	Merge pull request '5410-client.defaulter_getChecked' (!1403) from 5410-client.defaulter_getChecked into dev ... Reviewed-on: #1403 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:04:32 +00:00
Vicent Llopis	041590e541	refs #4856 maneja errores y notifica a los jefes	2023-04-06 08:54:12 +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
Pablo Natek	1e01f26d76	refs #5211 empty commit	2023-04-06 08:03:41 +02:00
Alexandre Riera	c823a0d6f1	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 05:44:33 +00:00
Vicent Llopis	a44a640d15	refs #4856 manejo errores	2023-04-05 15:14:42 +02:00
Vicent Llopis	6a0bca1a94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-05 14:06:33 +02:00
Vicent Llopis	de31d98e2e	refs #5275 fix test e2e	2023-04-05 13:03:18 +02:00
David Domenech	44d4df9c21	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-05 11:00:08 +00:00
Vicent Llopis	3450e7ffdf	refs #5275 fix test e2e	2023-04-05 09:20:56 +02:00
Carlos Satorres	8741a9f913	Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra	2023-04-05 06:51:21 +00:00
Carlos Satorres	7d3c6a98f3	refs #5439 search panel solve	2023-04-05 08:48:15 +02:00
Vicent Llopis	fb5969a120	refs #5275 add test	2023-04-05 08:43:47 +02:00