7059 Commits

Author	SHA1	Message	Date
Carlos Satorres	99b5433e62	fix: refs #7917 fix acls	2025-01-22 10:02:20 +01:00
Carlos Satorres	d66b8f4963	fix: refs #7917 acls	2025-01-21 13:54:02 +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
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	9584ffcf5b	feat: refs #7531 Added landed index	2025-01-20 08:10:12 +01:00
Guillermo Bonet	04180bf8da	Merge branch 'test' into dev	2025-01-20 07:52:04 +01:00
Guillermo Bonet	934507569e	feat: refs #7531 Added comment	2025-01-20 07:48:43 +01:00
Guillermo Bonet	e6abb1d759	feat: refs #7531 Minor change	2025-01-20 07:41:41 +01:00
Guillermo Bonet	044a22bc3e	feat: refs #7531 Deleted address_hasDelivery	2025-01-20 07:13:04 +01:00
Guillermo Bonet	e636d43f04	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:42:15 +01:00
Guillermo Bonet	a666cfa4cd	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:40:07 +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
Guillermo Bonet	1aa1fbda6c	feat: refs #7531 Added address_hasDelivery	2025-01-17 08:10:26 +01:00
Guillermo Bonet	69b78b6bf1	feat: refs #7531 Added address_hasDelivery	2025-01-16 15:04:21 +01: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
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	416e6c81f1	refactor: refs #8378 deprecate bi.f_tvc	2025-01-15 15:22:48 +01:00
Carlos Satorres	516147b8bb	fix: refs #7917 fix acls	2025-01-15 13:04:49 +01:00
Guillermo Bonet	c2ca9cfbe5	feat: refs #7531 Added address_hasDelivery	2025-01-15 12:26:16 +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
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
Jon Elias	29e6a99983	feat: refs #8247 added new acl for VnUser model	2025-01-14 07:36:23 +01: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
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
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
Carlos Satorres	d547456d22	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-13 07:14: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
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Carlos Satorres	6d661dba85	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-10 05:36:23 +00: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
Guillermo Bonet	2141d7d95d	fix: refs #7912 Major corrections waste_addSales	2025-01-09 11:29:07 +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
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
Guillermo Bonet	d0d1950e75	fix: refs #7912 Changed week num param to to be similar vn.time	2025-01-09 07:28:14 +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	c07e30a89c	fix: prevent deleting absences for past dates	2025-01-08 12:48:28 +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
Javi Gallego	1816b6de67	feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables	2025-01-08 10:24:18 +01:00
Robert Ferrús	94ccdabe89	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 06:23:04 +00:00
Robert Ferrús	8417030438	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 12:43:57 +00:00
Guillermo Bonet	c83e6a8bbd	Merge branch 'dev' into 8357-workerManaExcludedTriggers	2025-01-07 12:28:23 +00:00