25013 Commits

All Branches

Search

Author	SHA1	Message	Date
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	e0d0b66963	feat: refs #7207 add transaction	2024-10-04 16:48:38 +02:00
Jorge Penadés	6fcd883f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-10-04 16:37:01 +02:00
Jorge Penadés	475d0bde38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-04 16:12:44 +02: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	9f97de021a	chore: refs #7874 fix e2e	2024-10-04 16:04:31 +02: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	3d831e290b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-04 13:46:41 +02:00
Jorge Penadés	e1133bcc07	Merge branch 'dev' into 7207-showPbx	2024-10-04 11:45:21 +00:00
Sergio De la torre	52e8bac168	fix: refs #7524 backSuppliersPackaging	2024-10-04 13:34:04 +02:00
Jorge Penadés	c799a9d894	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 11:32:30 +00:00
Carlos Andrés	5d7d9f8d9e	fix: refs #6861 deleteAdded	2024-10-04 13:07:54 +02: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
Sergio De la torre	324875ec1f	fix: refs #6861 deleteAdded	2024-10-04 10:42:33 +02: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
Jorge Penadés	70a2189e30	Merge branch 'dev' into 7207-showPbx	2024-10-04 07:46:18 +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
Pablo Natek	98d22c5c59	Merge pull request 'fix: refs #7781 prevent pallet merge' (!2792) from 7781-fixPalletMerge into master ... Reviewed-on: #2792 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 06:17:56 +00:00
Pablo Natek	c203d5d5e7	Merge branch 'master' into 7781-fixPalletMerge	2024-10-04 05:52:45 +00:00
Pablo Natek	72bab95be1	fix: refs #7781 leave early before any updates on the proc	2024-10-04 07:52:13 +02:00
Pablo Natek	c01e5aee27	Merge pull request 'fix: refs #7404 add rounding to volume detail' (!3035) from 7404-roundDetailVolume into dev ... Reviewed-on: #3035 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 05:31:32 +00:00
Pablo Natek	f019214002	Merge branch 'dev' into 7404-roundDetailVolume	2024-10-04 05:22:07 +00:00
Pablo Natek	229d5369a1	fix: refs #7404 spec for new entry fixture	2024-10-04 07:20:10 +02:00
Carlos Satorres	db6cea6cbb	Merge branch 'dev' into 6896-ordersMigration	2024-10-04 05:19:20 +00:00
Javier Segarra	83f0f11332	fix(salix): redirect from travel to addEntry	2024-10-03 22:33:56 +02:00