6890 Commits

Author	SHA1	Message	Date
Alex Moreno	69bf26433d	fix(workerLog): acl to hr	2023-06-01 13:19:34 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Carlos Satorres	0ee8811c15	refs #5398 fix agencies, warehouses	2023-06-01 07:52:21 +02:00
Carlos Satorres	967e07933d	refs #5398 fix	2023-05-31 14:46:19 +02:00
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Alexandre Riera	eeadd72cc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-05-31 09:53:56 +02:00
Alex Moreno	6d23ef5d1e	Merge branch 'master' into 5153---business-type-worker-descriptor	2023-05-31 05:04:57 +00:00
Juan Ferrer	a4d7988591	refs #5517 Translations fixes	2023-05-30 19:39:11 +02:00
Carlos Satorres	d6c588d7eb	Merge branch 'dev' into 5398-fixErrorWarehouses	2023-05-30 14:02:54 +00:00
Carlos Satorres	2c3869d961	refs #5398 capital letters	2023-05-30 15:48:09 +02:00
Alexandre Riera	576a5f050e	refs #5513 fix back test	2023-05-30 13:48:56 +02:00
Alexandre Riera	c0c522c619	Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-30 13:47:11 +02:00
Alexandre Riera	1fd51c191f	refs #5513 minor fixes	2023-05-30 13:47:09 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Alexandre Riera	060b2fdf50	Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-30 11:34:55 +02:00
Alexandre Riera	138f03d891	refs #5137 fix back test	2023-05-30 11:34:53 +02:00
Alexandre Riera	32bdaa640e	Merge branch 'dev' into 5137-aviso-impresora	2023-05-30 09:30:34 +00:00
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +02:00
Alexandre Riera	632662c440	refs #5595 added userId in makeInvoice	2023-05-30 10:49:10 +02:00
Alexandre Riera	e05d3b0793	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-05-30 08:27:35 +00:00
Alexandre Riera	153542d2be	refs #5595 taking active connection	2023-05-30 09:49:39 +02:00
Carlos Satorres	cb664ecec4	Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket	2023-05-30 09:18:57 +02:00
Carlos Satorres	ec5a5be9e6	refs #5328 remove spaces	2023-05-30 09:18:52 +02:00
Carlos Satorres	3872078507	Merge branch 'dev' into 5328-abonarTodoTicket	2023-05-30 07:16:38 +00:00
Vicent Llopis	27700bd72c	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-30 06:14:48 +00:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02:00
Vicent Llopis	d2355412a0	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 08:59:20 +00:00
Carlos Satorres	41b1b2fb3f	fix >	2023-05-29 10:02:21 +02:00
Carlos Satorres	b797f747f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX	2023-05-29 10:00:33 +02:00
Pablo Natek	a232e9ecea	refs #5153	2023-05-29 09:26:36 +02:00
Vicent Llopis	d313517e14	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 07:24:28 +00:00
Carlos Satorres	1593b4b626	Merge branch 'dev' into 5398-Agencys&WarehousesData	2023-05-29 07:09:08 +00:00
Carlos Satorres	95c438b73a	refs #5648 move claimSure	2023-05-26 14:52:47 +02:00
Vicent Llopis	3ecfbe2052	refs #5252 refactor: creadas varaibles	2023-05-26 12:03:36 +02:00
Vicent Llopis	9e8efff016	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-05-26 11:55:32 +02:00
Carlos Satorres	8adc104cf4	refs #5735 fix currency	2023-05-26 08:39:58 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Juan Ferrer	27d4d10472	refs #5667 Expedition translation fixes	2023-05-25 18:32:03 +02:00
Juan Ferrer	2e0721b101	refs #5667 Fixes: Id filter, translations	2023-05-25 18:22:46 +02:00
Vicent Llopis	71d8a355bd	refs #5252 fix: te2e	2023-05-25 15:03:22 +02:00
Vicent Llopis	96feb24f12	refs #5252 fix: back test	2023-05-25 13:28:44 +02:00
Alexandre Riera	a584e1ab5e	Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos	2023-05-25 11:22:51 +00:00
Vicent Llopis	ce211b436d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-05-25 13:00:11 +02:00
Carlos Satorres	fa8fd8d5bc	refs #5398 update from oldbranch	2023-05-25 11:41:14 +02:00
Alex Moreno	dd83b25bb2	Merge branch 'master' into hotfix-item_getBalance	2023-05-25 09:37:38 +00:00
Alexandre Riera	dfac44a87b	hotfix 3rd parameter to null	2023-05-25 11:35:25 +02:00
Carlos Satorres	d82a7eeeb7	Merge branch 'dev' into 5328-abonarTodoTicket	2023-05-25 08:25:47 +00:00
Alex Moreno	a0da78700b	Merge branch 'dev' into 5678-sale-canEdit-notSale	2023-05-25 07:49:40 +00:00
Alex Moreno	37a3275b27	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-25 08:56:10 +02:00
Carlos Satorres	1f24314ab2	refs #5635 fix back	2023-05-25 08:24:01 +02:00
Alex Moreno	0e6501f306	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master	2023-05-25 07:42:58 +02:00
Alex Moreno	e19ece6119	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale	2023-05-25 07:34:54 +02:00
Alex Moreno	42a39b6778	refs #5706 master to test	2023-05-25 07:22:56 +02:00
Alex Moreno	03e2b98485	hotFix(closeAll): fix where	2023-05-24 15:50:59 +02:00
Alexandre Riera	de313b6418	refs #3628 Show what's before the inventory	2023-05-24 13:40:26 +02:00
Alexandre Riera	74ba21b1b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 13:39:01 +02:00
Alexandre Riera	087fa137fd	Merge branch 'dev' into 5677-fallo-saveSign	2023-05-24 11:14:17 +00:00
Alex Moreno	6b66eb3bb2	refs #5679 typo	2023-05-24 12:59:58 +02:00
Carlos Satorres	d6d72ed289	refs #5635 smart-table, counter, filter	2023-05-24 12:35:07 +02:00
Alexandre Riera	49bd9c35b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 12:19:45 +02:00
Alexandre Riera	133c5dbca5	Merge branch 'dev' into 5677-fallo-saveSign	2023-05-24 10:18:26 +00:00
Alexandre Riera	05fb0a7203	refs #5677 tickets without state fixed	2023-05-24 12:16:19 +02:00
Alex Moreno	30c896c975	refs #5678 feat(sale_canEdit): handle exist sale	2023-05-24 11:20:07 +02:00
Carlos Satorres	9b363bc7a4	refs #5635 remove vn, smart-table	2023-05-24 10:57:51 +02:00
Carlos Satorres	1bd54765f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition	2023-05-24 10:05:38 +02:00
Carlos Satorres	a99b7cd4f1	Merge branch 'dev' into 5297-newWorker_iban_not_required	2023-05-24 08:02:33 +00:00
Carlos Satorres	6294fc0435	refs #5297 back&e2e fix changes	2023-05-24 10:02:02 +02:00
Carlos Satorres	6cf2c38927	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:59:04 +00:00
Carlos Satorres	bb39724718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-24 08:09:44 +02:00
Carlos Satorres	e46caffe96	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-24 06:05:44 +00:00
Vicent Llopis	3caef0c135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-05-24 07:46:08 +02:00
Vicent Llopis	1ddad7a5ec	Merge branch 'dev' into 5609-ticket.index_searchByFilter	2023-05-24 05:45:04 +00:00
Alex Moreno	6a6d28efa0	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-24 05:40:11 +00:00
Alexandre Riera	97653d9b8f	Merge branch 'dev' into 5581-transferir-lineas	2023-05-24 05:07:33 +00:00
Alex Moreno	c35e2e155f	refs #5472 test(changePassword): back	2023-05-23 15:12:28 +02:00
Vicent Llopis	3119ae4471	refs #5609 delete: console.log	2023-05-23 15:12:20 +02:00
Vicent Llopis	2c7473b064	refs #5252 feat: permite crear un abono con o sin almacén	2023-05-23 15:06:38 +02:00
Carlos Satorres	0dda7791f6	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-23 12:51:10 +00:00
Carlos Satorres	af1f92613f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-23 13:57:11 +02:00
Vicent Llopis	0ab411ddc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter	2023-05-23 13:45:03 +02:00
Carlos Satorres	4f5bd95d21	refs #5639 order	2023-05-23 13:23:46 +02:00
Carlos Satorres	e2bea16e68	refs #5639 select country, paymethod	2023-05-23 12:31:02 +02:00
Carlos Satorres	db7d3b6868	refs #5639 payMethodFk	2023-05-23 11:32:26 +02:00
Carlos Satorres	7fd2927ec9	refs #5639 smart-table country	2023-05-23 11:26:31 +02:00
Carlos Satorres	84abba5566	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:38:01 +00:00
Alex Moreno	9500e99b86	Merge branch 'dev' into 5579-fix-order	2023-05-23 07:17:25 +00:00
Alex Moreno	53e55de605	refs #5579 fix(route_index): order	2023-05-23 09:15:31 +02:00
Carlos Satorres	d7d94796d6	Merge branch 'dev' into 5599-ticketColors	2023-05-23 07:13:47 +00:00
Carlos Satorres	0c673e43bc	refs #5639 smart-tabla defaulter	2023-05-23 09:02:05 +02:00
Alexandre Riera	bf8d82f3c6	refs #5581 refresh model	2023-05-23 08:43:31 +02:00
Carlos Satorres	ee8685329f	Merge branch 'dev' into 5599-ticketColors	2023-05-23 06:23:19 +00:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Carlos Satorres	8ee581eb67	Merge branch 'dev' into 5648-sureClaim	2023-05-23 06:02:17 +00:00
Alexandre Riera	b9f6dc0a39	Merge branch 'dev' into 5581-transferir-lineas	2023-05-23 05:54:12 +00:00
Alexandre Riera	0e11bfab0b	refs #5581 ticketId != id	2023-05-23 07:53:25 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Carlos Satorres	3994e65040	refs #5648 spaces fix2	2023-05-22 15:56:14 +02:00
Carlos Satorres	a7c59f51b9	Merge branch 'dev' into 5599-ticketColors	2023-05-22 13:51:35 +00:00