9924 Commits

Author	SHA1	Message	Date
Jorge Penadés	5416d38255	feat: refs #7874 redirect to lilium	2024-10-03 15:25:56 +02: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
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	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	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	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
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
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
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
Jon Elias	26d7866ec8	Merge branch 'dev' into 7884-AddLabelerField	2024-09-25 06:02:44 +00: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
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