1538 Commits

Author	SHA1	Message	Date
Guillermo Bonet	699c6553a0	Merge branch 'test' into dev	2024-11-28 11:17:19 +01:00
Jorge Penadés	5ee4563ee7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix	2024-11-28 09:38:28 +01:00
Jorge Penadés	8fd133c5e8	feat: refs #6818 define prefix model	2024-11-27 12:51:09 +01:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Sergio De la torre	0b5ef35d22	feat: refs #8213 refs#8213 picker ItemShelvingSale	2024-11-25 16:16:47 +01:00
Jorge Penadés	584287b211	fix: refs #7229 update default environment	2024-11-25 14:20:15 +01:00
Jorge Penadés	a68d7e8c0b	fix: refs #7229 rollback	2024-11-25 14:15:10 +01:00
Jorge Penadés	9da5b4ecda	fix: refs #7229 update default environment	2024-11-25 14:05:12 +01:00
Guillermo Bonet	46c85d44d6	Merge branch 'test' into dev	2024-11-22 09:12:23 +01:00
Guillermo Bonet	a731bb3a45	Merge branch 'master' into test	2024-11-22 09:11:29 +01:00
Sergio De la torre	5ac255ac52	fix: refs #7855 refs#7855 isCheckedDeleted	2024-11-21 16:27:45 +01:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Guillermo Bonet	d302a9c3ba	Merge branch 'master' into test	2024-11-20 12:17:30 +01:00
Guillermo Bonet	a4b568e9b8	fix: refs #8191 Deleted msg send rocket in getSales.js	2024-11-20 12:03:30 +01:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Sergio De la torre	8840d57041	Merge branch 'master' into 6861-ItemShelvingSalesgetTickets	2024-11-19 05:55:54 +00:00
Guillermo Bonet	2b97c18412	Merge branch 'dev' into 6869-createGetDetails	2024-11-18 08:34:11 +00:00
Ivan Mas	2a1c0ef2af	Merge branch 'dev' into 7690-renameConfigTables	2024-11-15 13:35:14 +00:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Jorge Penadés	86c95e185c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 16:32:40 +01:00
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +01:00
Jorge Penadés	c8ab5d4344	fix: refs #6818 add defaultChannel	2024-11-14 11:16:45 +01:00
Guillermo Bonet	9d5ef3eeb0	Merge branch 'dev' into 7920-itemShelving	2024-11-13 10:16:57 +00:00
Guillermo Bonet	b3bf0024e3	refactor: refs #7920 Major changes	2024-11-13 11:15:31 +01:00
Pablo Natek	274a365ec0	feat: refs #6403 add debug on cancel shipment	2024-11-13 11:03:57 +01:00
Ivan Mas	20bd426704	refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig	2024-11-12 17:25:05 +01:00
Sergio De la torre	3a8c37aef8	fix: refs #6861 refs#6861 getTickets	2024-11-12 11:59:51 +01:00
Jorge Penadés	a41fc36f90	feat: refs #6869 define model	2024-11-11 13:02:09 +01:00
Jorge Penadés	6ef1f950d1	feat: refs #6818 add config table	2024-11-08 17:47:10 +01:00
Jorge Penadés	6927f4b28d	feat: refs #6818 saysimple integration	2024-11-08 11:51:00 +01:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Guillermo Bonet	93494c3eb0	refactor: refs #7811 Deleted pm2	2024-10-18 08:02:06 +02:00
Alex Moreno	d93653372a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-18 07:12:18 +02:00
Alex Moreno	08e22db950	Merge pull request 'master' (!3125) from master into test ... Reviewed-on: #3125 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 05:09:32 +00:00
Guillermo Bonet	a188efb1e3	refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile	2024-10-17 11:45:13 +02:00
Alex Moreno	c355fcfece	test(docuware_core): refs #8066 adapt	2024-10-16 09:03:47 +02:00
Alex Moreno	ccaec1a2cf	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth	2024-10-16 08:41:50 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Sergio De la torre	a989bef78c	Merge pull request 'master' (!3108) from master into test ... Reviewed-on: #3108 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-16 06:16:36 +00:00
Sergio De la torre	b592ccc162	fix: refs #6861 getTickets	2024-10-15 17:01:09 +02:00
Alex Moreno	b1b36a33a0	chore(docuware_core): refs #8066 add returns	2024-10-15 09:47:39 +02:00
Alex Moreno	63f062a069	fix(renewToken): refs #8093 test & fix(sql) addClientObservationType	2024-10-15 08:19:35 +02:00
Alex Moreno	5b938a6f78	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 08:00:39 +02:00
Alex Moreno	3c881d5e48	refactor(docuware): refs #8066 use Authorization	2024-10-15 08:00:19 +02:00
Alex Moreno	9695fea48f	feat(Docuware): refs #8066 add username and password	2024-10-08 12:05:19 +02:00
Sergio De la torre	d164cccee5	fix: refs #6861 assignCollection	2024-10-07 16:14:16 +02:00