17870 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	83cff37422	refs #6350 fix: 00-dropWorkerCreate.sql	2023-10-26 08:23:18 +02:00
Alex Moreno	013b010c22	refs #6278 test(itemRequest): fix e2e, correct selector	2023-10-26 07:56:57 +02:00
Alex Moreno	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +02:00
Carlos Andrés	6e7b41fbfa	Merge pull request '4707-test-workerTimeControl' (!1813) from 4707-test-workerTimeControl into master ... Reviewed-on: #1813 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-25 09:16:04 +00:00
Carlos Andrés	acfec8681d	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-25 09:04:16 +00:00
Carlos Andrés	3906b9fd9c	Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-25 11:02:55 +02:00
Carlos Andrés	b461f63e2c	refs #4707 fix: correct sqlVersion	2023-10-25 11:02:53 +02:00
Carlos Andrés	3ba4e72359	Merge pull request 'refs #4707 fix: problemas fichadas y test' (!1808) from 4707-test-workerTimeControl into master ... Reviewed-on: #1808 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-25 08:54:37 +00:00
Alex Moreno	a501d577f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-25 09:23:00 +02:00
Alex Moreno	efa9f16452	fix: remove unnecessary UserError	2023-10-25 09:22:44 +02:00
Carlos Andrés	001d7cd574	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-24 15:03:38 +00:00
Carlos Andrés	800bbd74c8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-24 14:35:36 +02:00
Alex Moreno	9c689c194f	Merge pull request 'testToMaster' (!1812) from testToMaster into master ... Reviewed-on: #1812 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-10-24 12:25:51 +00:00
Alex Moreno	9865af8f81	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 14:20:02 +02:00
Alex Moreno	59aa738f38	Merge pull request 'fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version' (!1811) from warmFix_ticketAdvance_salesPerson into test ... Reviewed-on: #1811 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-24 12:11:14 +00:00
Alex Moreno	22fdcef7bb	fix(dockerFIle)! front debian version	2023-10-24 14:07:05 +02:00
Alex Moreno	589d7cbbb8	fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version	2023-10-24 12:02:21 +02:00
Jorge Penadés	9f141238bc	ref #5216 add userFk	2023-10-24 11:47:54 +02:00
Alex Moreno	5442476f05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 10:35:11 +02:00
Jorge Penadés	24b6dcc606	Merge pull request 'ref #5947 refactorWorkerCreate' (!1802) from 5947-refactorWorkerCreate into dev ... Reviewed-on: #1802 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-24 08:14:26 +00:00
Jorge Penadés	35bb949fcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 10:13:38 +02:00
Alex Moreno	201241e2dc	Merge pull request 'refs #6335 feat(ticketAdvance): add zone field' (!1810) from 6335_ticketAdvance_zone into test ... Reviewed-on: #1810 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-24 07:51:22 +00:00
Jorge Penadés	f1deeb69ca	ref #5914 add ticketrefund and fix text	2023-10-24 09:34:04 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Jorge Penadés	5529f08ce6	ref #5914 fix locale	2023-10-24 08:35:45 +02:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Carlos Andrés	2fa2e7f099	Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl	2023-10-23 16:58:58 +02:00
Carlos Andrés	4ff0bb94c0	refs #4707	2023-10-23 16:58:56 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	0055abc0a8	refs #4707 fix: problemas fichadas y test	2023-10-23 15:52:05 +02:00
Alex Moreno	483526c970	refs #6015 feat(executeRoutine): check db restrictions. test: add executeRoutine tests	2023-10-23 15:03:05 +02:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +02:00
Jorge Penadés	a630d28f07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 11:37:36 +02:00
Alex Moreno	26aaaff21c	Merge pull request '6199_hotFix_isReduction' (!1807) from 6199_hotFix_isReduction into master ... Reviewed-on: #1807 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-23 08:52:55 +00:00
Alex Moreno	ae27aa5b1e	fix: test to dev	2023-10-23 10:08:26 +02:00
Alex Moreno	247aa5af2a	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:52:06 +02:00
Alex Moreno	cf856a585b	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:50:00 +02:00
Jorge Penadés	1f0a57d320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 09:03:15 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Jorge Penadés	33656e9d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 08:21:32 +02:00
Alex Moreno	2edfacb91c	refs #5979 fix(sendCheckingPresence)!	2023-10-23 07:33:52 +02:00
Pablo Natek	59e91221cb	Merge pull request '5979-getAppOrigin' (!1799) from 5979-getAppOrigin into master ... Reviewed-on: #1799 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-23 05:06:41 +00:00
Pablo Natek	a87698d2ba	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-20 13:08:53 +02:00
Pablo Natek	4df39272d6	remove: appiclation config refs #5979	2023-10-20 13:08:39 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Pablo Natek	8597c23fb3	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-20 12:53:57 +02:00
Pablo Natek	5c69d9c7f0	fix: add await in async functions refs #5979	2023-10-20 12:53:54 +02:00
Pablo Natek	2a55adb8b8	Merge pull request 'refs #6278 fixFilter' (!1774) from 6278-ticketRequestFixFilter into dev ... Reviewed-on: #1774 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-20 10:45:03 +00:00
Alex Moreno	1eabad7f4b	refs #6257 fix(saleQuantity): add isInPreparing restriction	2023-10-20 12:37:44 +02:00
Pablo Natek	75cfea4a2e	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 10:18:43 +00:00