1890 Commits

Author	SHA1	Message	Date
Robert Ferrús	a248c9b7f2	Merge branch 'dev' into 7248-tablesObservation	2025-02-06 13:05:58 +00:00
Jorge Penadés	9ba517b648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-02-06 10:20:22 +01:00
Robert Ferrús	9a80f50fed	Merge branch 'dev' into 7248-tablesObservation	2025-02-05 12:35:05 +00:00
Robert Ferrús	eaea108e62	feat: refs #7248 modify column workerFk to userFK	2025-02-05 13:30:40 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... Reviewed-on: #2990 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-05 06:51:54 +00:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Guillermo Bonet	d6bd60f181	Merge branch 'dev' into 8227-roadmap	2025-02-04 06:18:34 +00:00
Guillermo Bonet	9cecdab5a8	refactor: refs #8227 Fix tests	2025-02-04 07:17:11 +01:00
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +01:00
Sergio De la torre	6b9c8300fb	feat: refs #7412 notificationMisAllocation	2025-02-03 12:41:56 +01:00
Guillermo Bonet	12604d0f67	Merge branch 'dev' into 8227-roadmap	2025-01-31 14:27:18 +01:00
Ivan Mas	fa9b9cc5a3	feat: refs #8312 modify fixtures.before	2025-01-31 11:06:24 +01:00
Jorge Penadés	77623b489b	feat: refs #7119 add new vehicle	2025-01-30 10:55:36 +01:00
Jorge Penadés	2f364ebc76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 16:40:37 +01:00
Javier Segarra	efe0aa708f	Merge branch 'dev' into 7134-supplierBalance	2025-01-29 15:13:49 +00:00
Jorge Penadés	2b443266b2	Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-29 11:51:21 +01:00
Javier Segarra	f2be71be6c	fix: refs #7134 replace value by util.VN_CURDATE()	2025-01-29 09:54:05 +01:00
Guillermo Bonet	56b0baebaa	feat: refs #8227 Roadmap changes	2025-01-29 07:53:41 +01:00
Carlos Satorres	b383725f9f	fix: refs #7917 fix user tests	2025-01-28 12:56:30 +01:00
Carlos Satorres	3c16914135	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-28 11:43:25 +00:00
Jorge Penadés	2eabfaaa8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-28 11:44:59 +01:00
Javier Segarra	9419eada64	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 08:46:17 +01:00
Alex Moreno	d75d4f82f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-28 08:16:59 +01:00
Alex Moreno	f4b7683609	build: refs #8452 dump db	2025-01-28 08:10:23 +01:00
Carlos Satorres	d659e05ce8	fix: refs #7917 remove update	2025-01-27 11:46:29 +01:00
Carlos Satorres	c4a7fbf6e8	fix: refs #7917 fix tests	2025-01-27 10:57:54 +01:00
Guillermo Bonet	306eb6a059	feat: refs #8227 Roadmap fix version	2025-01-24 07:26:25 +01:00
Javier Segarra	630d867787	fix: refs #7134 use vn_curdate	2025-01-21 23:09:07 +01:00
Jorge Penadés	2ae0097fa8	feat: refs #7119 add vehicle type management and delivery role permissions	2025-01-21 15:48:20 +01:00
Guillermo Bonet	482fe77159	feat: refs #8227 Roadmap changes	2025-01-21 14:03:50 +01:00
Javier Segarra	dfcfd34202	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 13:42:36 +01:00
Javi Gallego	a46ec1bc8d	feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records	2025-01-21 08:13:56 +01:00
Jorge Penadés	ecedc84164	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-20 14:28:30 +01:00
Carlos Satorres	a98967bac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 12:38:46 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Javi Gallego	b8dbaec46c	Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev ... Reviewed-on: #3340 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 08:10:09 +00:00
Carlos Andrés	948ad3a752	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 10:16:25 +00:00
Carlos Satorres	d39c063786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-15 06:31:00 +01:00
Javi Gallego	44765b5a64	feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic	2025-01-14 09:07:00 +01:00
Alex Moreno	48ad72ac98	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-14 08:00:08 +01:00
Alex Moreno	6aa898ee59	build: refs #8389 dump db	2025-01-14 07:39:52 +01:00
Carlos Satorres	60c1daa47c	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:18:09 +01:00
Carlos Satorres	86dde8dfb3	fix: refs #7917 fix pr	2025-01-14 07:18:05 +01:00
Javier Segarra	f6c3893d00	feat: refs #7134 minor changes	2025-01-13 12:41:36 +01:00
Javier Segarra	f207222b47	Merge branch 'dev' into 7134-supplierBalance	2025-01-13 11:56:25 +01:00
Carlos Satorres	6d661dba85	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-10 05:36:23 +00:00
Carlos Andrés	71fcce4ed7	Merge branch 'dev' into 7965-unifyProblems	2025-01-09 08:13:42 +01:00
Javi Gallego	be56313706	feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data	2025-01-08 11:58:50 +01:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01:00