1178 Commits

Author	SHA1	Message	Date
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
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	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
Alex Moreno	6a6d28efa0	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-24 05:40:11 +00:00
Vicent Llopis	2c7473b064	refs #5252 feat: permite crear un abono con o sin almacén	2023-05-23 15:06:38 +02: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
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
Juan Ferrer	69b892f2fd	refs #5667 Translations	2023-05-20 16:59:39 +02:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Vicent Llopis	8cf988b7d2	refs #5638 refactor: code	2023-05-19 08:02:17 +02:00
Vicent Llopis	d33a84c39f	refs #5638 feat: updated backTest	2023-05-18 09:30:21 +02:00
Vicent Llopis	463d209d77	refs #5638 refactor: eliminado if innecesario	2023-05-18 09:21:30 +02:00
Vicent Llopis	9263684ec5	refs #5638 fix: contempla que se le pase un filtro del 'nombre'	2023-05-18 08:58:13 +02:00
Vicent Llopis	b66362d313	refs #5638 fix: cambiado nombre de variable	2023-05-18 08:33:17 +02:00
Alex Moreno	2ef922e80c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-18 08:10:10 +02:00
Vicent Llopis	a9f71ccbc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states	2023-05-18 07:33:08 +02:00
Alex Moreno	ba763abc26	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev	2023-05-18 07:17:31 +02:00
Juan Ferrer	48da4b13ff	refs #5667 Ticket translation fixes	2023-05-17 17:08:20 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Alexandre Riera	0d980334b8	refs #5634 conditional merge	2023-05-17 12:41:00 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	ece2875b38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket	2023-05-12 12:30:34 +02:00
Alex Moreno	7704256079	master to test	2023-05-11 08:00:49 +02:00
Vicent Llopis	461966d73e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-09 11:33:28 +02:00
Carlos Satorres	202544565e	refs #4764 mod query post	2023-05-08 11:36:52 +02:00
Carlos Satorres	3d195bddb9	refs #4764 mod model post	2023-05-05 14:39:46 +02:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Alex Moreno	97da5e6e24	refs #5488 feat(isRoleAdvanced): use Acl instead of method	2023-05-05 13:58:11 +02:00
Carlos Satorres	80ee73a59b	refs #4764 creacion de métodos y back	2023-05-05 10:01:15 +02:00
Vicent Llopis	404acdab6f	refs #5638 fix: solucionado problema con el limit	2023-05-04 14:51:47 +02:00
Alexandre Riera	54eb0fc7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-05-04 09:59:05 +02:00
Alexandre Riera	ad3c6dcee2	wip #5595	2023-05-03 14:34:36 +02:00
Carlos Satorres	dbd0e5138b	refs #5328 fix	2023-05-03 14:12:26 +02:00
Carlos Satorres	3ac1ce403c	refs #5328 myOptions	2023-05-03 14:06:57 +02:00
Carlos Satorres	566f03c497	refs #5328 commit prueba	2023-05-03 13:03:14 +02:00
Carlos Satorres	3b2e1ca8d5	ref #5328 refundTicket.id	2023-05-03 12:36:30 +02:00
Carlos Satorres	eaf425fb51	refs #5328 mod funcion createTicketRefund	2023-05-03 12:30:33 +02:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Juan Ferrer	2cfd2d9dda	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-27 18:13:24 +02:00
Alexandre Riera	3bd5582794	Merge branch 'dev' into 5255-revisar-ticketBoxing	2023-04-27 08:42:21 +00:00
Vicent Llopis	2d181139b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-04-26 14:58:34 +02:00
Vicent Llopis	22b223038a	delete focus	2023-04-26 14:56:07 +02:00
Vicent Llopis	8bb8b8cfba	refs #5594 fix backTest	2023-04-26 14:55:37 +02:00
Vicent Llopis	09dbd29086	refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados	2023-04-26 14:46:16 +02:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Alexandre Riera	1219cfcc5c	refs #5255 fixed condition	2023-04-26 12:03:17 +02:00
Alex Moreno	28ead70615	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-25 14:17:46 +02:00
Alex Moreno	0c668c6ade	refs #5488 feat(): replace all hasRole to checkAccessAcl	2023-04-25 14:17:36 +02:00
Alex Moreno	11d1900859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-25 09:40:36 +02:00
Alex Moreno	4cb231759f	feat(State/Supplier): replace hasRole to acls	2023-04-25 09:15:05 +02:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Vicent Llopis	4983aa1632	refs #5542 fix backTest	2023-04-24 09:11:09 +02:00
Vicent Llopis	9b432bac85	refs #5542 fix: test	2023-04-24 08:57:10 +02:00
Vicent Llopis	bf558761a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-24 08:45:56 +02:00
Alexandre Riera	0a1583aa54	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-24 08:42:32 +02:00
Alexandre Riera	bbf1c40987	Merge branch 'master' into hotfix-dms-hasFile	2023-04-21 12:48:06 +00:00
Alexandre Riera	2975e7fae3	hotfix savesign	2023-04-21 14:46:46 +02:00
Vicent Llopis	38e5660e61	refs #5542 refactorizado "abono" para que siempre cree un único ticket abono	2023-04-21 13:59:28 +02:00
Alex Moreno	294bf2b8a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:30:34 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Vicent Llopis	5af961ac69	fix: maneja si se elimina la sale	2023-04-21 09:53:21 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Alex Moreno	bde81e685f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-19 07:55:46 +02:00
Alex Moreno	db19f153fb	refs #5488 removes 'role =='	2023-04-18 15:03:23 +02:00
Vicent Llopis	d99815356a	refs #5144 manejado que el usuario sea NULL	2023-04-18 07:26:35 +02:00
Alex Moreno	0c475be10b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice	2023-04-17 14:23:02 +02:00
Joan Sanchez	3ee29553b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 09:00:52 +02:00
Joan Sanchez	610f51aaf8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-17 08:59:49 +02:00
Joan Sanchez	02c573bd23	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 08:57:24 +02:00
Alex Moreno	0bfdbcb750	refs #4617 use temporary instead of vn	2023-04-17 08:44:24 +02:00
Joan Sanchez	51e42e485b	Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev ... Reviewed-on: #1372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 06:44:17 +00:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Juan Ferrer	b4ef49cf24	Merge branch 'dev' into 5546-codigo-registro	2023-04-13 16:48:11 +00:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00
Joan Sanchez	6d5167ab7f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-13 13:47:18 +02:00
Carlos Satorres	44eab101cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo	2023-04-13 08:44:56 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Carlos Satorres	8741a9f913	Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra	2023-04-05 06:51:21 +00:00
Joan Sanchez	ca30aaa18a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-04-05 08:39:43 +02:00
Carlos Satorres	77b91b77b2	refs #5439 requesterFk solve	2023-04-05 08:19:50 +02:00
Carlos Andrés	0372d44415	fixes #5529 Fixes: missing awaits, buffer-to-file	2023-04-04 15:00:28 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Joan Sanchez	7b5e0bae8e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 08:20:33 +01:00
Alexandre Riera	60eabbf7a0	Merge branch 'test' into hotfix-added-grabUser-logs	2023-03-22 10:37:57 +00:00
Alexandre Riera	81472a5e50	removed duplicated log	2023-03-22 11:36:28 +01:00
Alexandre Riera	59c3ef23de	grabUser added	2023-03-22 11:03:13 +01:00
Alexandre Riera	668fa73386	refs #4632 deleted return in definition	2023-03-16 10:32:00 +01:00
Alexandre Riera	60162fe71f	refs #4632 removed return	2023-03-16 10:30:53 +01:00
Alexandre Riera	c0094d8047	Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-16 09:07:21 +01:00
Alexandre Riera	a0be5c50fc	refs #4632 changed packed from boxed	2023-03-16 09:07:19 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Alexandre Riera	6e2269b428	refs #4632 removed alert level id from code	2023-03-16 09:04:57 +01:00
Alexandre Riera	a99bd2577a	refs #4632 changed route from TicketDms to Ticket	2023-03-16 08:24:34 +01:00
Alexandre Riera	387576d63a	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-16 06:42:39 +00:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Alexandre Riera	7c3c3a2d66	refs #4632 added userError	2023-03-09 08:31:38 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Alexandre Riera	06dd72f30c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-08 12:13:48 +01:00
Carlos Satorres	955e55a7f4	refs #5284 new onCreateClaimAccepted y createClaim	2023-03-07 15:43:48 +01:00
Alexandre Riera	59a3ff0f7b	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-07 12:10:24 +00:00
Alexandre Riera	21c7b18de9	refs #5036 make logs/querys only when grabUser is disabled	2023-03-07 13:10:02 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Joan Sanchez	32b3284e40	Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev ... Reviewed-on: #1344 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:20 +00:00
Joan Sanchez	84dc95621d	Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev ... Reviewed-on: #1348 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:30:17 +00:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	76cd2d160e	Merge branch 'dev' into 5036-regularizar-historicos	2023-02-27 06:05:21 +00:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +01:00
Alexandre Riera	6590c6f1fa	refs #5036 transferSales also transfer sale's logs	2023-02-24 08:55:04 +01:00
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00
Alexandre Riera	42b8f08a4d	refs #5168 checked sales with logs	2023-02-22 12:14:17 +01:00
Alexandre Riera	be8d19a9f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-22 09:27:38 +01:00
Joan Sanchez	4c2878e232	Updated unit tests	2023-02-21 09:48:47 +01:00
Vicent Llopis	26d72a7b3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-20 11:49:17 +01:00
Alexandre Riera	77066b2005	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-20 09:20:30 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	a5a0256e44	feat: añadido parametro que indica si genera uno o multiples ticket de abono	2023-02-14 10:58:41 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00
Alexandre Riera	76ed4d2d4b	refs #5194 fixed tests	2023-02-13 10:16:28 +01:00
Vicent Llopis	4da8546bdf	Merge branch 'dev' into 2952-ticket.sale-tracking_part2	2023-02-13 07:14:28 +00:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	9dc07d88d6	fixing e2e	2023-02-10 08:56:30 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Alexandre Riera	4413c8828b	refs #5152 added confirmation popup	2023-02-08 10:54:21 +01:00
Pau	86e6672e49	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-07 13:39:36 +00:00
Vicent Llopis	2e8aabab14	fix: type relation in models	2023-02-06 14:32:54 +01:00
Vicent Llopis	a2f93e68b1	feat: add 'parking' column	2023-02-06 13:57:04 +01:00
Alexandre Riera	0c91f95762	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-03 12:03:16 +01:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Joan Sanchez	eded1ebf20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 11:42:48 +01:00
Alexandre Riera	5f656a894f	buscador	2023-02-02 08:52:38 +01:00
Joan Sanchez	7a700de5c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 08:23:17 +01:00
Pau	dcd74bacc0	refs #5181 @1h30	2023-02-01 08:32:22 +01:00
Alexandre Riera	349829e5ed	refs #5131 fixed tests	2023-01-31 15:29:00 +01:00
Pau	5c0354bc17	add method to check if the ticket has refunds	2023-01-31 14:26:57 +01:00
Alexandre Riera	e5b7ebd8b4	refs #5131 IPT null or value	2023-01-31 13:06:58 +01:00
Alexandre Riera	331b278726	refs #5131 checkbox pending origin destination	2023-01-31 13:00:25 +01:00
Alexandre Riera	7d617c0ac4	refs #5129 translations and userErrors added	2023-01-31 09:04:45 +01:00
Alex Moreno	d2b21d401a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:27:22 +01:00
Joan Sanchez	8969882793	Removed where property dependency	2023-01-30 14:13:38 +01:00
Robert Ferrús	7614b48c9a	refs #5115 transfer_sales	2023-01-30 11:44:14 +01:00
Joan Sanchez	9bf4cd5cff	Merge branch 'dev' into 4480-vnUser	2023-01-27 08:20:32 +00:00
Alexandre Riera	d69b204c4c	refs #5036 loggable refactored, tests fixed	2023-01-26 15:49:30 +01:00
Alexandre Riera	b72cce9d06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-01-25 08:56:07 +01:00
Alex Moreno	1f52d04d4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-24 15:01:26 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Vicent Llopis	9523991b04	fix: mostrar descriptor worker en vez de item	2023-01-20 12:45:02 +01:00
Vicent Llopis	b1be6addd1	fix: delete unnecessary code	2023-01-20 12:16:06 +01:00
Alexandre Riera	2b7383af74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-01-17 10:11:19 +01:00
Pau	3a1aea2afd	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-17 09:01:45 +00:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alexandre Riera	4d12e29b3d	refs #5061 fix filter	2023-01-16 14:24:53 +01:00
Alexandre Riera	b78bebf27c	refs #5061 added hour in date, changed ipt filter	2023-01-16 12:22:22 +01:00
Pau	34508425a9	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-16 07:08:19 +00:00
Pau	05dfcfd864	Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake	2023-01-13 15:42:02 +01:00
Pau	a8e4c9e1de	cambiar fks por relaciones	2023-01-13 15:42:00 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alexandre Riera	a0491de9f9	refs #5036 refactor transaction and fixing ticket logs	2023-01-11 13:24:55 +01:00
Pau	30524e382b	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-11 09:23:40 +00:00
Pau	4f2472ea90	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-10 13:56:15 +01:00
Pau	d540e278eb	refs #4605 @30min	2023-01-10 13:52:30 +01:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Joan Sanchez	93c98e05fc	fix(discount): handle error for a worker without business contract	2022-12-23 08:27:03 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	3a33750890	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-21 10:11:37 +01:00
Vicent Llopis	799c26796e	feat: añadidos chips	2022-12-20 15:19:05 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	4c6a735235	refs #4962 moved sql and methods to ticket	2022-12-20 11:53:54 +01:00