26050 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	9cd8dfaf9d	feat: refs #8077 fix spec	2025-01-17 13:03:28 +01:00
Robert Ferrús	0bfd0895d7	feat: refs #8077 sumDefaulter	2025-01-17 12:11:18 +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
Robert Ferrús	df3f4c3d2e	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-16 08:59:15 +00: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
Robert Ferrús	03c974db12	Merge pull request 'feat: refs #257275 defaulterFilter' (!3356) from hotFixDefaulterFilter into master ... Reviewed-on: #3356 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 07:00:48 +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
Robert Ferrús	0e8b4d92bf	Merge branch 'master' into hotFixDefaulterFilter	2025-01-16 06:53:00 +00:00
Robert Ferrús	4853e45051	feat: refs #8398 change merge.spec	2025-01-16 07:29:40 +01:00
Carlos Andrés	c24b008567	Actualizar modules/travel/back/methods/travel/filter.js	2025-01-15 16:34:44 +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
Robert Ferrús	6ab0515f8e	feat: refs #8398 sendCheckingPresence	2025-01-15 12:31:28 +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
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
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
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
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	c4870d52de	feat: refs #257275 defaulterFilter	2025-01-13 14:37:27 +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