25973 Commits

All Branches

Search

Author	SHA1	Message	Date
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	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00
Guillermo Bonet	4d98c340d2	feat: refs #7882 Added coords to create a address	2025-01-16 09:34: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
Javi Gallego	69f1e76307	Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry model and queries' (!3354) from 8381-entryTemperature into dev ... Reviewed-on: #3354 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-16 06:56:42 +00:00
Ivan Mas	8da1d866e3	Merge pull request 'refactor: refs #8378 deprecate bi.f_tvc' (!3365) from 8378-deprecateBi.f_tvc into dev ... Reviewed-on: #3365 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-15 15:12:08 +00:00
Ivan Mas	416e6c81f1	refactor: refs #8378 deprecate bi.f_tvc	2025-01-15 15:22:48 +01:00
Jon Elias	d0df1c1f42	Merge pull request '#8247: Added new acl for VnUser model' (!3358) from 8247-CreateNewAcl into dev ... Reviewed-on: #3358 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-15 10:51:25 +00: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	b4686def94	Merge pull request 'build: refs #8389 dump db' (!3359) from 8389-dump into master ... Reviewed-on: #3359 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-14 06:58:52 +00:00
Alex Moreno	6aa898ee59	build: refs #8389 dump db	2025-01-14 07:39:52 +01:00
Alex Moreno	105a5045cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-14 07:37:33 +01:00
Jon Elias	29e6a99983	feat: refs #8247 added new acl for VnUser model	2025-01-14 07:36:23 +01:00
Alex Moreno	43edb1f82e	Merge pull request '8389-testToMaster' (!3357) from 8389-testToMaster into master ... Reviewed-on: #3357 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-14 06:31:07 +00:00
Alex Moreno	00577056dd	build: refs #8389 changelog	2025-01-13 15:24:12 +01:00
Alex Moreno	6e56bdeeb1	fix: refs #8389 prevent error propagation	2025-01-13 15:24:01 +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	e15fc01267	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:37 +01:00
Alex Moreno	13455f6a20	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-13 09:19:19 +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
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	f6f8f2214c	Merge pull request 'feat: refs #7584 workerTimeControl_afterDelete' (!3307) from 7584-workerTimeControl_afterDelete into dev ... Reviewed-on: #3307 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-10 10:05:59 +00:00
Robert Ferrús	1c30de5eee	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-10 09:36:09 +00:00
Robert Ferrús	bdaaffbbd7	feat: refs #7584 changes request	2025-01-10 10:33:19 +01:00
Robert Ferrús	26a319832c	Merge pull request 'feat: sendCheckingPresence debug' (!3349) from sendCheckPresenceDebug into master ... Reviewed-on: #3349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-10 09:13:58 +00:00
Sergio De la torre	5ce23ee122	Merge pull request 'fix: refs #6861 refs#6861 addPrevOK' (!3351) from 6861-addPrevOK into test ... Reviewed-on: #3351 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-10 07:57:56 +00:00
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Robert Ferrús	ac48d5a406	Merge branch 'master' into sendCheckPresenceDebug	2025-01-10 06:43:39 +00:00
Guillermo Bonet	e01d7c1fc6	Merge branch 'test' into dev	2025-01-09 14:51:40 +01:00
Guillermo Bonet	e2763a4da9	Merge branch 'master' into test	2025-01-09 14:51:27 +01:00
Guillermo Bonet	6a85272085	fix: refs #7644 Corrected size of buy-label-supplier	2025-01-09 14:45:20 +01:00
Robert Ferrús	446ffac7f8	feat: sendCheckingPresence debug	2025-01-09 13:44:59 +01:00
Guillermo Bonet	4e608eccc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 11:34:59 +01:00
Guillermo Bonet	2f0a79da3f	Merge branch 'test' into dev	2025-01-09 11:34:53 +01:00
Guillermo Bonet	18adbf9c69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 11:34:44 +01:00
Guillermo Bonet	1787cd3102	Merge branch 'master' into test	2025-01-09 11:34:41 +01:00
Guillermo Bonet	2141d7d95d	fix: refs #7912 Major corrections waste_addSales	2025-01-09 11:29:07 +01:00
Alex Moreno	c8cfbf8d40	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 09:59:26 +01:00
Alex Moreno	1783f6f7e0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 09:54:43 +01:00
Jorge Penadés	bd5610afb6	Merge pull request 'fix: prevent deleting absences for past dates' (!3346) from hotfix-restrictAbsencePrivs into master ... Reviewed-on: #3346 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 08:53:24 +00:00
Jorge Penadés	1bca1eb8e6	Merge branch 'hotfix-restrictAbsencePrivs' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs	2025-01-09 09:48:20 +01:00
Jorge Penadés	7391beb29e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs	2025-01-09 09:47:51 +01:00
Carlos Satorres	e17eb518dd	Merge pull request 'fix: lang any' (!3348) from hotfix-7355accountLang into master ... Reviewed-on: #3348 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 07:07:50 +00:00
Carlos Satorres	cafe6d812a	Merge branch 'master' into hotfix-7355accountLang	2025-01-09 07:03:29 +00:00
Carlos Satorres	d258de1194	fix: lang any	2025-01-09 07:58:59 +01:00
Alex Moreno	2becb20d01	Merge branch 'master' into hotfix-restrictAbsencePrivs	2025-01-09 06:46:18 +00:00
Guillermo Bonet	6b39e5c651	Merge branch 'test' into dev	2025-01-09 07:30:14 +01:00
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01:00