18764 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	58daf4754b	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 11:08:06 +00:00
Pablo Natek	2a29d68677	Merge pull request 'incluye fecha de ayer' (!1965) from 6752-edi.ekt_scan-improved into dev ... Reviewed-on: #1965 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-02 09:42:17 +00:00
Pablo Natek	1155c8d309	Merge branch 'dev' into 4515-addBuyCheck	2024-02-02 09:39:27 +00:00
Sergio De la torre	5bc67333dc	Merge pull request '5802_setState' (!1969) from 5802_setState into dev ... Reviewed-on: #1969 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-02 07:59:27 +00:00
Juan Ferrer	04976bb6ad	Merge pull request 'build: refs #6706 hook test' (!1988) from 6706-optimizeHooks into dev ... Reviewed-on: #1988	2024-02-01 22:40:38 +00:00
Juan Ferrer	93982bf160	Merge branch 'dev' into 6706-optimizeHooks	2024-02-01 22:37:11 +00:00
Juan Ferrer	c35bbc3c9d	build: refs #6706 Jenkinsfile fixes	2024-02-01 23:19:06 +01:00
Juan Ferrer	d7b15d3221	build: refs #6706 Jenkinsfile fixes	2024-02-01 22:23:58 +01:00
Juan Ferrer	eb32b6daa2	build: refs #6706 Jenkinsfile fixes	2024-02-01 22:19:00 +01:00
Juan Ferrer	6a27b752e2	build: refs #6706 Jenkinsfile test	2024-02-01 22:13:36 +01:00
Juan Ferrer	3356691124	build: refs #6706 Jenkinsfile test	2024-02-01 22:12:01 +01:00
Juan Ferrer	76785b99b1	build: refs #6706 Jenkinsfile test	2024-02-01 22:06:30 +01:00
Juan Ferrer	2180045848	build: refs #6706 Jenkinsfile test	2024-02-01 22:04:49 +01:00
Juan Ferrer	056ddbd9ae	build: refs #6706 Jenkinsfile test	2024-02-01 21:49:42 +01:00
Juan Ferrer	aba88c812e	build: refs #6706 Jenkinsfile globals	2024-02-01 21:35:28 +01:00
Juan Ferrer	837b9e6dea	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-02-01 20:04:17 +00:00
Carlos Satorres	e59ab6fd97	Merge pull request 'refs #6397 emailValidation' (!1941) from 6397-emailValidation into dev ... Reviewed-on: #1941 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-01 17:45:53 +00:00
Carlos Satorres	c56073c123	Merge branch 'dev' into 6397-emailValidation	2024-02-01 17:35:33 +00:00
Sergio De la torre	92169adac7	Merge branch 'dev' into 5802_setState	2024-02-01 16:17:25 +00:00
Javi Gallego	d020086255	Merge pull request '6567-cambiar-articulos' (!1966) from 6567-cambiar-articulos into dev ... Reviewed-on: #1966 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 14:47:28 +00:00
Javi Gallego	9a084d225c	Merge branch 'dev' into 6567-cambiar-articulos	2024-02-01 14:34:10 +00:00
Alex Moreno	0852d21ee6	refs #6783 deploy: init version	2024-02-01 14:23:51 +01:00
Alex Moreno	39f0e8b431	refs #6783 deploy: init version	2024-02-01 14:22:22 +01:00
Juan Ferrer	603d8e3d92	build: refs #6706 hook test	2024-02-01 14:07:42 +01:00
Juan Ferrer	a9ddc2d954	Merge branch 'dev' into 6706-optimizeHooks	2024-02-01 14:07:08 +01:00
Carlos Satorres	6576bab305	Merge branch 'dev' into 6397-emailValidation	2024-02-01 11:48:48 +00:00
Juan Ferrer	22575ea80f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:39:55 +01:00
Carlos Satorres	9a224419e5	Merge pull request 'refs #6318 fix code' (!1968) from 6318-removeQuantityCheck into dev ... Reviewed-on: #1968 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-01 11:39:47 +00:00
Juan Ferrer	5dec9ff4a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:39:44 +01:00
Juan Ferrer	2aa801bc0f	refs #5483 Unused deps removed	2024-02-01 12:39:43 +01:00
Carlos Satorres	ffbe0e1261	Merge branch 'dev' into 6318-removeQuantityCheck	2024-02-01 11:27:08 +00:00
Alex Moreno	a9a1f97366	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:17:48 +01:00
Robert Ferrús	af1754c12a	Merge pull request 'feat: refs #6688 delete view vn2008 part5' (!1986) from 6688-deleteView2008Part5 into dev ... Reviewed-on: #1986 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 11:12:31 +00:00
Robert Ferrús	8ddf902776	Merge branch 'dev' into 6688-deleteView2008Part5	2024-02-01 11:02:48 +00:00
Juan Ferrer	f454782c26	build: refs #6706 npm install optimized in docker build	2024-02-01 11:23:20 +01:00
Juan Ferrer	04e5c606fd	build: refs #6706 package-lock.json updated	2024-02-01 11:17:25 +01:00
Juan Ferrer	cf3159fe5a	build: refs #6706 print/package-lock.json added	2024-02-01 10:59:09 +01:00
Juan Ferrer	b091e2467c	build: refs #6706 hook test	2024-02-01 09:36:22 +01:00
Juan Ferrer	b976956eaf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 09:35:32 +01:00
Juan Ferrer	1f21e1accf	build: refs #6706 hook test	2024-02-01 09:35:30 +01:00
Robert Ferrús	512c1bdcc0	Merge branch 'dev' into 6688-deleteView2008Part5	2024-02-01 07:54:25 +00:00
Guillermo Bonet	263d46fa03	Merge pull request 'refactor: refs #6692 Deleted views and dependences' (!1983) from 6692-viewClean9 into dev ... Reviewed-on: #1983 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 07:38:24 +00:00
Guillermo Bonet	5d35519431	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:29:55 +00:00
Guillermo Bonet	c8de0f8ba4	Merge pull request 'refactor: refs #6690 Deleted views and dependences' (!1980) from 6690-viewClean7 into dev ... Reviewed-on: #1980 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 07:29:05 +00:00
Guillermo Bonet	0b5395af2b	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:11:44 +00:00
Guillermo Bonet	386204926f	Merge branch 'dev' into 6690-viewClean7	2024-02-01 07:11:42 +00:00
Guillermo Bonet	50b7f4350e	Merge pull request 'feat: refs #6235 Added device in clockIn' (!1977) from 6235-addDeviceWorkerTimeControl into dev ... Reviewed-on: #1977	2024-02-01 06:45:33 +00:00
Alex Moreno	d338a04a27	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-02-01 06:35:51 +00:00
Robert Ferrús	d2748e5afa	Merge pull request 'feat: refs #6691 delete view vn2008 part8' (!1982) from 6691-deleteView2008Part8 into dev ... Reviewed-on: #1982 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 06:34:07 +00:00
Robert Ferrús	905c15dac7	Merge branch '6691-deleteView2008Part8' of https://gitea.verdnatura.es/verdnatura/salix into 6691-deleteView2008Part8	2024-02-01 07:29:52 +01:00