17691 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	175e73e565	fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit	2023-11-02 14:05:14 +01:00
Jorge Penadés	d2468033ea	Merge pull request '5216-addExpeditionState' (!1815) from 5216-addExpeditionState into dev ... Reviewed-on: #1815 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-30 12:52:21 +00:00
Jorge Penadés	f250c084f7	ref #5216 refactor expeditionState BeforeInsert	2023-10-30 09:11:52 +01:00
Jorge Penadés	ab0640291b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState	2023-10-30 08:25:41 +01:00
Sergio De la torre	ada308bcb6	Merge pull request 'refs #5134 fix: model ExpeditionScan' (!1814) from 5134-ModelsSalixs into dev ... Reviewed-on: #1814 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-30 06:28:21 +00:00
Sergio De la torre	7ae12327f5	refs #5134 fix: model ExpeditionScan	2023-10-27 16:16:22 +02:00
Jorge Penadés	7fe0641817	Merge pull request '5914-transferInvoiceOut' (!1761) from 5914-transferInvoiceOut into dev ... Reviewed-on: #1761 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-26 12:39:07 +00:00
Jorge Penadés	e0b4ac733e	ref #5914 move changes	2023-10-26 09:30:48 +02:00
Jorge Penadés	56c431888f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 09:29:13 +02:00
Alex Moreno	cecdf8633c	refs #6350 deploy: init version 23.46	2023-10-26 09:27:32 +02:00
Jorge Penadés	3a1227bdc2	ref #5914 fix ticketrefund	2023-10-26 09:20:25 +02:00
Jorge Penadés	da2bc416f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 08:26:35 +02:00
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	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
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
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
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