10200 Commits

Author	SHA1	Message	Date
Carlos Satorres	bf0cc687e1	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 07:27:46 +00:00
Carlos Satorres	eea09a9d4a	fix: refs #6850 add code	2024-10-21 09:24:53 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Carlos Satorres	19fbb836a6	fix: refs #6850 fix model	2024-10-21 08:30:39 +02:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Carlos Satorres	b88dc1c70f	fix: refs #6850 remove notifyPickUp	2024-10-20 16:23:24 +02:00
Carlos Satorres	b8e782d3a5	fix: refs #6831 filter observation	2024-10-20 15:59:24 +02:00
Jon Elias	9e9773578a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:22:35 +00:00
Carlos Satorres	0a726a8fe7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-18 11:16:06 +02:00
Carlos Satorres	ed69604767	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 08:31:38 +00:00
Guillermo Bonet	939f083671	Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ... Reviewed-on: #3122 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-18 08:27:08 +00:00
Carlos Satorres	5a14aed73a	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 07:40:04 +00:00
Jon Elias	3139d99130	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:30:43 +00:00
Jon Elias	46993ad103	refactor: refs #7010 deleted distinct	2024-10-18 09:29:01 +02:00
Carlos Satorres	1273e895af	fix: refs #7906 fix test back	2024-10-18 09:27:43 +02:00
Jon Elias	f68584b3fa	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 06:53:38 +00:00
Carlos Satorres	02dc952024	fix: refs #7906 add test	2024-10-18 08:28:08 +02:00
Guillermo Bonet	28e957fecd	refactor: refs #8106 refs #1406 Optimized ticket_getTax	2024-10-17 14:46:19 +02:00
Pablo Natek	78ee7e141d	fix: refs #7457 remove translate and use param definition for restriction	2024-10-17 08:40:25 +02:00
Pablo Natek	a35c10adab	fix: refs #7457 error on empty from param and add translate	2024-10-17 08:35:24 +02:00
Pablo Natek	3ce8d21ed3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter	2024-10-17 08:19:06 +02:00
Javi Gallego	681f82a3ae	feat: refs #7744 test back ok	2024-10-16 16:09:53 +02:00
Carlos Satorres	37d3ef5f16	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:13 +00:00
Carlos Satorres	67714f2dff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-16 13:59:04 +02:00
Carlos Satorres	3f3b936255	fix: refs #7906 remove code	2024-10-16 13:56:42 +02:00
Carlos Satorres	a282170016	fix: refs #7906 fix method	2024-10-16 11:36:48 +02:00
Jorge Penadés	8f01e4d110	fix: refs #7353 redirect to lilium	2024-10-16 09:32:15 +02:00
Carlos Satorres	c5aa7dc44e	fix: refs #7906 edit test	2024-10-16 09:30:37 +02:00
Jorge Penadés	8ca097d4a9	chore: refs #7919 change var name	2024-10-16 09:23:39 +02:00
Javi Gallego	aac4dd0a6d	feat: refs #7348 minor bug	2024-10-16 08:52:27 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Carlos Satorres	46e657675b	fix: refs #7906 remake method	2024-10-16 08:26:39 +02:00
Jorge Penadés	d57f4fc44a	chore: refs #7919 refactor, drop relation on back	2024-10-15 17:24:14 +02:00
Jorge Penadés	6f8a005726	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-15 17:01:29 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Carlos Satorres	099fe8f950	fix: refs #7986 fix model	2024-10-15 14:42:35 +02:00
Jon Elias	e334152acc	refactor: deleted comment	2024-10-15 09:03:15 +02:00
Javi Gallego	976e50b566	feat: refs #8098 identation	2024-10-15 08:25:53 +02:00
Javi Gallego	4526873bbe	feat: refs #8098 without Date	2024-10-15 08:24:13 +02:00
Javi Gallego	5e2edad6de	Merge branch 'dev' into 8098-closureTransation	2024-10-15 08:21:40 +02:00
Javi Gallego	f2d1aa5f16	feat: refs #8098 closureDaysAgo	2024-10-15 08:17:03 +02:00
Alex Moreno	5b938a6f78	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 08:00:39 +02:00
Sergio De la torre	f27566ac0f	Merge pull request 'master' (!3098) from master into test ... Reviewed-on: #3098 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-15 05:18:30 +00:00
Jorge Penadés	6d4c71d465	feat: refs #7919 test	2024-10-14 17:14:40 +02:00
Jorge Penadés	a35208d903	feat: refs #7919 test	2024-10-14 17:14:01 +02:00
Jorge Penadés	ccf9dbde8e	feat: refs #7919 test	2024-10-14 17:11:12 +02:00
Sergio De la torre	13c7b34c98	Merge branch 'master' into 6861-ItemShelvingSaleReserve	2024-10-14 14:15:51 +00:00
Jorge Penadés	0549e22720	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 15:38:30 +02:00
Jorge Penadés	f3b5a70b67	feat: refs #7323 show right error	2024-10-14 14:41:25 +02:00
Carlos Satorres	68469e2ba8	Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto	2024-10-14 13:52:08 +02:00
Jon Elias	07849ebeb8	fix: myTeam param	2024-10-14 13:25:09 +02:00
Sergio De la torre	06b7d56837	fix: refs #6861 assignCollection&isOnReservationMode	2024-10-14 13:01:30 +02:00
Jon Elias	4ee6a46bd5	feat: added new filter param	2024-10-14 11:29:49 +02:00
Guillermo Bonet	6c62172633	feat: refs #7006 itemTypeLog created	2024-10-14 09:31:35 +02:00
Guillermo Bonet	78a9b788bf	feat: refs #7006 itemTypeLog created	2024-10-14 08:42:54 +02:00
Jorge Penadés	b39a749bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 08:37:58 +02:00
Alex Moreno	d8e0c1debe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 07:27:19 +02:00
Jorge Penadés	2b17e6da4c	Merge branch 'dev' into 7874-createObservationType	2024-10-10 08:16:29 +00:00
Jorge Penadés	f5a43962fd	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:06 +00:00
Alex Moreno	040304d04f	fix: merge	2024-10-08 17:10:19 +02:00
Alex Moreno	0c6541372e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-08 17:09:26 +02:00
Alex Moreno	3cf7591206	fix(closeAll): not use transaction	2024-10-08 17:03:27 +02:00
Carlos Satorres	39e808bca7	fix: refs #7986 fix model	2024-10-08 16:06:38 +02:00
Carlos Andrés	d497ffc781	Actualizar modules/ticket/back/methods/ticket/closure.js	2024-10-08 13:32:57 +00:00
Alex Moreno	5cdb0b7eb6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-08 12:19:10 +02:00
Jorge Penadés	3755c5a15b	Merge branch 'dev' into 7207-showPbx	2024-10-07 14:27:09 +00:00
Jorge Penadés	4fb0936399	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:11 +00:00
Jorge Penadés	53f590af61	Merge branch 'dev' into 7207-showPbx	2024-10-07 06:31:14 +00:00
Sergio De la torre	e90d48c777	fix: refs #7524 backSuppliersPackaging	2024-10-07 08:00:34 +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
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	4411f0cfb3	Merge branch 'dev' into 7353-takeoutMonitor	2024-10-04 13:56:49 +00: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
Sergio De la torre	52e8bac168	fix: refs #7524 backSuppliersPackaging	2024-10-04 13:34:04 +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
Guillermo Bonet	0b1756ff3a	Merge branch 'test' into dev	2024-10-04 09:13:53 +02:00
Carlos Satorres	3385f4136d	Merge branch 'dev' into 6896-ordersMigration	2024-10-04 06:31:13 +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
Ivan Mas	0374cbd4c9	fix: hotfix email rutas	2024-10-03 18:20:21 +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
Javier Segarra	0a188e03fe	Merge branch 'master' into fix_isWorker_defaulter	2024-10-03 12:19:27 +00:00
Carlos Satorres	60375d153f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-10-03 13:02:07 +02:00
Javier Segarra	76308f7e37	fix(salix): filter isWorker in DefaulterView	2024-10-03 12:13:38 +02:00
Pablo Natek	3f325d865f	fix: refs #7404 test for lasEntriesFilter	2024-10-03 12:08:23 +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
Pablo Natek	616c328681	Merge branch 'dev' into 7404-roundDetailVolume	2024-10-03 07:55:51 +00:00
Jorge Penadés	546bb85484	Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 09:27:51 +02:00
Jorge Penadés	0311069f00	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:16:55 +00:00
Jon Elias	cbc8cc6210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField	2024-10-03 09:14:16 +02:00
Javi Gallego	91d9a6e417	Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev ... Reviewed-on: #3060 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-03 05:45:09 +00:00
Javi Gallego	5f695f63b3	Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev ... Reviewed-on: #2882 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-03 05:34:44 +00:00
Javi Gallego	ee52c8b45f	fix: refs #7346 findByid con fields	2024-10-02 15:34:53 +02:00
Javi Gallego	43df98598c	feat: refs #7346 manual invoice with address	2024-10-02 15:27:09 +02:00
Carlos Satorres	f786996e2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-02 10:50:11 +02:00
Carlos Satorres	c8abf153e5	Merge branch 'dev' of https: refs #7366//gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration	2024-10-02 10:38:21 +02:00
Jon Elias	2267b2c6b1	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 04:55:56 +00:00
Javi Gallego	1cf14035d5	feat: existingRefund without ticketRefund	2024-10-01 15:51:30 +02:00
Javi Gallego	40512ca67e	feat: existingRefund without ticketRefunds	2024-10-01 15:49:51 +02:00
Jon Elias	d73f790221	Merge branch 'dev' into 7884-AddLabelerField	2024-10-01 13:10:19 +00:00
Jon Elias	b7b5334a99	refactor: refs #7884 modified filter	2024-10-01 15:08:42 +02:00
Javi Gallego	aba70f4a82	Merge pull request 'feat: refs #6722 fixtures' (!3027) from 9722-travelThermographTrigger into dev ... Reviewed-on: #3027 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 10:41:20 +00:00
Carlos Satorres	99bd78db36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration	2024-10-01 12:40:12 +02:00
Carlos Satorres	0740acfb91	fix: refs #7366 remove back Travel	2024-10-01 12:38:52 +02:00
Javi Gallego	4c9a199418	Merge branch 'dev' into 9722-travelThermographTrigger	2024-10-01 12:29:55 +02:00
Carlos Satorres	ca8cffff94	Merge branch 'dev' into 7354_ZoneMigration_End	2024-10-01 09:37:19 +00:00
Alex Moreno	c2e89002cd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-01 11:31:47 +02:00
Alex Moreno	f916509b86	fix(StockBought): revert bad merge master to test	2024-10-01 11:30:34 +02:00
Guillermo Bonet	4243cdbf50	fix: refs #7817 Tests back	2024-10-01 09:18:16 +02:00
Guillermo Bonet	45e87a5d94	Merge branch 'test' into dev	2024-10-01 08:53:10 +02:00
Sergio De la torre	b4a2be660d	fix: refs #6868 handleUser addIsOnReservationMode	2024-10-01 07:08:11 +02:00
Carlos Satorres	1927a914e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-01 06:30:02 +02:00
Javi Gallego	329920389d	fix: option Error	2024-09-30 15:49:46 +02:00
Javi Gallego	36e1cfd51a	fix: myOptions error	2024-09-30 15:47:50 +02:00
Alex Moreno	61f806b0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-30 14:40:35 +02:00
Alex Moreno	75d0c298a1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-30 14:38:17 +02:00
Jon Elias	b55db4bdc0	feat: refs #7010 added subquery to avoid using group by in sql	2024-09-30 14:09:57 +02:00
Jon Elias	c4f26094d5	fix: refs #7884 fixed filter	2024-09-30 12:46:41 +02:00
Jon Elias	eacc2d5d2a	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField	2024-09-30 12:07:56 +02:00
Jon Elias	c680c4a059	refactor: refs #7884 modified sql	2024-09-30 12:07:55 +02:00
Pablo Natek	e7d07e496e	fix: refs #7404 add rounding to volume detail	2024-09-30 10:16:45 +02:00
Alex Moreno	dbbd2c7947	feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line	2024-09-30 08:04:01 +02:00
Pablo Natek	f858674c8a	Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev" ... This reverts commit f6c5f41d44, reversing changes made to 5ee5da24e1.	2024-09-27 12:01:54 +02:00
Jon Elias	b547858820	perf: refs #7010 showing field correctly	2024-09-27 08:28:12 +02:00
Jorge Penadés	f3bf0b7432	feat: refs #7874 validate required field	2024-09-26 17:20:50 +02:00
Javi Gallego	f68ed48081	feat: refs #9722 testFixed	2024-09-26 15:25:51 +02:00
Javi Gallego	c825191823	feat: refs #9722 fixtures	2024-09-26 15:22:40 +02:00
Jon Elias	4ebda1a06f	feat: refs #7010 added filter fields to show packing type field in ticket list	2024-09-26 14:06:45 +02:00
Jorge Penadés	5e56034105	fix: refs #7323 rollback	2024-09-26 09:48:07 +02:00
Jorge Penadés	f62d11dab2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-26 09:17:14 +02:00
Jorge Penadés	d1529c808e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-26 09:09:07 +02:00
Jorge Penadés	7c23acde64	feat: refs #7874 add observationTypeFk col	2024-09-26 09:08:42 +02:00
Javi Gallego	6ce4ff1311	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:31:12 +02:00
Javi Gallego	9ef44d8d8d	feat: refs #6722 refactor createThermograph	2024-09-25 13:23:31 +02:00
Sergio De la torre	8f63118550	fix: refs #6861 updateAvailable	2024-09-25 12:24:00 +02:00
Jorge Penadés	1c42303a75	chore: refs #7207 drop useless relation	2024-09-25 09:18:10 +02:00
Jorge Penadés	eb0f8ec23c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-09-25 08:59:22 +02:00
Jon Elias	26d7866ec8	Merge branch 'dev' into 7884-AddLabelerField	2024-09-25 06:02:44 +00:00
Jorge Penadés	0f8db9ee7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-09-24 14:38:58 +02:00
Jon Elias	ae039d6ce2	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 10:51:25 +00:00
Alex Moreno	63a4cb1847	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-24 12:25:41 +02:00
Alex Moreno	9106171b92	Merge branch 'test' into hotFix_travelList_daysOnward	2024-09-24 09:39:21 +00:00
Jon Elias	d221611382	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 09:33:47 +00:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Jon Elias	1e07a2fc59	Merge branch 'dev' into 7884-AddLabelerField	2024-09-24 08:44:36 +00:00
Jorge Penadés	78b500e452	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-24 10:15:25 +02:00
Pablo Natek	f9b37541eb	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 08:55:47 +02:00
Pablo Natek	a5f3dbc15a	fix: refs #7404 last entries spec	2024-09-24 08:55:24 +02:00
Alex Moreno	76e545d488	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward	2024-09-24 08:35:30 +02:00
Pablo Natek	bfd52b8773	Merge branch 'dev' into 7404-fixStockBought	2024-09-24 05:31:34 +00:00
Pablo Natek	166ca42e32	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 07:31:24 +02:00
Pablo Natek	3988eb0d97	fix: refs #7404 back and e2e	2024-09-24 07:31:22 +02:00
Sergio De la torre	ea06afb361	Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master ... Reviewed-on: #3003 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 05:17:02 +00:00
Alex Moreno	882f1eb7c2	feat(travelFilter): add daysOnward	2024-09-23 15:30:10 +02:00
Jorge Penadés	6ff76fd74b	feat: refs #7207 show queue in worker summary	2024-09-23 14:40:38 +02:00
Robert Ferrús	31d5a7a635	feat: refs #8000 add column	2024-09-23 11:53:27 +02:00
Pablo Natek	ab89c8f3ba	Merge branch 'dev' into 7404-fixStockBought	2024-09-23 08:16:16 +00:00
Pablo Natek	80985fbd56	fix: refs #7404 round data and fix specs	2024-09-23 10:14:09 +02:00
Pablo Natek	459f6601b7	fix: refs #7404 add transaction on detail calculate	2024-09-23 10:02:01 +02:00
Jorge Penadés	8ff0dc06fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-23 09:29:51 +02:00
Sergio De la torre	c6d5e2f292	fix: hotFix backLimit refs #6964	2024-09-23 08:09:24 +02:00
Ivan Mas	06f8f8e95e	refactor: refs #7725 deprecate worker.isF11Allowed	2024-09-22 08:39:19 +02:00
Pablo Natek	fb1e77f9c4	fix: refs #7404 fix back data source	2024-09-20 11:06:38 +02:00
Jon Elias	2fc07e651f	Merge branch 'dev' into 7884-AddLabelerField	2024-09-20 08:24:42 +00:00
Carlos Satorres	eb3ea010a1	Merge branch 'master' into 6898-fixSupplier2	2024-09-20 07:31:15 +00:00
Carlos Satorres	889b86644b	fix: refs #6898 filter fix	2024-09-20 09:14:38 +02:00
Jon Elias	fa4f75fbb9	Merge branch '7356-FixTicketWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 7356-FixTicketWeekly	2024-09-19 13:14:24 +02:00
Jon Elias	b642147d82	feat: refs #7356 added new filter field	2024-09-19 13:14:22 +02:00
Ivan Mas	24b9dfb9a9	Merge branch 'dev' into 7343-ModifyDiverRouteEmail	2024-09-19 10:50:44 +00:00
Ivan Mas	c82c9395a4	feat: refs #7343 Requested changes	2024-09-19 12:49:45 +02:00
Alex Moreno	ccb60eee87	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-19 12:42:12 +02:00
Ivan Mas	c30ecd3760	feat: refs #7343 Modify driverRouteEmail.js	2024-09-19 12:26:06 +02:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02:00
Carlos Satorres	355ce46393	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-09-19 08:54:53 +02:00
Carlos Satorres	6b90690924	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-19 06:10:15 +00:00
Javi Gallego	da0e735fb2	fix: hotFix limit 5	2024-09-18 23:41:01 +02:00
Carlos Satorres	2af4d86c28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-09-18 13:32:02 +02:00
Carlos Satorres	5da6c09f68	fix: refs #7529 workerPit	2024-09-18 12:08:49 +02:00
Alex Moreno	79d79f0c9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk	2024-09-18 12:03:52 +02:00
Jorge Penadés	c0c8548216	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-18 09:41:40 +02:00
Alex Moreno	829ecba2ef	refactor: refs #7792 revert TwoFactorType	2024-09-18 08:30:05 +02:00
Jon Elias	35358834d9	Merge branch 'dev' into 7884-AddLabelerField	2024-09-18 06:23:44 +00:00
Carlos Satorres	c0ee82fd4f	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-09-18 07:56:03 +02:00
Javier Segarra	96159224a4	Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf	2024-09-17 16:48:09 +02:00
Jorge Penadés	eb430ea5c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-17 15:44:19 +02:00
Javi Gallego	06d06d7b1a	Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ... Reviewed-on: #2970 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 13:09:18 +00:00
Javier Segarra	7f6bd55eaa	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 13:07:25 +00:00
Jon Elias	59c6d316dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField	2024-09-17 14:21:14 +02:00
Jon Elias	71362baa66	feat: refs #7884 added filter when daysOnward and daysAgo have value and refactor ifs block	2024-09-17 12:42:47 +02:00
Jorge Penadés	529be86d84	fix: refs #7524 too records error	2024-09-17 11:44:09 +02:00
Jorge Penadés	4332fccfcc	chore: refs #7524 rollback	2024-09-17 11:43:34 +02:00
Javier Segarra	3e5442c40b	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 11:42:04 +02:00
Jorge Penadés	3f321e8ee8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid	2024-09-17 11:40:52 +02:00
Carlos Satorres	727c18d6ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-09-17 11:11:51 +02:00
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00:00