10112 Commits

Author	SHA1	Message	Date
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
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	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
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
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
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00:00
Jon Elias	1d47690bb4	feat: refs #7884 added new filter field	2024-09-17 08:31:58 +02:00
Javi Gallego	e5e14878b8	feat: refs #3505 remove return	2024-09-17 07:57:00 +02:00
Javi Gallego	06efa8be94	Merge branch 'dev' into 3505-closureTests	2024-09-17 07:12:01 +02:00
Jorge Penadés	4d0bb81632	fix: refs #7323 worker/filter	2024-09-16 16:33:22 +02:00
Jorge Penadés	8fedfbd090	fix: refs #7524 getAmountPaid wip	2024-09-16 13:32:14 +02:00
Javi Gallego	f43fa32d36	feat: refs #3505 fdescribe	2024-09-16 13:26:53 +02:00
Javi Gallego	e4a74ba0e9	feat: refs #3505 testBack closure	2024-09-16 13:24:33 +02:00
Guillermo Bonet	0d7953a869	Merge branch 'dev' into 7912-wasteChanges	2024-09-16 10:33:23 +00:00
Guillermo Bonet	5c7a537275	feat: refs #7912 Added new waste types	2024-09-16 12:32:52 +02:00
Jorge Penadés	0a0701f7c2	Merge branch 'dev' into 7828-makeCorrectCalls	2024-09-16 10:24:36 +00:00
Pablo Natek	1f1da689d4	fix: refs #7404 remove console log	2024-09-16 12:17:51 +02:00
Pablo Natek	138640f991	fix: refs #7404 update test to match new fixtures for travel by continent	2024-09-16 12:05:36 +02:00
Pablo Natek	8f4f2d2d15	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 09:06:04 +02:00
Pablo Natek	cc1cd0563f	feat: refs #7404 fixtures and translates	2024-09-16 09:00:46 +02:00
Guillermo Bonet	5489a5edbc	Merge branch 'test' into dev	2024-09-16 07:16:33 +02:00
Guillermo Bonet	2e34f1bbe6	Merge branch 'master' into test	2024-09-16 07:16:13 +02:00
Guillermo Bonet	635eb405a2	fix: refs #7644 Update in print method	2024-09-13 14:53:44 +02:00
Guillermo Bonet	6f1d962db2	fix: refs #7644 Update in print method	2024-09-13 14:39:47 +02:00
Sergio De la torre	11193bebe6	Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev ... Reviewed-on: #2598 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 09:43:31 +00:00
Javier Segarra	6f18b8a719	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 07:28:45 +00:00
Jorge Penadés	2dc55a706c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-13 09:20:57 +02:00
Jon Elias	99bd20bc05	Merge branch 'dev' into 6346-FixWagonModule	2024-09-13 06:13:26 +00:00
Sergio De la torre	e80fe1d0dc	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:10:47 +02:00
Sergio De la torre	2d4e667009	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:02:30 +02:00
Sergio De la torre	05b6c75a19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-09-13 07:02:15 +02:00
Sergio De la torre	93e7163858	feat: refs #6868 refs# 6868 handleUser	2024-09-12 17:09:27 +02:00
Alex Moreno	1abf6a14f9	fix: workerDms filter workerFk	2024-09-12 13:26:09 +02:00
Jorge Penadés	edccd95fa1	fix: refs #7828 rollback	2024-09-12 10:29:03 +02:00
Jorge Penadés	b2bc095caa	fix: refs #7828 rollback	2024-09-12 10:28:29 +02:00
Jorge Penadés	74fafdf330	fix: refs #7828 filter mail access	2024-09-12 10:27:18 +02:00
Jorge Penadés	6f81ca08db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-12 09:55:03 +02:00
Alex Moreno	9435ce8c5b	Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev ... Reviewed-on: #2946 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-12 07:28:07 +00:00
Jorge Penadés	f1f10d1367	refactor: refs #7828 wip	2024-09-12 09:15:07 +02:00
Jon Elias	d36ce6bf99	Merge branch 'dev' into 6346-FixWagonModule	2024-09-12 05:43:17 +00:00
Jon Elias	a73bdfe18f	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-12 07:36:55 +02:00
Carlos Satorres	757cd78cfc	fix: refs #7354 fix files	2024-09-11 14:42:21 +02:00
Guillermo Bonet	728c40916c	refactor: refs #7895 workerDocument to workerDms	2024-09-11 14:38:58 +02:00
Carlos Satorres	f696c4043d	Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End	2024-09-11 13:47:30 +02:00
Jon Elias	e5161fe9e2	fix: fixed balanceDialog amount field	2024-09-11 13:26:40 +02:00
Guillermo Bonet	6b5f59a09b	Merge branch 'test' into dev	2024-09-11 12:54:27 +02:00
Guillermo Bonet	4c6aba96e5	Merge branch 'master' into test	2024-09-11 12:54:16 +02:00
Alex Moreno	17fecf6dcb	Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization	2024-09-11 10:31:44 +02:00
Alex Moreno	c21da8d258	fix: refs #7182 function name	2024-09-11 10:31:43 +02:00
Alex Moreno	e062088f1e	Merge branch 'dev' into 7182-workerDms_optimization	2024-09-11 08:29:38 +00:00
Pablo Natek	842c98edfc	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 08:22:24 +00:00
Jorge Penadés	2ee0c93e24	chore: refs #7663 fix test	2024-09-11 09:35:26 +02:00
Jorge Penadés	558ab6eba2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:18 +02:00
Carlos Satorres	838b8f541f	fix: setDeleted	2024-09-11 08:45:00 +02:00
Carlos Satorres	ccaf56f842	fix: setDeleted	2024-09-11 08:35:19 +02:00
Alex Moreno	fbfbf21e06	fix: refs #7182 unnesesary file	2024-09-11 08:17:18 +02:00
Alex Moreno	8dc83e2444	feat: refs #7182 optimize workerDms filter	2024-09-11 08:16:21 +02:00
Alex Moreno	e7d3062208	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization	2024-09-11 08:07:29 +02:00
Sergio De la torre	b492a1e6a8	feat: refs #6868 refs# 6868 handleUser	2024-09-11 08:05:26 +02:00
Sergio De la torre	f7f7df55f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-09-11 08:00:07 +02:00
Pablo Natek	8607a60ca7	feat: refs #7404 format date before select	2024-09-11 07:56:08 +02:00
Javier Segarra	f487aed336	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 14:16:56 +00:00
Jorge Penadés	d98f0a2493	chore: refs #7524 rollback	2024-09-10 13:15:58 +02:00
Jorge Penadés	b16c2bed2b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit	2024-09-10 13:09:33 +02:00
Jorge Penadés	91abf2eefe	refactor: refs #7663 accurate error	2024-09-10 09:50:02 +02:00
Jorge Penadés	e2ef3472b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-10 09:41:46 +02:00
Javi Gallego	1c0e148233	fix: cau #217599	2024-09-10 09:08:43 +02:00
Jon Elias	9759715609	fix: refs #6346 created test	2024-09-10 07:52:09 +02:00
Jon Elias	0593ea9a30	Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-10 07:50:42 +02:00
Jon Elias	125c0c9b3b	refactor: refs #6346 requested changes	2024-09-10 07:50:40 +02:00
Alex Moreno	1aa888b1a3	feat(WorkerDms_filter): refs #7182 split code. fix: filter	2024-09-09 15:11:09 +02:00
Guillermo Bonet	52f368e4f7	fix: refs #7346 Global invoice	2024-09-09 14:25:13 +02:00
Javier Segarra	89c2d2705c	feat(salix): refs #5938 #5938 change value-field	2024-09-09 14:21:59 +02:00
Javier Segarra	f15b33778c	feat(salix): refs #5938 #5938 replace variables	2024-09-09 14:21:42 +02:00
Javier Segarra	38ee76f7c9	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 12:20:02 +00:00
Javier Segarra	03d4427bcd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:16:15 +00:00
Jon Elias	662ede981b	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-09 11:59:42 +00:00
Jon Elias	97b07ea561	fix: refs #7356 ticket weekly filter	2024-09-09 13:56:30 +02:00
Javier Segarra	2fef104954	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:20 +00:00
Guillermo Bonet	689315bab8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-09 12:42:21 +02:00
Guillermo Bonet	d9a4b3e6fb	fix: refs #7346 Global invoice	2024-09-09 12:42:19 +02:00
Carlos Satorres	01690ed081	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:39:15 +00:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Guillermo Bonet	3c6b7cd224	Merge branch 'master' into test	2024-09-09 11:35:08 +02:00
Guillermo Bonet	723ec2b453	fix: refs #7844 Filter monitor	2024-09-09 11:34:42 +02:00
Carlos Satorres	44a183785e	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:32:43 +00:00
Alex Moreno	ae15d51341	Merge branch 'dev' into 7792-twoFactorFk	2024-09-09 08:39:36 +00:00
Javier Segarra	378ee1119f	Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField	2024-09-09 10:18:10 +02:00
Javier Segarra	7710b87f4a	test(salix): refs #7671 #7671 improve and revert where changes	2024-09-09 10:07:05 +02:00
Jon Elias	c93275b62d	Merge branch 'dev' into 6346-FixWagonModule	2024-09-09 08:06:04 +00:00
Alex Moreno	71eb44d083	refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey	2024-09-09 09:58:20 +02:00
Javier Segarra	57dbdc6f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-09 09:58:07 +02:00
Javier Segarra	6012604946	perf(salix): refs #7671 #7671 imrpove and revert where changes	2024-09-09 09:57:38 +02:00
Alex Moreno	d7613767fb	Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev ... Reviewed-on: #2934 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-09 07:46:12 +00:00
Alex Moreno	632d3190b1	feat: refs #7938 remove unnecessary insert in clientLog	2024-09-09 07:49:22 +02:00
Jon Elias	3e9f472447	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-09 05:33:34 +00:00
Jon Elias	b3aa263cea	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-09 07:32:11 +02:00
Javier Segarra	5c4a30f2f9	perf: refs #7671 improve showBadDates	2024-09-08 12:50:32 +02:00
Javier Segarra	dbd8f94555	perf: refs #7671 improve showBadDates	2024-09-08 12:49:55 +02:00
Javier Segarra	59cce5d349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-08 12:31:39 +02:00
Jorge Penadés	ba2c5cb209	chore: refs #7323 filter data	2024-09-06 17:49:45 +02:00
Jorge Penadés	0a4bd0f2d5	chore: refs #7323 fix test	2024-09-06 16:09:29 +02:00
Jorge Penadés	6065c056e2	chore: refs #7323 fix test	2024-09-06 16:04:40 +02:00
Jorge Penadés	eb11e18df5	fix: refs #7323 fetch from right source	2024-09-06 16:01:26 +02:00
Jorge Penadés	b277ae2d92	Merge branch 'dev' into 7323-dynamicRole	2024-09-06 12:01:18 +00:00
Javi Gallego	3d985d10d3	Merge pull request 'feat: refs #7277 test with warehouse' (!2931) from 7277-refunding into dev ... Reviewed-on: #2931 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-06 11:52:32 +00:00
Guillermo Bonet	a718b6e81f	Merge branch 'test' into dev	2024-09-06 13:52:10 +02:00
Guillermo Bonet	5a82ce4aae	Merge branch 'master' into test	2024-09-06 13:51:13 +02:00
Guillermo Bonet	0ad4d3a959	feat: refs #7905 getBuysCsv	2024-09-06 13:50:49 +02:00
Juan Ferrer	e2c6a45756	fix: refs #7931 Available back test fix	2024-09-06 12:57:57 +02:00
Jorge Penadés	99ce158632	chore: refs #7663 return correct type	2024-09-06 11:33:15 +02:00
Juan Ferrer	382e54b572	fix: refs #7931 Back test fix	2024-09-06 11:30:43 +02:00
Jorge Penadés	26d47b3f38	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-06 11:29:53 +02:00
Juan Ferrer	d44dec3703	fix: refs #7931 Back test fix	2024-09-06 11:25:49 +02:00