1995 Commits

Author	SHA1	Message	Date
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
Javier Segarra	da90d43f7a	Merge branch 'dev' into 6321_negative_tickets	2025-02-05 15:36:44 +01:00
Pablo Natek	26faaad5b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-05 08:03:48 +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
Javier Segarra	55eb882754	Merge branch 'dev' into 6321_negative_tickets	2025-02-04 23:42:47 +01:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Javier Segarra	550b0871f0	feat: refs #6321 changes	2025-02-04 13:45:59 +01:00
Javier Segarra	410f3e73dc	Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-04 09:54:41 +01: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
Pablo Natek	8f3bf46165	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-03 13:36:20 +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
Javier Segarra	49c6df42a7	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 10:20:42 +00:00
Ivan Mas	fa9b9cc5a3	feat: refs #8312 modify fixtures.before	2025-01-31 11:06:24 +01:00
Javier Segarra	9791f3b935	fix: refs #6321 fixtures	2025-01-31 01:06:57 +01:00
Jorge Penadés	77623b489b	feat: refs #7119 add new vehicle	2025-01-30 10:55:36 +01:00
Javier Segarra	dc6f93c241	Merge branch 'dev' into 6321_negative_tickets	2025-01-30 08:54:04 +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
Javier Segarra	ac053814e6	test: refs #6321 fixing test	2025-01-29 12:26:42 +01: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	2a4bad5034	Merge branch 'dev' into 6321_negative_tickets	2025-01-21 23:43:07 +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
Javier Segarra	1560c48af2	feat: refs #6321 improve query	2025-01-20 14:32:26 +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
Pablo Natek	f8a156b7ab	feat: refs #6897 add EntryConfig model and enhance entry filtering with new parameters	2025-01-17 08:11:18 +01: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
Javier Segarra	84dfdcb79a	Merge branch 'dev' into 6321_negative_tickets	2025-01-14 12:43:25 +01:00
Javi Gallego	d65ab26bcf	Merge branch 'dev' into 7937-claimAgile	2025-01-14 09:15:58 +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
Javi Gallego	0f83549651	feat: refs #7937 add warehouse and pickup agency fields to ClaimConfig model and update related logic	2025-01-13 09:55:46 +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
Alex Moreno	48d4bab706	build: refs #8355 dump db	2025-01-07 08:01:44 +01:00
Alex Moreno	e0a5a3cd8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-06 19:06:14 +01:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Pablo Natek	98b68a2c74	Merge pull request 'fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic' (!3324) from 7301-removeRedundantInventories into dev ... Reviewed-on: #3324 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-02 09:54:10 +00:00
Jon Elias	5221b9254a	Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:57 +01:00
Carlos Satorres	78a8f80321	fix: refs #7917 fix tback	2025-01-02 08:38:24 +01:00
Carlos Satorres	81d3bce12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-02 06:23:35 +01:00
Jorge Penadés	8a6482ada5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2024-12-30 09:31:19 +01:00
Javi Gallego	49d87ea44f	Merge pull request 'feat: refs #7924 add isCustomInspectionRequired field to item and update related logic' (!3325) from 7924-itemInspection into dev ... Reviewed-on: #3325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:51 +00:00
Jorge Penadés	921edb238c	feat: refs #7119 add Ppe model and establish relationships in Vehicle model	2024-12-27 16:55:59 +01:00
Jorge Penadés	0de4ce9b3c	feat: refs #7119 add BankPolicy and FuelType models	2024-12-27 15:36:19 +01:00
Javier Segarra	ca90d6ecd7	Merge branch 'dev' into 7134-supplierBalance	2024-12-27 11:57:28 +01:00
Jorge Penadés	f8c1e2aacf	feat: refs #7119 add search and filter capabilities to Vehicle model and update related SQL fixtures	2024-12-26 16:36:50 +01:00
Jorge Penadés	fffd095ab3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2024-12-26 09:43:39 +01:00
Jorge Penadés	39fc196464	feat: refs #7119 add VehicleEvent and VehicleState models with associated methods and SQL fixtures	2024-12-24 13:01:23 +01:00
Jose Antonio Tubau	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
Carlos Satorres	85163a13fa	fix: refs #7917 fix fixtures	2024-12-24 08:13:00 +01:00
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00
Carlos Satorres	afb01ed021	fix: refs #7917 fix route filter freeLancer	2024-12-23 11:55:48 +01:00
Javi Gallego	a99d7adfe8	feat: refs #7924 add isCustomInspectionRequired field to item and update related logic	2024-12-19 10:11:33 +01:00
Pablo Natek	49c30890e5	fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic	2024-12-19 08:31:51 +01:00
Guillermo Bonet	6300795e52	refactor: refs #8172 Created table parkingCoordinates	2024-12-18 13:17:47 +01:00
Alex Moreno	116ec5b107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:22:28 +01:00
Alex Moreno	1a8b05c46b	fix: refs #8315 fixture claimDevelopment	2024-12-18 07:08:23 +01:00
Jorge Penadés	6476eb28e6	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-17 10:51:52 +01:00
Jorge Penadés	4612bf2e9b	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-16 09:35:23 +01:00
Guillermo Bonet	d9a6e8a1c9	refactor: refs #7882 Added ACL's	2024-12-16 09:34:45 +01:00
Guillermo Bonet	00b5333ab7	feat: refs #7882 Added tests	2024-12-13 08:07:13 +01:00
Guillermo Bonet	bfad016ec4	Merge branch 'dev' into 7882-osrm	2024-12-13 07:01:42 +01:00
Guillermo Bonet	05ba85219b	feat: refs #7882 Osrm service	2024-12-12 14:35:58 +01:00
Pablo Natek	8e61160aeb	Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ... Reviewed-on: #3230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 13:12:33 +00:00
Jorge Penadés	8b37d99287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-12 09:58:42 +01:00
Pablo Natek	33287938ec	Merge branch 'dev' into 7301-itemLastEntries	2024-12-12 08:34:54 +00:00
Jon Elias	956673cf56	Merge branch 'dev' into Invoice-Out-TransferInvoice	2024-12-12 07:02:28 +00:00
Jorge Penadés	2a2b4b139b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-11 09:13:50 +01:00
Alex Moreno	2f47d7d76e	build: refs #8282 dump db	2024-12-10 10:30:43 +01:00
Javier Segarra	53298bd9ca	Merge branch 'dev' into 6321_negative_tickets	2024-12-09 14:24:34 +01:00