7762 Commits

Author	SHA1	Message	Date
Javier Segarra	13720291b2	refs #6434 perf: remove unique in token column	2023-11-15 15:18:02 +01:00
Alex Moreno	ac3d23579a	Merge branch 'master' into 6434-signInLog_issue_MASTER	2023-11-15 13:50:21 +00:00
Carlos Satorres	5b587b3449	Merge branch 'master' into hotfix-ticketAddresFk	2023-11-15 12:56:45 +00:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01:00
Alex Moreno	89967b8538	fix(workerDescriptor): show account button	2023-11-15 13:16:31 +01:00
Carlos Satorres	f3faf37e1a	hotfix addressFk	2023-11-14 12:34:00 +01:00
Carlos Satorres	a1c8bba4a5	hotfix addressId	2023-11-10 11:29:18 +01:00
Juan Ferrer	99c88e6f5d	fix: refs #6390 Loggable set as base for ItemShelving	2023-11-05 09:33:18 +01:00
Sergio De la torre	728838334c	hotFix_6312 fix originalQuantity	2023-11-02 14:42:22 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Alex Moreno	55d80458cc	refs #6065 warmFix(workerTimeControl): set date	2023-10-26 14:37:42 +02:00
Alex Moreno	013b010c22	refs #6278 test(itemRequest): fix e2e, correct selector	2023-10-26 07:56:57 +02: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
Alex Moreno	5442476f05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 10:35:11 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +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
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
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
Pablo Natek	25c13e42ab	Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter	2023-10-20 11:36:24 +02:00
Pablo Natek	243a32dff5	remove(expand): quito expand de la columna requester refs #6278	2023-10-20 11:36:11 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	84aed7ca21	refs #6257 fix(saleQuantity): newPrice correct restricction	2023-10-20 09:26:56 +02:00
Alex Moreno	d5f98700e7	refs #6287 fix: ticket new correct return type	2023-10-20 08:32:35 +02:00
Pablo Natek	9cb4e57951	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 05:31:12 +00:00
Pablo Natek	dc93328bcf	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-19 18:24:04 +02:00
Pablo Natek	07fa011035	fix(updateClaim): el spec daba error refs #5979	2023-10-19 18:24:03 +02:00
Pablo Natek	dad67539c5	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 16:23:34 +00:00
Carlos Andrés	16f20cea70	refs #6199 fix(sale): get minim price without grouping	2023-10-19 15:12:06 +02:00
Pablo Natek	f26595bb62	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 12:15:43 +00:00
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +00:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Pablo Natek	71182d8630	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:49:31 +00:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Juan Ferrer	39a0f13500	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:14:29 +00:00
Guillermo Bonet	1b8f227c47	ticket #125321 filter advance tickets fix	2023-10-19 11:58:15 +02:00
Pablo Natek	e2f7ce8b35	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 08:58:50 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00