24691 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	273068e595	fix: refs #7917 fix methods, tests, acls	2024-10-08 12:18:15 +02:00
Guillermo Bonet	023842ac33	feat: refs #7994 comment changes	2024-10-08 08:33:04 +02:00
Pako Natek	c7269e77a6	Merge pull request 'feat: refs #8075 itemShelving' (!3081) from 8075-itemShelvingMoving into dev ... Reviewed-on: #3081 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-08 05:48:05 +00:00
Pako Natek	ff43533b5a	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-08 05:33:14 +00:00
Ivan Mas	249e37f605	Merge pull request 'feat: refs #7994 update sale.originalQuantity' (!3000) from 7994-UpdateSale.OriginalQuantity into dev ... Reviewed-on: #3000 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-07 14:51:19 +00:00
Ivan Mas	0358157b2c	Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity	2024-10-07 14:48:20 +00:00
Pako Natek	12a1a065f6	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-07 11:47:54 +00:00
Pako Natek	e105fba227	feat: refs #8075 itemShelving ... new field movingState	2024-10-07 13:46:56 +02:00
Pako Natek	ed4dff1914	Merge pull request 'feat: refs #8075 autoupdating' (!3078) from 8075-itemShelvingMoving into dev ... Reviewed-on: #3078 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 08:24:30 +00:00
Pako Natek	df0db41994	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-07 07:05:35 +00:00
Pako Natek	de769efc0f	feat: refs #8075 autoupdating	2024-10-07 09:05:03 +02:00
Pako Natek	2871810ec6	Merge pull request 'feat(itemShelving): refs #8075 new field' (!3077) from 8075-itemShelvingMoving into dev ... Reviewed-on: #3077 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 06:46:54 +00:00
Pako Natek	3cc31b7779	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-07 06:41:45 +00:00
Jorge Penadés	6d973fd4ff	Merge pull request '#7323 worker/filter' (!2978) from 7323-fineTunningWorker into dev ... Reviewed-on: #2978 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 06:41:31 +00:00
Pako Natek	542d0dcbd2	feat(itemShelving): refs #8075 new field ... isMoving indicates the record must be transferred to another sector Refs: #8075	2024-10-07 08:41:07 +02:00
Jorge Penadés	4fb0936399	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:11 +00:00
Guillermo Bonet	701b8d3c14	Merge pull request 'refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale' (!3057) from 6824-itemShelvingSaleNoDelete into dev ... Reviewed-on: #3057 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 05:50:48 +00:00
Guillermo Bonet	d6e2200227	Merge branch 'test' into dev	2024-10-07 07:48:23 +02:00
Guillermo Bonet	1205475c4c	Merge pull request 'fix: refs #7760 collection_assing added global handler sqlexception' (!3076) from 7760-collectionAssingHandler into master ... Reviewed-on: #3076 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 05:47:54 +00:00
Guillermo Bonet	eb5da0f9cc	Merge branch 'test' into dev	2024-10-07 07:39:23 +02:00
Guillermo Bonet	4da63900a2	fix: refs #7760 collection_assing added global handler sqlexception	2024-10-07 07:36:50 +02:00
Guillermo Bonet	7b4d15cb23	refactor: refs #6824 Requested changes	2024-10-07 07:30:36 +02:00
Guillermo Bonet	6b7f161d9a	fix: refs #7844 sale_problems llena	2024-10-07 06:39:41 +02:00
Guillermo Bonet	1ae60f51dd	Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete	2024-10-06 10:54:53 +02:00
Guillermo Bonet	7fc2e34af9	refactor: refs #6824 Fix tests	2024-10-06 10:54:51 +02:00
Guillermo Bonet	9a327a1c39	Merge branch 'dev' into 6824-itemShelvingSaleNoDelete	2024-10-06 08:21:07 +00:00
Guillermo Bonet	ba9d0743b5	refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale	2024-10-06 10:20:34 +02:00
Guillermo Bonet	12bf7f07c5	Merge branch 'test' into dev	2024-10-06 09:13:07 +02:00
Guillermo Bonet	4a17d9ec0e	fix: refs #7760 collection_assing	2024-10-06 09:07:48 +02:00
Pako Natek	4b497108dc	Merge pull request 'fix: refs #8069 call moved upper than transaction start' (!3075) from 8069-Overstocking into dev ... Reviewed-on: #3075 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-04 16:21:22 +00:00
Pako Natek	cf29b1bd82	Merge branch 'dev' into 8069-Overstocking	2024-10-04 16:19:59 +00:00
Jorge Penadés	49305f77df	Merge pull request '#7353 takeout monitor' (!2866) from 7353-takeoutMonitor into dev ... Reviewed-on: #2866 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 14:11:10 +00:00
Jorge Penadés	4411f0cfb3	Merge branch 'dev' into 7353-takeoutMonitor	2024-10-04 13:56:49 +00:00
Pako Natek	04e5018bc9	Merge branch 'dev' into 8069-Overstocking	2024-10-04 11:59:14 +00:00
Pako Natek	6766cebd2a	fix: refs #8069 call moved upper than transaction start	2024-10-04 13:56:54 +02:00
Jorge Penadés	c799a9d894	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 11:32:30 +00:00
Pako Natek	5d00eb793c	Merge pull request 'fix: refs #8069 wrong field name' (!3063) from 8069-Overstocking into dev ... Reviewed-on: #3063 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-10-04 10:01:32 +00:00
Pako Natek	e4d386c65f	Merge branch 'dev' into 8069-Overstocking	2024-10-04 09:47:49 +00:00
Alex Moreno	f8f205a4f8	feat: update myt version	2024-10-04 10:29:50 +02:00
Jorge Penadés	c4faac7446	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 07:47:38 +00:00
Javier Segarra	7e27026cbc	Merge pull request 'FIX: #8081 - Redirect to Lilium from create claim' (!3070) from hotfix_redirect_to_lilium into master ... Reviewed-on: #3070 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 07:24:26 +00:00
Guillermo Bonet	0b1756ff3a	Merge branch 'test' into dev	2024-10-04 09:13:53 +02:00
Javier Segarra	c1d0037d00	Merge branch 'master' into hotfix_redirect_to_lilium	2024-10-04 07:13:05 +00:00
Javier Segarra	9843d001b5	fix(salix): change parse method	2024-10-04 07:09:59 +00:00
Guillermo Bonet	b07ffd2a56	Merge pull request 'fix: refs #7956 item_getSimilar' (!3073) from 7956-itemGetSimilarFix into master ... Reviewed-on: #3073 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-04 07:08:53 +00:00
Guillermo Bonet	7aa8200fca	fix: refs #7956 item_getSimilar	2024-10-04 09:02:59 +02:00
Javier Segarra	2b0d9bd0b4	Merge branch 'master' into hotfix_redirect_to_lilium	2024-10-04 06:52:06 +00:00
Carlos Satorres	505fff82a9	Merge pull request 'fix: refs #6896 remove files' (!2899) from 6896-ordersMigration into dev ... Reviewed-on: #2899 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 06:40:19 +00:00
Pako Natek	a6cc7cd2a5	Merge branch 'dev' into 8069-Overstocking	2024-10-04 06:35:18 +00:00
Carlos Satorres	3385f4136d	Merge branch 'dev' into 6896-ordersMigration	2024-10-04 06:31:13 +00:00