10638 Commits

Author	SHA1	Message	Date
Robert Ferrús	849bcd1ff5	feat: refs #6629 test back updateObservations	2025-01-14 13:39:43 +01:00
Carlos Satorres	d9716154bb	Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB	2025-01-14 11:54:20 +00:00
Carlos Satorres	01072f7cbc	fix: hotfix 7366 6943	2025-01-14 11:36:54 +01:00
Alex Moreno	e273733832	refactor: order by id	2025-01-14 09:33:26 +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
Robert Ferrús	277cd80f50	Merge branch 'dev' into 6822-entryTransfer	2025-01-14 07:13:52 +00:00
Robert Ferrús	0891fc6665	Merge branch 'master' into hotFixDefaulterFilter	2025-01-14 06:31:23 +00:00
Carlos Satorres	07b07611be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:21:13 +01:00
Javier Segarra	96649f5d8a	feat: refs #7134 remove default value	2025-01-13 23:13:26 +01:00
Javier Segarra	f0e9cce228	fix: refs #7134 remove unnused method	2025-01-13 22:52:35 +01:00
Robert Ferrús	da3b8ac8d0	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-13 13:39:12 +00:00
Robert Ferrús	c4870d52de	feat: refs #257275 defaulterFilter	2025-01-13 14:37:27 +01:00
Robert Ferrús	050c338ffb	feat: refs #8387 crudModel	2025-01-13 14:29:13 +01:00
Carlos Satorres	60f0b169d4	fix: refs #6553 fix advanced	2025-01-13 13:56:24 +01:00
Javier Segarra	f6c3893d00	feat: refs #7134 minor changes	2025-01-13 12:41:36 +01:00
Javier Segarra	420bb2a57e	perf: refs #7134 remove unnecessary code	2025-01-13 12:41:16 +01:00
Carlos Satorres	a4f9d62504	Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-13 12:23:24 +01:00
Carlos Satorres	358f93c454	fix: refs #6553 fix worker back	2025-01-13 12:23:21 +01:00
Javier Segarra	f207222b47	Merge branch 'dev' into 7134-supplierBalance	2025-01-13 11:56:25 +01:00
Javi Gallego	c15a3bfe50	feat: refs #8381 add initial and final temperature fields to entry model and queries	2025-01-13 11:28:30 +01:00
Alex Moreno	951376af2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:03 +01:00
Alex Moreno	9d05b16404	fix: canBeInvoiced only in makeInvoice	2025-01-13 09:18:46 +01:00
Carlos Satorres	978914aa71	Merge branch 'dev' into 6553-workerBusiness	2025-01-13 07:50:12 +00:00
Carlos Satorres	d547456d22	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-13 07:14:59 +00:00
Jose Antonio Tubau	1cd7eda4ac	Merge pull request 'feat: refs #8117 add worker first and last name to item type query' (!3330) from 8117-filtersAndValuesReviewed into dev ... Reviewed-on: #3330 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 06:13:31 +00:00
Robert Ferrús	95e7757574	Merge branch 'dev' of https: refs #6629//gitea.verdnatura.es/verdnatura/salix into 6629-addressObservationBack2	2025-01-10 11:26:47 +01:00
Guillermo Bonet	886383b82d	Merge branch 'dev' into 7686-onPrevious	2025-01-10 10:01:40 +01:00
Sergio De la torre	a1e1d4fa72	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-10 07:20:24 +01:00
Carlos Satorres	6d661dba85	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-10 05:36:23 +00:00
Sergio De la torre	12fa87a93c	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-09 16:15:29 +01:00
Guillermo Bonet	2f0a79da3f	Merge branch 'test' into dev	2025-01-09 11:34:53 +01:00
Guillermo Bonet	1787cd3102	Merge branch 'master' into test	2025-01-09 11:34:41 +01:00
Carlos Satorres	c8d57a1efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-09 09:59:25 +01:00
Jorge Penadés	50a95ed3c4	fix: correct variable name in canModifyAbsenceInPast method	2025-01-08 18:30:33 +01:00
Jorge Penadés	b12c3bb72f	fix: enable tests for createAbsence and deleteAbsence methods	2025-01-08 18:28:00 +01:00
Jorge Penadés	412638d590	fix: refactor access control for modifying past absences	2025-01-08 18:27:23 +01:00
Jorge Penadés	838617e3f6	fix: update access control for modifying absences in the past	2025-01-08 15:47:53 +01:00
Jorge Penadés	f557b41feb	fix: tests	2025-01-08 13:52:50 +01:00
Javi Gallego	53c604762a	Merge branch 'dev' into 8298-zonePriceOptimum	2025-01-08 13:43:17 +01:00
Ivan Mas	14b88b1ad6	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-08 12:16:01 +00:00
Jorge Penadés	c07e30a89c	fix: prevent deleting absences for past dates	2025-01-08 12:48:28 +01:00
Alex Moreno	60933216f7	fix: hotFix getMondayWeekYear	2025-01-08 11:42:32 +01:00
Alex Moreno	ecc877e07d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-08 11:35:30 +01:00
Alex Moreno	9842f70bec	fix: hotFix getMondayWeekYear	2025-01-08 11:25:07 +01:00
Javi Gallego	1816b6de67	feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables	2025-01-08 10:24:18 +01:00
Alex Moreno	c0c75c1bee	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 09:41:31 +01:00
Alex Moreno	5ab06ef6e4	fix: hotFix getStartDateOfWeekNumber	2025-01-08 09:39:55 +01:00
Robert Ferrús	115756aaf3	feat: refs #6822 fix transfer test	2025-01-08 07:44:49 +01:00
Ivan Mas	0940a31288	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-07 16:47:43 +00:00
Javi Gallego	dbd8d816c0	fix: refs #8361 streamline transaction handling in exchangeRateUpdate	2025-01-07 14:53:26 +01:00
Carlos Satorres	bd1cee6d8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 12:47:48 +01:00
Robert Ferrús	823be8e0ea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-07 12:02:35 +01:00
Robert Ferrús	c4c9b5640e	feat: refs #6822 modify transaction	2025-01-07 12:02:32 +01:00
Javi Gallego	786f1fe661	test: refs #8361 enhance exchangeRateUpdate specs to validate day1 and day2 entries without backfilling day3	2025-01-07 11:06:09 +01:00
Javi Gallego	73d5d508ce	test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios	2025-01-07 10:45:51 +01:00
Robert Ferrús	65aa931738	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 09:39:36 +00:00
Carlos Satorres	a139c9849c	fix: refs #6553 fix model	2025-01-07 10:33:30 +01:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Robert Ferrús	ebf234dd4f	feat: refs #6822 delete fixtures to test	2025-01-07 09:49:55 +01:00
Robert Ferrús	aee747abd3	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 08:32:28 +00:00
Robert Ferrús	b7658f5814	feat: refs #6822 fix test	2025-01-07 09:28:17 +01:00
Robert Ferrús	04734ac55c	feat: refs #6822 test transfer	2025-01-07 08:59:47 +01:00
Javi Gallego	4f3c101e42	Merge branch 'dev' into 7832-ticketServiceModifyConcept	2025-01-07 07:43:19 +00:00
Jon Elias	ecee47f859	Merge branch 'dev' into 8246-ZoneListNewField	2025-01-07 06:22:31 +00:00
Jon Elias	ad0c1eb4c5	feat: refs #8246 added relation for the front's new field	2025-01-07 07:12:33 +01:00
Carlos Satorres	ddecfee24b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 06:13:51 +01:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Robert Ferrús	31aa7f9915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:35:17 +01:00
Robert Ferrús	02d77324b1	feat: refs #6822 crear test	2025-01-03 08:27:34 +01:00
Alex Moreno	cfe886b687	Merge branch 'dev' into 8117-filtersAndValuesReviewed	2025-01-03 06:52:04 +00:00
Ivan Mas	8822fde7fb	feat: refs #7343 delete sending to user	2025-01-02 18:04:53 +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
Sergio De la torre	05b8c3451a	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-02 10:47:11 +01: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
Javi Gallego	0ad26b336d	fix: refs #7832 update ticketService model test suite to correct describe block	2024-12-31 11:48:05 +01:00
Javi Gallego	1f23ebf6d5	feat: refs #7832 implement refund ticket restrictions and add unit tests for ticket service updates	2024-12-31 11:46:32 +01:00
Javi Gallego	a26de63660	Merge branch 'dev' into 8167-incoiceOutCheckIsActive	2024-12-30 13:35:17 +00: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
Javi Gallego	98e2483565	feat: refs #8167 update locale and improve invoicing logic with error handling	2024-12-29 09:38:51 +01:00
Javi Gallego	5acd4520f8	Merge branch 'dev' into 8167-incoiceOutCheckIsActive	2024-12-29 09:36:44 +01:00
Javier Segarra	a69a767c8a	feat: refs #7134 use filter to order by	2024-12-27 13:57:28 +01:00
Javier Segarra	3691daded4	feat: refs #7134 add bank name	2024-12-27 13:26:38 +01:00
Javier Segarra	ca90d6ecd7	Merge branch 'dev' into 7134-supplierBalance	2024-12-27 11:57:28 +01:00
Jose Antonio Tubau	48d2d1d327	feat: refs #8117 add worker first and last name to item type query	2024-12-26 10:41:20 +01:00
Jose Antonio Tubau	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00
Carlos Satorres	6f16974320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-23 13:30:27 +01:00
Carlos Satorres	16bbcf8185	fix: refs #7917 fix summary test	2024-12-23 12:18:40 +01:00
Carlos Satorres	a30cad1da1	fix: refs #7917 fix tback	2024-12-23 12:14:16 +01:00
Carlos Satorres	419815ff87	fix: refs #7917 fix back	2024-12-23 11:59:40 +01:00
Carlos Satorres	afb01ed021	fix: refs #7917 fix route filter freeLancer	2024-12-23 11:55:48 +01:00
Jorge Penadés	549cb7633e	Merge pull request 'test to dev' (!3326) from test into dev ... Reviewed-on: #3326 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-19 14:51:13 +00:00
Jorge Penadés	6abbf3ec1d	fix: refs #7936 update Spanish locale for SII terms	2024-12-19 13:01:34 +01:00
Jorge Penadés	1f7dae2514	fix: refs #7936 locale	2024-12-19 10:34:46 +01:00
Pablo Natek	ea4b118015	feat: refs #7301 update lastEntriesFilter to include landedDate and enhance test cases	2024-12-19 10:26:53 +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	b838e988e0	fix: refs #7301 remove debug console log and update test cases in lastEntriesFilter	2024-12-19 08:39:47 +01:00
Pablo Natek	49c30890e5	fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic	2024-12-19 08:31:51 +01:00
Javi Gallego	9ae27e104e	feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases	2024-12-19 07:07:56 +01:00
Javi Gallego	6c2d7641f5	Merge pull request 'feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests' (!3306) from 7235-InvoiceOut into dev ... Reviewed-on: #3306 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-18 12:34:56 +00:00
Jorge Penadés	c0893f8684	feat: refs #7936 add locale	2024-12-18 13:06:01 +01:00
Alex Moreno	cfee497adb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:26:22 +01:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Jorge Penadés	8f1fb0a120	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-18 09:46:19 +01:00
Jose Antonio Tubau	43d5243766	Merge pull request 'feat: refs #8293 include zone data' (!3309) from 8293-addZoneToClaimList into dev ... Reviewed-on: #3309 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-18 07:45:05 +00:00
Jorge Penadés	52a0e718c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 13:44:11 +01:00
Jorge Penadés	31952725aa	refactor: refs #6583 use warehouseId var	2024-12-17 13:33:29 +01:00
Jorge Penadés	9ac8e60f0c	fix: refs #6583 drop focus	2024-12-17 12:58:57 +01:00
Jorge Penadés	b935878dd6	feat: refs #6583 add tests	2024-12-17 12:58:25 +01:00
Jorge Penadés	f965f7aa52	fix: refs #6583 update onlyWithDestination logic to handle null values correctly	2024-12-17 12:46:48 +01:00
Carlos Satorres	acfafa1c72	fix: monitorPayMethodFilter	2024-12-17 12:44:55 +01:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Carlos Satorres	acccb4abc3	fix: hotfix mix	2024-12-17 12:19:46 +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
Alex Moreno	2cd1991a96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-17 10:28:26 +01:00
Alex Moreno	863f204247	fix(deleteZone): contrary condition	2024-12-16 14:12:43 +01:00
Carlos Satorres	c1b9032534	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 12:12:41 +01:00
Carlos Satorres	5f43c0440c	fix: refs #7028 requesterId fix salesPerson	2024-12-16 11:58:21 +01:00
Carlos Satorres	576641d09d	fix: refs #7028 requesterId fix	2024-12-16 11:55:01 +01:00
Carlos Satorres	a6bb381b74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:53:12 +01:00
Guillermo Bonet	36705a028e	fix: refs #8174 Version	2024-12-16 11:33:18 +01:00
Carlos Satorres	4bc475d132	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 11:28:49 +01:00
Carlos Satorres	1e471ac20f	fix: refs #7028 requesterId fix	2024-12-16 10:25:33 +01:00
Carlos Satorres	32d9a3ace1	fix: refs #7028 remove ifs	2024-12-16 09:57:48 +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
Carlos Satorres	10c28b03da	Merge branch 'dev' of https: refs #7028//gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:14:07 +01:00
Jose Antonio Tubau	9c32dc5707	feat: refs #8293 include zone data	2024-12-16 08:34:53 +01:00
Carlos Satorres	b14268ef1b	fix: hotfix createAbsence	2024-12-16 08:15:14 +01:00
Carlos Satorres	d1aa164aea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-16 07:19:27 +01:00
Guillermo Bonet	e1db7a86f6	Merge branch 'dev' into 7882-locationiq	2024-12-16 06:16:03 +00:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Javi Gallego	e748e9a012	feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests	2024-12-13 08:30:23 +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
Sergio De la torre	2c672951c6	fix: refs #7569 refs#8188 add IfNotExists	2024-12-12 20:33:00 +01:00
Sergio De la torre	31a6db5da0	feat: refs #7569 refs#7569 sendMail	2024-12-12 20:30:38 +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
Guillermo Bonet	95d7c7f227	Merge branch 'dev' into 7882-osrm	2024-12-12 14:06:44 +01:00
Jorge Penadés	c83f34859a	feat: refs #7936 return country code & is vies fields	2024-12-12 11:20:23 +01:00
Carlos Satorres	dcd8b1ee15	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 11:11:24 +01:00
Carlos Satorres	cd214b3526	fix: refs #7028 fix userError	2024-12-12 11:11:22 +01:00
Jose Antonio Tubau	03ba892581	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-12 10:10:03 +00:00
Carlos Satorres	d35e785bee	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 10:04:03 +00:00
Carlos Satorres	1970b9c0db	fix: refs #7028 fix tback findById	2024-12-12 10:04:31 +01: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
Carlos Satorres	43697eaba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 09:51:08 +01:00
Carlos Satorres	6beb1a18cb	Merge branch 'dev' into 6389-changesMonitor	2024-12-12 08:48:08 +00:00