6855 Commits

Author	SHA1	Message	Date
Carlos Satorres	223ccb9a9a	Merge branch 'dev' of https: refs #7917//gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-12-03 09:39:04 +01:00
Alex Moreno	a85d797edc	chore: pullinfo	2024-12-03 08:40:26 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +01:00
Alex Moreno	1ee6254976	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-03 08:24:49 +01:00
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Jorge Penadés	9573090318	chore: refs #6818 rollback	2024-12-02 14:49:35 +01:00
Jorge Penadés	33f8ee5e9d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-addInternationalChannel	2024-12-02 13:34:38 +01:00
Jorge Penadés	66a87f1997	feat: refs #6818 add current country prefix	2024-12-02 13:33:39 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Guillermo Bonet	b67585137a	Merge branch 'master' into test	2024-12-02 13:06:47 +01:00
Guillermo Bonet	508908bf85	fix: refs #7266 Minor changes	2024-12-02 13:01:12 +01:00
Jorge Penadés	fc4f5b55f7	fix: refs #6818 update country & channel	2024-12-02 12:59:37 +01:00
Guillermo Bonet	4a74015fc5	fix: refs #7266 Minor changes	2024-12-02 12:57:34 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Guillermo Bonet	fb58ab5bd2	fix: refs #7266 Created buy_getLastWihoutInventory proc	2024-12-02 12:54:36 +01:00
Carlos Satorres	bb9c525f2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-12-02 12:22:38 +01:00
Carlos Satorres	634e496ef0	fix: refs #7917 fix getRouteByAgency	2024-12-02 11:52:33 +01:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Sergio De la torre	6f1bfd6787	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-28 07:50:06 +00:00
Carlos Andrés	15c755087c	fix: refs #8221 duaInvoiceIn unique	2024-11-27 14:28:50 +01:00
Carlos Satorres	ed8be4333f	fix: refs #7917 fix acl	2024-11-27 12:39:46 +01:00
Carlos Satorres	2f8982d49c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-11-27 12:36:25 +01:00
Guillermo Bonet	e62553630c	Merge branch 'test' into dev	2024-11-27 10:41:31 +01:00
Guillermo Bonet	55bf10435e	Merge branch 'master' into test	2024-11-27 10:41:14 +01:00
Carlos Satorres	f9d12f330f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-11-27 10:38:49 +01:00
Jorge Penadés	60a90bb090	fix: add IF NOT EXISTS to isRaid column in travel table	2024-11-27 09:38:33 +01:00
Guillermo Bonet	05671be60e	Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev ... Reviewed-on: #3249 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-27 05:50:44 +00:00
Carlos Andrés	c550f711c6	Actualizar db/routines/vn/triggers/travel_beforeUpdate.sql	2024-11-26 17:55:36 +00:00
Ivan Mas	10d2d4c9c4	fix: hotfix entry_splitByShelving	2024-11-26 18:01:49 +01:00
Alex Moreno	816a7f23e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-26 14:18:19 +01:00
Alex Moreno	93a0d4cdf4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-26 14:18:06 +01:00
Alex Moreno	c66ae728d6	build: dump db	2024-11-26 14:12:10 +01:00
Guillermo Bonet	89d941c115	refactor: refs #8235 Deleted deprecated objects	2024-11-26 14:10:39 +01:00
Guillermo Bonet	10fe53b7f2	refactor: refs #8204 Deprecated itemShelvingLog	2024-11-26 14:01:44 +01:00
Guillermo Bonet	f8a79057b2	fix: refs #7899 Version	2024-11-26 13:42:33 +01:00
Ivan Mas	f32d709b9d	Merge branch 'dev' into 7899-deleteUnusedStates	2024-11-26 12:22:30 +00:00
Sergio De la torre	f4f5ab2651	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-26 11:46:54 +00: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 Satorres	3a6df984aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute	2024-11-26 06:49:17 +01:00
Carlos Andrés	d007e4f218	Actualizar db/versions/11363-silverCarnation/00-firstScript.sql	2024-11-25 17:53:44 +00:00