2388 Commits

Author	SHA1	Message	Date
Pablo Natek	2d3ee4a16e	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-02 13:05:31 +00:00
Pablo Natek	175e73e565	fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit	2023-11-02 14:05:14 +01:00
Alex Moreno	740d2fb976	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-02 08:48:03 +01:00
Carlos Andrés	8c1ff26de7	Merge branch 'dev' into 5637-saleGroupLog	2023-10-31 11:12:40 +00:00
Robert Ferrús	6112c7ba5f	refs #5637 saleGroup traducciones	2023-10-31 09:59:34 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Alex Moreno	37dce99447	refs #6335 test(ticketAdvance): add test to keep price	2023-10-30 15:00:05 +01:00
Pablo Natek	e504ad313c	remove(console.log): refs #4131 quitar console log	2023-10-30 14:56:33 +01:00
Alex Moreno	a80715583c	refs #6335 feat(ticketAdvance): change the date if you can	2023-10-30 14:16:25 +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
Alex Moreno	bd8cc897c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-30 07:21:31 +01:00
Pablo Natek	14753212bb	fix(saveSign): refs #4131 remove call state on saveSign	2023-10-27 18:07:17 +02:00
Pablo Natek	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Sergio De la torre	7ae12327f5	refs #5134 fix: model ExpeditionScan	2023-10-27 16:16:22 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	42bbdf9814	feat(ticket.state): refs #4131 convert changeState to State	2023-10-27 13:41:32 +02:00
Pablo Natek	524ac4d99d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges	2023-10-26 22:16:06 +02:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00: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	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +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
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	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	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +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
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +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
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	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
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +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
Guillermo Bonet	1b8f227c47	ticket #125321 filter advance tickets fix	2023-10-19 11:58:15 +02:00
Jorge Penadés	e680a6a080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 10:00:43 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	daaf076133	Merge branch 'dev' into 6312	2023-10-19 05:29:43 +00:00
Alex Moreno	da20697052	refs #6199 feat(sale_updateQuantity): can upload	2023-10-18 15:19:26 +02:00
Javi Gallego	44ce0a8730	refs #6312 no inserta el originalquantity	2023-10-18 13:46:41 +02:00
Jorge Penadés	62d2c7e701	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-18 13:42:15 +02:00
Pablo Natek	44bc30adf7	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-18 10:35:53 +00:00
Pablo Natek	2bb4300e1b	remove: se quita el console log refs #6278	2023-10-18 12:35:45 +02:00
Pablo Natek	5f49a4fe1d	fix: created -> shipped refs #6266	2023-10-18 12:25:47 +02:00
Pablo Natek	1920a1b893	merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266	2023-10-18 12:23:23 +02:00
Alex Moreno	a84f6fe1da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-18 12:05:04 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Jorge Penadés	ab6c58cd12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-16 08:18:00 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Jorge Penadés	9ba3c9c8bc	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:17:12 +00:00
Jorge Penadés	6b8a6c7a69	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:15:04 +00:00
Javi Gallego	0081c55b9e	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-13 10:56:33 +00:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Javi Gallego	df9d6fd6f8	efectue con acento	2023-10-11 14:06:28 +02:00
Carlos Satorres	0023561acb	refs #6293 traducción	2023-10-11 12:04:12 +02:00
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Carlos Satorres	1adfa33a9a	hotfix length sales	2023-10-06 14:52:30 +02:00
Carlos Satorres	62c7dc9db5	hotfix-change minus	2023-10-06 06:16:42 +02:00
Pablo Natek	f40185c2d4	refs #4764 hotfix	2023-10-05 14:24:52 +02:00
Alex Moreno	7a6022efd4	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-05 06:31:54 +00:00
Jorge Penadés	0d39471970	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-05 08:20:47 +02:00
Alex Moreno	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00
Alex Moreno	7cd2e290ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-05 07:22:41 +02:00
Pablo Natek	99d65804e8	refs #6278 fixFilter	2023-10-02 13:29:39 +02:00
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02:00
Alex Moreno	b33700abc9	refs #6216 feat(ticket_sale): open filtered ticketLog	2023-09-29 11:57:25 +02:00
Jorge Penadés	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Pablo Natek	0fa56149d7	refs #6266 smsfix	2023-09-29 09:47:22 +02:00
Alex Moreno	542119983b	refs #5929 test: fix test after fix ticket_isEditable	2023-09-29 09:28:23 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Alex Moreno	f3c55cdee9	refs #5929 fix(isEditable): can edit if is weekly	2023-09-28 16:00:09 +02:00
Jorge Penadés	4b213c1c9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-28 13:31:45 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Sergio De la torre	2ea2943eca	refs #5134 feat: models	2023-09-26 13:12:18 +02:00
Jorge Penadés	e1e225a1ef	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-26 12:42:47 +02:00
Jorge Penadés	50543963c1	ref #5914 refactor createTicketRefund	2023-09-26 12:42:45 +02:00
Jorge Penadés	45fbe6f174	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-26 06:36:44 +00:00
Jorge Penadés	db8dc8487b	ref #6246 replace name	2023-09-25 15:28:08 +02:00
Jorge Penadés	474399b383	ref #5914 refactor	2023-09-25 15:23:51 +02:00