26323 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	a46ec1bc8d	feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records	2025-01-21 08:13:56 +01:00
Javi Gallego	8e21ca5293	Merge branch 'dev' into 8381-thermographTravel	2025-01-21 07:53:38 +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
Carlos Satorres	ffeb710933	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 13:27:42 +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
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
Robert Ferrús	316a17304f	feat: refs #8401 restriction itemFk	2025-01-20 12:26:29 +01:00
Robert Ferrús	4b78c12ee4	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-20 10:26:14 +00:00
Robert Ferrús	cb065f42cd	feat: refs #8401 change request	2025-01-20 11:19:24 +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
Robert Ferrús	52f9e71062	feat: refs #6822 refs#6822 fix branche	2025-01-19 09:02:48 +01:00
Robert Ferrús	ce96b0a819	Merge branch 'dev' into 6822-entryTransfer	2025-01-19 07:58:16 +00:00
Robert Ferrús	de2f12bdb5	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-19 07:54:37 +00:00
Robert Ferrús	6c2071742c	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-19 07:38:25 +00:00
Robert Ferrús	5fe032ac75	feat: refs #8401 create triggers to itemTaxCountry	2025-01-19 08:30:14 +01:00
Javi Gallego	4f68a7d262	feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model	2025-01-17 15:36:11 +01: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
Robert Ferrús	81ab9fe0ba	Merge branch 'dev' into 6822-entryTransfer	2025-01-16 09:06:42 +00: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