26020 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	5a12a01565	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix	2025-01-22 07:51:41 +01:00
Alex Moreno	9d289fa11e	build: init version	2025-01-21 11:57:35 +01:00
Alex Moreno	ded035285b	Merge pull request '8448-devToTest' (!3373) from 8448-devToTest into test ... Reviewed-on: #3373 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-21 10:00:49 +00:00
Alex Moreno	05b383ecb0	test: refs #8448 fix e2e	2025-01-21 10:57:40 +01:00
Sergio De la torre	6f73758cad	Merge pull request '7569-sendEmailOrderTicket' (!3350) from 7569-sendEmailOrderTicket into dev ... Reviewed-on: #3350 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 06:29:28 +00:00
Sergio De la torre	c50ff6a43a	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-21 07:05:42 +01:00
Sergio De la torre	eee73f001d	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 07:00:02 +01:00
Sergio De la torre	7f17cd59e7	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 06:58:15 +01:00
Sergio De la torre	ef68884fe0	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 16:27:35 +01:00
Sergio De la torre	b5e27707a7	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:36:31 +01:00
Sergio De la torre	0340612645	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:35:55 +01:00
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	86a2b1de1e	Merge branch 'master' into test	2025-01-20 08:10:29 +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	5998002420	Merge branch 'master' into test	2025-01-20 07:51:45 +01:00
Guillermo Bonet	fff6979921	Merge pull request 'feat: refs #7531 Added address_hasDelivery' (!3361) from 7531-addressHasDelivery into master ... Reviewed-on: #3361 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:51:18 +00:00
Guillermo Bonet	7a5ed0ff23	Merge branch 'master' into 7531-addressHasDelivery	2025-01-20 06:49:42 +00: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
PAU ROVIRA ROSALENY	5ef1d615a7	Merge pull request 'feat: #8258 added uppercase validation on supplier create' (!3368) from 8258-uppercaseInputs into dev ... Reviewed-on: #3368 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:01:20 +00:00
PAU ROVIRA ROSALENY	1cdeadb59d	feat: refs #8258 added uppercase validation on supplier create	2025-01-17 13:20:45 +01:00
Robert Ferrús	8b3f2572a1	Merge branch 'dev' into 8077-sumDefaulterBackFix	2025-01-17 12:05:01 +00:00
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
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
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
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