6819 Commits

Author	SHA1	Message	Date
Carlos Satorres	58cc28efaa	fix: refs #4774 fix translation back	2024-11-26 12:40:25 +01:00
Carlos Satorres	9a3934c572	Merge branch 'dev' of https: refs #4774//gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn	2024-11-26 10:27:49 +01:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Guillermo Bonet	6487497638	Merge branch 'master' into test	2024-11-26 10:09:45 +01:00
Pablo Natek	e6df9d426f	fix: refs #8087 correct SQL query to use alias for isRaid in entry_beforeUpdate trigger	2024-11-26 09:17:18 +01:00
Pablo Natek	3057d80e76	fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger	2024-11-26 09:14:38 +01:00
Guillermo Bonet	ed6f490188	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-11-26 09:11:38 +01:00
Guillermo Bonet	45e6d7f046	fix: refs #4948 ticket_selfConsumptionPackaging	2024-11-26 09:11:36 +01:00
Robert Ferrús	43e39fd127	Merge branch 'master' into 8087-fixTrigger	2024-11-26 08:08:13 +00:00
Pablo Natek	0cbaac91c2	fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger	2024-11-26 09:06:25 +01:00
Robert Ferrús	00353186e6	fix: refs #8124 workCenterFk por commissionWorkCenterFk	2024-11-26 09:03:22 +01:00
Guillermo Bonet	2eed2f00a9	fix: refs #4948 ticket_selfConsumptionPackaging	2024-11-26 09:01:04 +01:00
Robert Ferrús	35b508d3d6	fix: refs #8124 workCenter por workCenterFk	2024-11-26 08:33:56 +01:00
Carlos Andrés	d007e4f218	Actualizar db/versions/11363-silverCarnation/00-firstScript.sql	2024-11-25 17:53:44 +00:00
Carlos Andrés	26406b6fdb	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-25 18:45:37 +01:00
Sergio De la torre	f6941928cd	feat: refs #8213 refs#8213 picker ItemShelvingSale	2024-11-25 16:20:25 +01:00
Guillermo Bonet	65ca1b5af3	Merge pull request 'feat: refs #8149 Group by CuentaIvaRepercutido' (!3201) from 8149-ivaXDiario into dev ... Reviewed-on: #3201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-22 12:09:47 +00:00
Carlos Andrés	771aeaa9bd	Merge pull request 'test' (!3237) from test into dev ... Reviewed-on: #3237 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 12:03:18 +00:00
Guillermo Bonet	1c6f59a0ec	Merge branch '8149-ivaXDiario' of https://gitea.verdnatura.es/verdnatura/salix into 8149-ivaXDiario	2024-11-22 12:59:26 +01:00
Guillermo Bonet	4ab2d7fd09	feat: refs #8149 Group by CuentaIvaRepercutido	2024-11-22 12:59:24 +01:00
Carlos Andrés	7cf6acec19	Merge pull request '8124-enrutadoresNuevosRequerimientos' (!3235) from 8124-enrutadoresNuevosRequerimientos into test ... Reviewed-on: #3235 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 09:46:03 +00:00
Guillermo Bonet	c440472693	Merge branch 'dev' into 8149-ivaXDiario	2024-11-22 09:43:26 +00:00
Guillermo Bonet	46c85d44d6	Merge branch 'test' into dev	2024-11-22 09:12:23 +01:00
Guillermo Bonet	a731bb3a45	Merge branch 'master' into test	2024-11-22 09:11:29 +01:00
Guillermo Bonet	c73196edec	fix: refs #7834 expeditionScan_Put no throw	2024-11-22 09:10:18 +01:00
Carlos Andrés	52364bbe2d	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-21 18:44:47 +01:00
Carlos Andrés	7ad17d75d7	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-21 18:41:55 +01:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +01:00
Javi Gallego	0ecbef0c9f	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:15:10 +01:00
Carlos Andrés	770ace0f8e	Merge branch 'test' into dev	2024-11-21 16:11:42 +01:00
Carlos Andrés	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Javi Gallego	510fffb61a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:09:01 +01:00
Carlos Andrés	762d4b9955	Merge branch 'dev' into 8210-RefactorTicket_splitItemPackingType	2024-11-21 11:53:59 +00:00
Sergio De la torre	512b4a54df	fix: refs #7920 refs#7920 itemShelvingLog	2024-11-21 11:28:25 +01:00
Ivan Mas	b2fa7e7caf	Merge branch 'dev' into 7690-renameConfigTables	2024-11-21 09:11:06 +00:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Carlos Satorres	2098ea7163	Merge branch 'dev' into 7529-worerPitFix	2024-11-21 04:48:26 +00:00
Carlos Andrés	031c4398ae	refactor: refs #8210 ticket_splitItemPackingType	2024-11-20 19:19:03 +01:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Ivan Mas	830573e229	refactor: refs #7690 remove modifications printQueue_check.sql	2024-11-20 14:49:55 +01:00
Carlos Satorres	82f4815282	fix: refs #7529 fix acls	2024-11-20 14:16:26 +01:00
Guillermo Bonet	69bdf8efb2	Merge branch 'test' into dev	2024-11-20 14:08:42 +01:00
Sergio De la torre	9fbffe8a6b	fix: refs #7920 refs#7920 itemShelvingLog	2024-11-20 14:03:23 +01:00
Carlos Satorres	7ab1b7d171	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-20 13:14:26 +01:00
Carlos Satorres	df249b05d3	fix: refs #7529 fix acl	2024-11-20 13:10:43 +01:00
Guillermo Bonet	42a27f3407	Merge branch 'test' into dev	2024-11-20 12:17:53 +01:00
Jorge Penadés	3cce342d9d	fix: refs #6818 add config	2024-11-20 09:52:42 +01:00
Carlos Andrés	ad345a0b91	Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev ... Reviewed-on: #3177 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-19 16:57:15 +00:00