26277 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Robert Ferrús	93c9ef6f4c	feat: refs #8387 changes	2025-01-15 10:25:21 +01:00
Robert Ferrús	620d14355c	Merge branch 'master' into hotFixDefaulterFilter	2025-01-15 09:12:45 +00:00
Carlos Satorres	d95482ea54	Merge pull request 'fix: hotfix 7366 6943' (!3360) from hotfix-7366-6943CreditBillingDataAWB into master ... Reviewed-on: #3360 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-15 07:00:40 +00:00
Robert Ferrús	807ddf07ad	feat: refs #6629 test back	2025-01-15 07:31:49 +01: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
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	2585cce627	Merge branch 'master' into hotFixDefaulterFilter	2025-01-14 07:17:17 +00:00
Robert Ferrús	277cd80f50	Merge branch 'dev' into 6822-entryTransfer	2025-01-14 07:13:52 +00: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
Robert Ferrús	0891fc6665	Merge branch 'master' into hotFixDefaulterFilter	2025-01-14 06:31:23 +00: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
Carlos Satorres	24f501f47a	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:23:37 +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	3bdb8f6228	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-14 06:18:27 +00: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	96649f5d8a	feat: refs #7134 remove default value	2025-01-13 23:13:26 +01:00
Javier Segarra	9bfc2a01c5	perf: refs #7134 sql style	2025-01-13 23:09:13 +01:00
Javier Segarra	f0e9cce228	fix: refs #7134 remove unnused method	2025-01-13 22:52:35 +01: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
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	6fd8c5ded6	feat: refs #8387 fix	2025-01-13 14:33:32 +01:00
Robert Ferrús	050c338ffb	feat: refs #8387 crudModel	2025-01-13 14:29:13 +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
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	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
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
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