19283 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	be3e7bb8df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 10:01:21 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Jorge Penadés	e6eac54709	fix: refs #6703 tests & front	2024-01-31 09:59:32 +01:00
Juanjo Breso	18772c04f6	feat: refs #5167 update	2024-01-31 09:38:57 +01:00
Sergio De la torre	eb3d344957	Merge pull request '6186_deletePackingShelve' (!1975) from 6186_deletePackingShelve into dev ... Reviewed-on: #1975 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-31 08:35:07 +00:00
Sergio De la torre	0d438e7f4c	Merge branch 'dev' into 5802_setState	2024-01-31 08:18:57 +00:00
Guillermo Bonet	a47276c86a	Merge branch 'dev' into 6184-saveCmr	2024-01-31 08:17:47 +00:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Guillermo Bonet	7d045d6abe	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 08:05:22 +00:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Javi Gallego	a5e5a0d45d	feat: #6749 se mira la vida para buscar dias en el pasado	2024-01-31 09:03:08 +01:00
Juanjo Breso	aba0d97106	feat: refs#5167 Update	2024-01-31 09:00:43 +01:00
Sergio De la torre	a8b483078f	refs #6186 feat:deprecated packingShelve	2024-01-31 08:52:36 +01:00
Jorge Penadés	9e12bdf4e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 08:49:28 +01:00
Sergio De la torre	f88cef6745	refs #6186 feat:deprecated packingShelve	2024-01-31 08:45:52 +01:00
Alex Moreno	141c3d6f6e	Merge branch 'dev' into 6270-electronicInvoiceBack	2024-01-31 07:38:53 +00:00
Pablo Natek	3d2d406113	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4515-addBuyCheck	2024-01-31 07:42:23 +01:00
Sergio De la torre	4bf08ea147	refs #5890 feat:reserves	2024-01-31 07:23:46 +01:00
Pablo Natek	6a29e97fc6	Merge branch 'dev' into 6752-edi.ekt_scan-improved	2024-01-31 06:16:09 +00:00
Robert Ferrús	826c8ff682	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 06:04:30 +00:00
Juan Ferrer	bd1ac5f41e	build: refs #6706 hook test	2024-01-30 23:25:42 +01:00
Juan Ferrer	6d01164fb3	build: refs #6706 hook test	2024-01-30 23:25:14 +01:00
Juan Ferrer	827586ebd6	build: refs #6706 hook test	2024-01-30 23:14:51 +01:00
Juan Ferrer	2222926488	build: refs #6706 hook test	2024-01-30 23:13:40 +01:00
Juan Ferrer	825ee76797	build: refs #6706 hook test	2024-01-30 23:08:00 +01:00
Juan Ferrer	67db31e39b	build: refs #6706 hook test	2024-01-30 23:06:12 +01:00
Juan Ferrer	e4f62e4e06	build: refs #6706 hook test	2024-01-30 22:53:33 +01:00
Juan Ferrer	f6607f6533	build: refs #6706 hook test	2024-01-30 22:37:43 +01:00
Juan Ferrer	53ac10d0be	build: refs #6706 hook test	2024-01-30 22:33:55 +01:00
Juan Ferrer	7ab11543ed	build: refs #5483 Jenkinsfile optimized for daily DB push	2024-01-30 21:57:04 +01:00
Juan Ferrer	420398260f	fix: refs #5483 Jenkinsfile codefix	2024-01-30 21:49:58 +01:00
Juan Ferrer	4d065a2f79	fix: refs #5483 Jenkinsfile fixes, global nodejs tool	2024-01-30 21:37:20 +01:00
Juan Ferrer	4251f29a17	fix: refs #5483 compose fixes	2024-01-30 21:05:59 +01:00
Juan Ferrer	76545cd1ac	fix: refs #5483 Jenkinsfile & compose fixes	2024-01-30 20:58:15 +01:00
Juan Ferrer	29634e16e5	fix: refs #5483 Jenkinsfile fix	2024-01-30 20:44:33 +01:00
Juan Ferrer	027f7d2c1d	build: refs #5483 dev deploy, tag image with version	2024-01-30 20:41:24 +01:00
Juan Ferrer	7d2b5fbeda	build: refs #5483 Parallel install, code reorder	2024-01-30 20:04:32 +01:00
Juan Ferrer	1a64126655	build: refs #5483 Jenkinsfile parallel deploy	2024-01-30 19:51:30 +01:00
Juan Ferrer	3e0ebc0f26	fix: refs #5483 Jenkinsfile rocketchat fixes	2024-01-30 19:45:37 +01:00
Juan Ferrer	84961dda49	build: refs #5483 test workers increased to 6, test rocket notification	2024-01-30 19:41:09 +01:00
Juan Ferrer	095d6b4140	fix: refs #5483 Unused code removed	2024-01-30 19:35:23 +01:00
Juan Ferrer	17c9054155	fix: refs #5483 Jenkinsfile fixes	2024-01-30 19:30:26 +01:00
Juan Ferrer	624f61465a	fix: refs #5483 Jenkinsfile fixes	2024-01-30 19:05:55 +01:00
Juan Ferrer	12af757929	refs #5483 Jenkinsfile fix	2024-01-30 19:01:14 +01:00
Juan Ferrer	79f509ca46	fix: refs #5483 Jenkinsfile code fix	2024-01-30 18:54:41 +01:00
Juan Ferrer	56ac47dc16	build: refs #5483 send rocket message, skip steps when run source isn't git	2024-01-30 18:52:31 +01:00
Carlos Satorres	a6ea4ed048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:11 +01:00
Carlos Satorres	5d2f3d1a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack	2024-01-30 16:42:00 +01:00
Jorge Penadés	5690da0a18	fix: refs #6776 add userId	2024-01-30 16:05:56 +01:00