24463 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	d164cccee5	fix: refs #6861 assignCollection	2024-10-07 16:14:16 +02:00
Sergio De la torre	a96d6f7ed8	Merge pull request 'fix: refs #7524 backSuppliersPackaging' (!3074) from 7524-WhereWithoutLimit into master ... Reviewed-on: #3074 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 10:47:14 +00:00
Sergio De la torre	129b70d8d1	Merge branch 'master' into 7524-WhereWithoutLimit	2024-10-07 06:08:37 +00:00
Sergio De la torre	e90d48c777	fix: refs #7524 backSuppliersPackaging	2024-10-07 08:00:34 +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	4da63900a2	fix: refs #7760 collection_assing added global handler sqlexception	2024-10-07 07:36:50 +02:00
Guillermo Bonet	6b7f161d9a	fix: refs #7844 sale_problems llena	2024-10-07 06:39:41 +02:00
Guillermo Bonet	4a17d9ec0e	fix: refs #7760 collection_assing	2024-10-06 09:07:48 +02:00
Sergio De la torre	52e8bac168	fix: refs #7524 backSuppliersPackaging	2024-10-04 13:34:04 +02: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
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
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
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
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	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
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
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
Robert Ferrús	7a6f1eae94	Merge branch 'master' into 8064-itemTagState	2024-10-03 07:58:14 +00:00
Alex Moreno	9a27498bc5	Merge pull request 'build: refs #8062 dump db' (!3062) from 8062-dump into master ... Reviewed-on: #3062 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-03 07:56:36 +00:00
Alex Moreno	34c4715f6e	build: refs #8062 dump db and import ticketCanAdvanceConfig	2024-10-03 09:49:16 +02:00
Robert Ferrús	d1c08e68d3	Merge branch 'master' into 8064-itemTagState	2024-10-03 07:37:16 +00:00
Alex Moreno	e870d16cb9	build: refs #8062 dump db	2024-10-03 07:54:16 +02:00
Alex Moreno	fe10f03459	Merge pull request '8062-testToMaster_2' (!3059) from 8062-testToMaster_2 into master ... Reviewed-on: #3059 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-03 05:43:40 +00:00