24820 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javier Segarra	80750079e1	Merge branch 'hotfix_redirect_to_lilium' of https://gitea.verdnatura.es/verdnatura/salix into hotfix_redirect_to_lilium	2024-10-03 22:32:58 +02:00
Javier Segarra	4f9c9dbace	perf(salix): remove space	2024-10-03 22:32:54 +02:00
Javier Segarra	b85989105b	fix(salix): redirect from travel to addEntry	2024-10-03 22:29:01 +02:00
Javier Segarra	486c7f4fa3	fix(salix): Redirect to Lilium from create claim	2024-10-03 20:07:24 +00:00
Ivan Mas	ec036de2c9	Merge pull request 'fix: hotfix email rutas' (!3069) from hotfix-email-rutas into master ... Reviewed-on: #3069 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-03 16:23:12 +00:00
Ivan Mas	0374cbd4c9	fix: hotfix email rutas	2024-10-03 18:20:21 +02:00
Carlos Andrés	c683925403	Actualizar db/routines/vn/procedures/item_getSimilar.sql	2024-10-03 15:19:57 +00:00
Carlos Andrés	197517dfcc	fix: refs #7956 item_getSimilar block db	2024-10-03 17:02:40 +02:00
Jorge Penadés	3638e9abb6	refactor: refs #7207 simplify code	2024-10-03 16:50:31 +02:00
Jorge Penadés	23d2d2b1ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-10-03 15:39:37 +02:00
Jorge Penadés	5416d38255	feat: refs #7874 redirect to lilium	2024-10-03 15:25:56 +02:00
Jorge Penadés	3f1de126c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 15:13:49 +02:00
Pablo Natek	46e2ffd6c2	fix: refs #7404 add fixtures	2024-10-03 14:39:58 +02:00
Carlos Satorres	1c2b7388be	Merge pull request 'fix: hotfix redirect' (!3068) from hotfix-redirectID into master ... Reviewed-on: #3068 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-03 12:38:48 +00:00
Carlos Satorres	90311b047d	fix: hotfix redirect	2024-10-03 14:35:45 +02:00
Javier Segarra	d21c31988b	Merge pull request 'FIX Filter isWorker in DefaulterView' (!3066) from fix_isWorker_defaulter into master ... Reviewed-on: #3066 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-03 12:20:48 +00:00
Javier Segarra	0a188e03fe	Merge branch 'master' into fix_isWorker_defaulter	2024-10-03 12:19:27 +00:00
Jon Elias	e1eea9cb4e	Merge pull request 'Hotfix: recover entry descriptor and deleted code' (!3064) from Hotfix-RecoveryDescriptor into master ... Reviewed-on: #3064 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-03 11:11:05 +00:00
Jon Elias	7aa7106971	Merge branch 'master' into Hotfix-RecoveryDescriptor	2024-10-03 10:44:03 +00:00
Guillermo Bonet	9499819eec	Merge branch 'test' into dev	2024-10-03 12:43:21 +02:00
Guillermo Bonet	f1bc959a49	fix: refs #7956 item_getSimilar block db	2024-10-03 12:40:52 +02:00
Jon Elias	f96857457d	Merge branch 'master' into Hotfix-RecoveryDescriptor	2024-10-03 10:14:19 +00:00
Javier Segarra	76308f7e37	fix(salix): filter isWorker in DefaulterView	2024-10-03 12:13:38 +02:00
Pablo Natek	02f74e4215	Merge branch 'dev' into 7404-roundDetailVolume	2024-10-03 10:08:43 +00:00
Pablo Natek	3f325d865f	fix: refs #7404 test for lasEntriesFilter	2024-10-03 12:08:23 +02:00
Javi Gallego	977ab4264d	Merge pull request 'fix: refs #6861 collectionGetTickets' (!3065) from 6861-reserves into master ... Reviewed-on: #3065 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-03 09:57:53 +00:00
Sergio De la torre	32415d3616	fix: refs #6861 collectionGetTickets	2024-10-03 11:56:36 +02:00
Sergio De la torre	82f8e84288	fix: refs #6861 collectionGetTickets	2024-10-03 11:42:21 +02:00
Jon Elias	1e585623c7	Merge branch 'master' into Hotfix-RecoveryDescriptor	2024-10-03 09:08:24 +00:00
Robert Ferrús	8f7fe4dc12	Merge pull request 'feat: refs #8064 itemTagState' (!3043) from 8064-itemTagState into master ... Reviewed-on: #3043 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-03 08:49:37 +00:00
Pako Natek	57cd6cc882	Merge branch 'dev' into 8069-Overstocking	2024-10-03 08:47:38 +00:00
Jorge Penadés	2071518f57	fix: refs #7874 rollback	2024-10-03 10:35:04 +02:00
Jorge Penadés	fd877119a9	chore: refs #7874 drop useless locale	2024-10-03 10:34:01 +02:00
Jon Elias	555ada26d1	fix: conflicts	2024-10-03 10:26:18 +02:00
Jon Elias	975e77c2f9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-RecoveryDescriptor	2024-10-03 10:26:08 +02:00
Jon Elias	120aa3e169	fix: recover entry descriptor and deleted code	2024-10-03 10:23:32 +02:00
Jorge Penadés	1930bc450f	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:59:06 +00:00
Robert Ferrús	7a6f1eae94	Merge branch 'master' into 8064-itemTagState	2024-10-03 07:58:14 +00:00
Jorge Penadés	530617ce6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 09:57:53 +02:00