2825 Commits

Author	SHA1	Message	Date
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Alex Moreno	5d6eaca6b8	refs #5472 test(changePassword): e2e	2023-06-05 15:20:07 +02:00
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00:00
Vicent Llopis	b253ea8edf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-06-05 09:40:23 +02:00
Alexandre Riera	15b5f10a93	refs #5513 addFromBuy back added	2023-06-05 09:10:19 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Vicent Llopis	67413360c6	refs #5561 feat: utilizar métodos bd	2023-06-02 13:31:41 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alex Moreno	d02ee2fd12	deploy(232201)	2023-06-01 07:16:06 +02:00
Alex Moreno	4f3b6c3035	typo	2023-05-31 15:00:33 +02:00
Alex Moreno	0263d76021	refs #5701 update to mariadb 10.7.7	2023-05-31 14:58:16 +02:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Vicent Llopis	21448a84dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-30 10:16:34 +02:00
Vicent Llopis	7d59c6ec0c	refs #5468 feat: eliminado acl nativo y añadido a salix.ACL	2023-05-30 10:07:17 +02:00
Vicent Llopis	81a8f383aa	refs #5468 feat: no depender del modulo worker	2023-05-30 10:00:05 +02:00
Vicent Llopis	ea1c860a18	refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta	2023-05-30 09:13:47 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Carlos Satorres	3423ce612c	refs #5066 e2e fixs, change name sorted	2023-05-29 13:49:32 +02:00
Alexandre Riera	ba850415be	refs #5137 moved sql	2023-05-29 12:56:54 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Carlos Satorres	91edc09057	refs #5066 move sql	2023-05-29 10:24:37 +02:00
Alex Moreno	f37d93b469	refs #5488 correct folder	2023-05-26 14:04:00 +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
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02: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
Vicent Llopis	886c4a15b5	refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía	2023-05-25 10:19:00 +02:00
Alex Moreno	256f30987f	refs #5730 new version 232401	2023-05-25 09:46:39 +02:00
Alex Moreno	33928aa406	refs #5730 correct folder	2023-05-25 09:29:46 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +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	49bd9c35b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto	2023-05-24 12:19:45 +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
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
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	91207c5a3c	refs #5468 fix: test e2e	2023-05-23 13:33:27 +02:00
Carlos Satorres	2d06f42493	refs #5639 defaulterView	2023-05-23 13:33:06 +02:00
Vicent Llopis	0702e4ef43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 13:08:19 +02:00
Vicent Llopis	940ed29dfc	refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'	2023-05-23 12:21:35 +02:00
Vicent Llopis	96163cb07f	refs #5468 feat: update acls	2023-05-23 10:43:46 +02:00
Vicent Llopis	aea39dd0b7	refs #5468 feat: modificalos acl de VnUser	2023-05-23 08:45:03 +02:00
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +02:00
Alex Moreno	dc244b5567	refs #5488 remove State_seeFilteredEditableStates	2023-05-23 08:23:52 +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
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	a7c59f51b9	Merge branch 'dev' into 5599-ticketColors	2023-05-22 13:51:35 +00:00
Alex Moreno	c42400a637	Merge branch 'dev' into 5579-db-export	2023-05-22 12:43:57 +00:00
Alex Moreno	c6c15d7c69	refs #5472 feat: changePassword with passExpired	2023-05-19 14:44:19 +02:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Alex Moreno	bbc34f04ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-19 07:35:23 +02:00
Alexandre Riera	37b2920157	refs #5513 moved sql	2023-05-18 14:49:40 +02:00
Alexandre Riera	d70a31bfbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-18 14:49:27 +02:00
Alexandre Riera	ca9d76db77	refs #5137 moved sql	2023-05-18 14:47:41 +02:00
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +02:00
Alexandre Riera	2591d2d115	refs #3628 added check & date-picker	2023-05-18 11:42:22 +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
Alex Moreno	36205e75be	feat(232201): new version	2023-05-18 07:55:43 +02:00
Alex Moreno	e17b9a32b9	add schema	2023-05-18 07:46:51 +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
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Alex Moreno	b1bbc22afc	Merge branch 'dev' into 5579-db-export	2023-05-17 11:15:39 +00:00
Alex Moreno	cd34ccad8f	refs #5579 use variable	2023-05-17 13:14:43 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Alex Moreno	cc23fd1337	refs #5579 fix mockTimes and remove userLog_add	2023-05-17 09:23:37 +02:00
Alex Moreno	c9af22780b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export	2023-05-17 08:24:23 +02:00
Alex Moreno	7f881409fc	refs #5579 fix mockTime	2023-05-16 15:00:31 +02:00
Alex Moreno	3e33030b1d	refs #5579 update mariadb version to 10.7.6	2023-05-15 15:16:22 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Vicent Llopis	9ce3e79e00	refs #5594 eliminado archivo ducplicado	2023-05-15 11:50:51 +02:00
Vicent Llopis	d5f5115980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-15 11:50:09 +02:00
Alex Moreno	ea6837e33a	refs #5579 export structure and data	2023-05-12 13:07:24 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +02:00
Carlos Satorres	943e8b09c1	refs #5599 DELIMITER	2023-05-12 11:15:47 +02:00
Alexandre Riera	9760e50212	refs #5513 minor fixes	2023-05-12 08:46:12 +02:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Carlos Satorres	0dea1dfd9e	Merge branch 'dev'	2023-05-11 15:52:35 +02:00
Carlos Satorres	fd85cd2d98	refs #5599 replace	2023-05-11 15:48:31 +02:00
Vicent Llopis	b10f90fbe1	refs #5468 a la seccion privileges se le pasa el parametro user	2023-05-11 15:25:37 +02:00
Alex Moreno	1d6a541b02	test into master	2023-05-11 15:07:02 +02:00
Carlos Satorres	43ab07d954	refs move reports views	2023-05-11 11:57:13 +02:00
Carlos Satorres	2111ca0993	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors	2023-05-10 14:49:37 +02:00
Carlos Satorres	e258e779b3	refs #5599 ticketFuture	2023-05-10 14:49:19 +02:00
Carlos Satorres	9a813c075c	refs #5599 procedure y colorClass	2023-05-10 14:43:08 +02:00
Alex Moreno	a345265a89	refs #5488 specifics acls	2023-05-10 14:09:06 +02:00
Carlos Satorres	c59915f951	refs #5599 procedure	2023-05-10 13:55:36 +02:00
Vicent Llopis	74ea0ce9fd	refs #5468 actualizados acls	2023-05-10 13:44:51 +02:00
Alex Moreno	29e0562c8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-10 13:33:52 +02:00
Alexandre Riera	3166a9e420	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:23:10 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +02:00
Alex Moreno	49e2c38ddd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev	2023-05-10 12:30:56 +02:00
Vicent Llopis	62dd64eb89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-10 11:56:50 +02:00
Alex Moreno	706c62f624	typo	2023-05-10 09:26:33 +02:00
Alex Moreno	3b8cafc783	fix(ticketConfigSql): correct folder	2023-05-10 09:22:33 +02:00
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +02:00
Alex Moreno	ca8373d7f7	feat(acl): add specifics acls to ticket, claim, state and worker	2023-05-09 14:04:39 +02:00
Vicent Llopis	313c641cd7	move chages sql	2023-05-09 12:26:29 +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
Alex Moreno	7021e52705	correct folder	2023-05-09 07:11:21 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Alex Moreno	3b8d670c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 13:43:31 +02:00
Alex Moreno	e019ab4160	deploy(232001): add changes folder, package and changelog	2023-05-08 12:40:52 +02:00
Alex Moreno	90465c275a	correct folder	2023-05-08 12:21:20 +02:00
Alex Moreno	ad3c34bd35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test	2023-05-08 12:08:00 +02:00
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02:00
Alexandre Riera	a2055d35fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-08 09:48:09 +02:00
Alexandre Riera	d21b949ffb	refs #5513 fix getItemsPackaging	2023-05-08 09:18:53 +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
Alexandre Riera	5cdec35ed4	refs #5513 addFromPackaging.spec.js	2023-05-04 14:30:10 +02:00
Alexandre Riera	8ae5a0de0f	refs #5513 adding backs and models	2023-05-04 12:03:47 +02:00
Alex Moreno	a22a8a6bd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-04 11:34:19 +02:00
Alex Moreno	2e020b5ebb	fix(): correct version	2023-05-04 09:02:23 +02:00
Alexandre Riera	a2d3b79246	Merge branch 'dev' into 4713-saleTracking	2023-05-04 06:42:39 +00:00
Alex Moreno	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Alex Moreno	bf3aac70f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-03 11:37:07 +02:00
Carlos Satorres	17425a627c	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-02 11:25:17 +00:00
Alex Moreno	306d73eb69	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 09:42:56 +00:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Alex Moreno	c3038a4d61	fix(imageCollection):	2023-04-28 11:54:11 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00:00
Carlos Satorres	08c173acf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 12:49:01 +02:00
Alex Moreno	34bb216f17	deploy(231601): dev to test	2023-04-27 08:53:54 +02:00
Alex Moreno	9b13e3fd2f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-27 07:23:25 +02: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	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
Alexandre Riera	5844da4474	refs #4713 updated sql	2023-04-26 14:34:29 +02:00
Carlos Satorres	15df9518ab	Merge branch 'dev' into 084200-arreglarChanges	2023-04-26 12:31:33 +00:00
Carlos Satorres	09c1d7e393	refs #084200 add table	2023-04-26 14:30:58 +02:00
Alexandre Riera	878f232fda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking	2023-04-26 14:20:23 +02:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Carlos Satorres	480784ee18	refs #084200 cambio nombre	2023-04-26 13:48:31 +02:00
Vicent Llopis	c69e038a56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-26 12:45:54 +02:00
Vicent Llopis	c580be2790	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-26 12:07:34 +02:00
Carlos Satorres	a524d7837d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-26 11:45:20 +02:00
Vicent Llopis	2e5a43af68	refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser	2023-04-26 11:40:21 +02:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Carlos Satorres	57ec0f8587	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-04-26 09:03:37 +02:00
Alex Moreno	73153071d6	Merge branch 'dev' into 5293-claim-sections	2023-04-26 05:56:46 +00:00
Alex Moreno	af0523a155	refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior	2023-04-25 15:17:45 +02:00
Pablo Natek	e8ce8e42fd	refs #5153	2023-04-25 14:25:22 +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
Alexandre Riera	83319894b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-25 11:25:29 +02:00
Alex Moreno	618100b68a	refs #5542 eliminados procesos que no se usan	2023-04-25 10:40:24 +02:00
Alex Moreno	4cb231759f	feat(State/Supplier): replace hasRole to acls	2023-04-25 09:15:05 +02:00
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Alex Moreno	8502b74dee	feat(): replace hasRole to checkAccessAcl	2023-04-24 11:07:04 +02:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Vicent Llopis	5b7ca82509	Merge branch 'dev' into 5318-deviceProductionLog_toSalix	2023-04-24 04:58:30 +00:00
Alex Moreno	faee5ccd7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:53:07 +02:00
Vicent Llopis	ea1035311e	Merge branch 'dev' into 5128-client.credit-management	2023-04-21 11:30:58 +00: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
Carlos Satorres	d8b5659a5d	refs #5540 client vies	2023-04-21 09:14:30 +02:00
Alexandre Riera	b3a10698af	hotfix negativeBases	2023-04-21 08:20:38 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Vicent Llopis	bcf7b6ab3d	borrado acl innecesario	2023-04-20 15:17:49 +02:00
Carlos Satorres	d6e6dab03b	Merge branch 'dev'	2023-04-20 11:55:52 +02:00
Alex Moreno	7df4a2b15d	fix(231401): fix tests and fixtures	2023-04-20 08:25:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Alexandre Riera	aecde484f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections	2023-04-20 07:52:05 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Vicent Llopis	187ba032d2	refs #5128 rol por ACL	2023-04-19 14:43:15 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Vicent Llopis	34b360040b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-19 12:18:45 +02:00
Vicent Llopis	be8a11cafc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix	2023-04-19 09:52:28 +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
Joan Sanchez	c2af40edb5	changes	2023-04-18 13:15:04 +02:00
Joan Sanchez	d5ea45e36f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 13:14:57 +02:00
Joan Sanchez	cdf092a989	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 11:52:17 +02:00
Joan Sanchez	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	a0d8ed1433	E2e fixes	2023-04-18 11:33:36 +02:00
Alexandre Riera	2df362327f	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-18 08:33:15 +00:00
Alexandre Riera	28a7722bb6	Merge branch 'dev' into 5518-log-user-role	2023-04-18 08:01:42 +00:00
Vicent Llopis	c9dffe9175	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-18 08:39:43 +02:00
Joan Sanchez	6fd5c8ae2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 08:34:20 +02:00
Carlos Satorres	8b60e9f5fd	sql arreglado	2023-04-18 08:07:35 +02:00
Alex Moreno	560b5b374f	Merge branch 'dev' into 5075-client_balance	2023-04-18 05:37:12 +00:00
Vicent Llopis	d99815356a	refs #5144 manejado que el usuario sea NULL	2023-04-18 07:26:35 +02:00
Carlos Satorres	f76727903a	update insert	2023-04-17 15:17:05 +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	06a845e7f0	Cambios SQL	2023-04-17 14:15:39 +02:00
Alex Moreno	b5434c5e4e	tab	2023-04-17 12:58:55 +02:00
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +02:00
Alex Moreno	f97d169cbf	observationEmail	2023-04-17 11:52:31 +02:00
Alexandre Riera	2bc190b01e	Merge branch 'dev' into 5293-claim-sections	2023-04-17 08:49:41 +00:00
Alexandre Riera	0dcbc9fc8b	refs #5293 redirected claim.photos to lilium	2023-04-17 10:46:26 +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
Carlos Satorres	60d3729b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-17 08:55:22 +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	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +02:00
Vicent Llopis	4c18efa589	refs #5128 creado método setRating	2023-04-14 13:05:57 +02:00
Vicent Llopis	83dd386eed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-14 10:39:16 +02:00
Alexandre Riera	b9b52c6b1d	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-14 07:08:02 +00:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00
Joan Sanchez	7a02a3213a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-13 13:47:34 +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
Alexandre Riera	ac4772e44e	refs #5418 mistake doing git pull origin dev	2023-04-13 13:46:29 +02:00
Joan Sanchez	9aaea7e8ed	Changed to new SQL version	2023-04-13 12:01:51 +02:00
Joan Sanchez	f5d26bdb99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-13 12:00:22 +02:00
Joan Sanchez	b5f2cf3711	Added unit test & translation fixes	2023-04-13 11:54:56 +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
Carlos Satorres	ad267c933c	refs #5540 country.code	2023-04-13 08:30:33 +02:00
Joan Sanchez	eb1798100f	Added version 23.16	2023-04-13 08:16:06 +02:00
Carlos Satorres	747efc4342	refs #5540 sql mod	2023-04-12 14:52:59 +02:00
Carlos Satorres	117849f093	refs #5540 supplier js	2023-04-12 12:03:55 +02:00
Vicent Llopis	58750aa065	refs #5318 eliminido triggers y añadido loggable en salix	2023-04-12 10:02:06 +02:00
Pablo Natek	c928274e24	Merge branch 'dev' into 5075-client_balance	2023-04-11 13:19:54 +00:00
Vicent Llopis	d03ca01b73	refs #5128 añadida subseccion "Gestión de crédito"	2023-04-11 14:57:56 +02:00
Alexandre Riera	245b0e70f4	hotfix rollback delivery.sql	2023-04-11 14:51:39 +02:00
Alexandre Riera	3ee08e0300	changed folder	2023-04-11 12:34:26 +02:00
Alexandre Riera	c6db5f1a4b	hotfix apply changes procedure	2023-04-11 12:29:09 +02:00
Alexandre Riera	d5d18d5376	hotfix apply SQL delivery.sql	2023-04-11 11:02:08 +02:00
Carlos Satorres	d21ab7a5a7	refs #5316 primer kkeo	2023-04-11 10:32:21 +02:00
Alexandre Riera	53bd6cd729	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-11 07:52:16 +00:00
Alexandre Riera	ce28339973	refs #5522 deleted trigger afterInsert, added hook beforeInsert	2023-04-11 09:48:31 +02:00
Joan Sanchez	b9e48f2102	Added translations & enable through departments	2023-04-11 07:39:43 +02:00
Carlos Satorres	9f4d027014	refs #5316 sql	2023-04-06 15:36:14 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Carlos Satorres	b3f946e15f	Merge branch 'dev' into 5250-observacionesWorker	2023-04-06 08:32:05 +00:00
Alexandre Riera	05912610f8	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:47:06 +00:00
Carlos Satorres	f307f79dc2	refs #5250 cambio a ult version de changes	2023-04-06 09:34:46 +02:00
Carlos Satorres	68a24b7335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-04-06 09:33:50 +02:00
Joan Sanchez	213766afdf	Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev ... Reviewed-on: #1423 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:27:13 +00:00
Joan Sanchez	641fdf39d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-06 09:26:55 +02:00
Alexandre Riera	5cbc826281	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:16:00 +00:00
Joan Sanchez	902709d61b	Added authCode table	2023-04-05 15:22:09 +02:00
Alexandre Riera	8f4de7e7e9	refs #5259 undo delete, update trigger	2023-04-04 15:27:10 +02:00
Alexandre Riera	589e996b69	refs #5259 minor fix	2023-04-04 15:17:19 +02:00
Joan Sanchez	0d6b248f76	feat(2fa): email 2fa ... Refs #5475	2023-04-04 14:59:33 +02:00
Alexandre Riera	81cf35f2d3	refs #5259 drop procedure invoiceOut_afterInsert	2023-04-04 14:55:37 +02:00
Alexandre Riera	eed1ecc208	refs #4954 trigger modified	2023-04-04 14:47:13 +02:00
Vicent Llopis	c89f95a33e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-04-04 13:40:12 +02:00
Alexandre Riera	32df51ecca	refs #5092 moved sql	2023-04-04 08:40:51 +02:00
Alexandre Riera	24f576a4b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-04-04 08:40:03 +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
Joan Sanchez	6ff6004627	Added version 2314.01	2023-03-30 08:35:04 +02:00
Carlos Satorres	60383eda0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-30 08:26:45 +02:00
Joan Sanchez	6aca23e466	Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev ... Reviewed-on: #1386 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:23:29 +00:00
Joan Sanchez	3bab90f9e5	Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev ... Reviewed-on: #1411 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:07 +00:00
Carlos Satorres	71220c58f7	refs #084200 inserts	2023-03-29 12:00:01 +02:00
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +02:00
Alexandre Riera	05caf0c6d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-28 08:26:11 +02:00
Alexandre Riera	87d0dc3cec	refs #5092 changed name to negative bases	2023-03-28 08:25:41 +02:00
Alexandre Riera	6f2de903bc	refs #5184 working on search panel	2023-03-27 14:29:22 +02:00
Carlos Satorres	aad8fb0a66	refs #084200 i18n	2023-03-27 13:11:38 +02:00
Alexandre Riera	39af68c3dc	Merge branch 'dev' into 5056-gestion-vagones	2023-03-27 05:39:22 +00:00
Carlos Satorres	b199ca4a6e	Merge branch 'dev' into 5250-observacionesWorker	2023-03-24 11:48:31 +00:00
Vicent Llopis	c65f01b689	refs #5416 delete: supplierAccount triggers	2023-03-24 12:30:18 +01:00
Vicent Llopis	871618b122	fix: faltaba el esquema	2023-03-24 12:29:58 +01:00
Carlos Satorres	c68c78cc5b	refs #5250 solucion error WorkerObserv	2023-03-24 12:11:42 +01:00
Vicent Llopis	dca760d4e4	Merge branch 'dev' into 4858-chat_realTime	2023-03-24 10:02:51 +00:00
Vicent Llopis	cbe79a964c	refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures	2023-03-24 10:31:02 +01:00
Vicent Llopis	6c75853ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-24 09:43:13 +01:00
Alexandre Riera	74312a3cdf	refs #5056 changed acl	2023-03-24 07:30:35 +01:00
Vicent Llopis	7e37d7f3f1	refs #5342 actualido el itemType.isFragile para las 'plants'	2023-03-23 09:25:56 +01:00
Alexandre Riera	3fcfc3d640	refs #5056 adding fixtures	2023-03-23 07:53:26 +01:00
Carlos Satorres	d05ddef5fa	refs #084200 primer commit companyI18n	2023-03-22 14:54:59 +01:00
Vicent Llopis	d276c7b611	refs #5342 unificados proc x_getWarnings	2023-03-22 10:57:18 +01:00
Vicent Llopis	2559be8230	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-22 10:29:21 +01:00
Carlos Satorres	fde854f5c2	refs #5250 campo de notes	2023-03-22 10:21:15 +01:00
Vicent Llopis	1b1bca28bd	refs #5410 add frontTest	2023-03-22 10:13:59 +01:00
Alexandre Riera	ce67132d7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-22 07:21:20 +01:00
Vicent Llopis	4141a97356	refs #4858 fix: backTest	2023-03-21 11:37:26 +01:00
Vicent Llopis	32e2d1c0fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-03-21 11:26:41 +01:00
Alexandre Riera	1198ad3b01	refs #5056 wagonType backs and test	2023-03-21 10:44:00 +01:00
Vicent Llopis	46a6a5fc63	refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion	2023-03-21 08:51:30 +01:00
Alexandre Riera	a94e47e622	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-20 09:54:02 +01:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +01:00
Juan Ferrer	f61c205a7b	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 09:53:16 +00:00
Alexandre Riera	1cd768f7b8	refs #5056 moved sql	2023-03-16 10:39:02 +01:00
Alexandre Riera	a8f92b151d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-16 10:38:04 +01:00
Vicent Llopis	2f2d65bfd6	refs #5342 feat: añadido icono en los tickets que tengan sales fragiles	2023-03-16 10:33:24 +01:00
Alexandre Riera	c46e15c8e4	refs #5092 changed section name	2023-03-16 09:35:00 +01:00
Alexandre Riera	0b4a6874d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-16 09:16:50 +01:00
Joan Sanchez	1a79bb586c	Added version 2312.01	2023-03-16 09:07:59 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00: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
Alexandre Riera	6609cce065	refs #5056 minHeightBetweenTrays	2023-03-15 12:14:58 +01:00
Alexandre Riera	f706b66efc	refs #5056 added divisible in wagonType	2023-03-15 11:57:09 +01:00
Alexandre Riera	53bca1e8a3	refs #5056 added fixtures	2023-03-15 11:36:10 +01:00
Vicent Llopis	c51e542235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 13:43:59 +01:00
Carlos Andrés	6b375cbaaa	refs #5000 InvoiceOut	2023-03-14 09:34:41 +01:00
Carlos Andrés	2a6848c09a	refs #5000 invoiceOutGlobal	2023-03-14 09:17:39 +01:00
Carlos Andrés	6d3fa34624	refs #5000 invoiceOutGlobal	2023-03-14 09:14:04 +01:00
Carlos Andrés	67f9cae2f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-14 09:04:45 +01:00
Vicent Llopis	c5eef959ee	refs #4856 delete unnessary sql	2023-03-14 07:45:00 +01:00
Carlos Satorres	b5394d3925	refs #084200 footer finalizado, web personalizado	2023-03-13 12:52:41 +01:00
Joan Sanchez	6cc7017475	Merge branch 'dev' into 4856-worker.time-control	2023-03-13 09:22:36 +00:00
Alexandre Riera	0248c3c9e0	refs #5056 models and tables added	2023-03-13 07:34:49 +01:00
Alexandre Riera	efcf224962	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-10 11:50:11 +00:00
Alexandre Riera	c4d6a19666	refs #5092 download as csv button	2023-03-10 12:49:20 +01:00
Alexandre Riera	0cac62da76	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-10 09:02:54 +00:00
Carlos Satorres	a48c67aab4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-03-09 14:09:37 +01:00
Carlos Satorres	b1c8f51e35	refs: #084200 mod del footer y readapatacion heade	2023-03-09 13:41:05 +01:00
Alexandre Riera	4f78eaa14c	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-09 08:29:43 +00:00
Vicent Llopis	b85624085a	fix backTest: add columns to table tpvTransaction	2023-03-09 08:24:21 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Vicent Llopis	165dc73b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-08 12:22:29 +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
Alexandre Riera	106f96b9a6	refs #4713 fixed front test	2023-03-08 12:10:08 +01:00
Alexandre Riera	ed6edfed45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking	2023-03-08 11:50:29 +01:00
Alexandre Riera	9dd242908e	.	2023-03-08 11:43:47 +01:00
Vicent Llopis	78721e7ffa	feat: add fixtures	2023-03-08 09:50:47 +01:00
Joan Sanchez	23a15ee15c	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 06:50:16 +00:00
Carlos Satorres	955e55a7f4	refs #5284 new onCreateClaimAccepted y createClaim	2023-03-07 15:43:48 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Vicent Llopis	4830f8489a	remove unnecessary fixtures	2023-03-07 08:12:08 +01:00
Javi Gallego	4a32c164a6	template string	2023-03-07 07:34:08 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Vicent Llopis	9e9807c4b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-06 11:55:30 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Alexandre Riera	f2bd0253e2	refs #5092 added unbilled tickets section	2023-03-06 09:27:53 +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
Alexandre Riera	8679aefb48	refs #4713 procs deprecated, originalQuantity deleted	2023-03-03 07:36:04 +01:00
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +01:00
Joan Sanchez	e785c34d90	Added next version	2023-03-02 07:52:07 +01: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
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +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	6eab4bbe94	refs #5149 fixing tests	2023-03-01 08:15:58 +01:00
Vicent Llopis	da6e29056e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-03-01 08:08:23 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Alexandre Riera	d5ea59e284	refs #5287 permisos añadidos	2023-02-28 12:46:48 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +01:00
Carlos Andrés	ffdfd1a7e5	refs #5000 Invoicing change structure	2023-02-23 14:48:21 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Joan Sanchez	f88c9b904c	Updated fixtures	2023-02-21 10:38:23 +01:00
Joan Sanchez	c9840f6985	Updated entry structure	2023-02-21 08:32:46 +01:00
Joan Sanchez	a04c8ed8d8	Updated structure	2023-02-21 08:17:52 +01:00
Joan Sanchez	0a7b3647b8	Updated fixtures	2023-02-21 07:57:35 +01:00
Joan Sanchez	39527cbc50	Updated structure & data	2023-02-20 14:46:38 +01:00
Joan Sanchez	251c7b54ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export	2023-02-20 14:36:47 +01:00
Vicent Llopis	3ef0b3a68b	feat: add acl	2023-02-20 12:42:42 +01:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +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
Joan Sanchez	46fdaab649	Merge pull request 'test -> dev' (!1335) from test into dev ... Reviewed-on: #1335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-17 12:23:11 +00:00
Vicent Llopis	c6304898b4	refactor: borrado insert, se ha hecho directamente sobre produccion	2023-02-17 13:00:02 +01:00
Vicent Llopis	7883723b8c	move changes sql	2023-02-17 12:54:59 +01:00
Vicent Llopis	77c454f953	move sql changes and add changelog	2023-02-17 10:45:08 +01:00
Vicent Llopis	373be40986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 10:42:50 +01:00
Vicent Llopis	5285ad9242	move sql changes	2023-02-17 10:19:12 +01:00
Joan Sanchez	a59dac2b9f	Added version 230801	2023-02-17 10:12:29 +01:00
Vicent Llopis	d25ebaec0b	Merge branch 'dev' into 5097-item.summary_available	2023-02-17 08:47:56 +00:00
Alexandre Riera	4cae4448f6	refs #5194 moved invoiceOut to 230402	2023-02-16 14:45:11 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Alexandre Riera	ec16a0d66c	Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:35:33 +01:00
Alexandre Riera	457fd3f5f9	refs #5194 sql moved to 230404	2023-02-16 14:35:03 +01:00
Joan Sanchez	3031ae2511	Updated version	2023-02-16 14:28:33 +01:00
Vicent Llopis	76f2030125	feat: add update sql	2023-02-16 09:50:25 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	dc2ab50f65	fix: test e2e	2023-02-16 09:44:06 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Alexandre Riera	e68afa3169	refs #5223 moved sql	2023-02-15 12:59:19 +01:00
Vicent Llopis	fda428d73e	refactor: change user	2023-02-15 09:52:35 +01:00
Vicent Llopis	5ecf55a1e7	movida sql a carpeta changes actual	2023-02-15 09:51:27 +01:00
Vicent Llopis	7439b12d98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-15 09:31:20 +01:00
Alexandre Riera	7194e62cae	refs #4588 faked observationEditorFk in structure	2023-02-14 13:28:21 +01:00
Alexandre Riera	7876d4611c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado	2023-02-14 12:44:03 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Alexandre Riera	7d5591462d	refs #4588 entry sql	2023-02-14 09:08:49 +01:00
Alexandre Riera	54ad373c5e	Merge branch 'master' into 5194-cambios-ticketFutureAdvance	2023-02-13 09:30:47 +00:00
Alexandre Riera	76ed4d2d4b	refs #5194 fixed tests	2023-02-13 10:16:28 +01:00
Alexandre Riera	a7e9e52ad4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 07:34:13 +01:00
Vicent Llopis	ac3faddac1	fix: actulizada sql intrastat y se muestra solamente cuando toca	2023-02-10 12:09:51 +01:00
Alexandre Riera	6cb815faaf	.	2023-02-10 10:13:41 +01: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
Vicent Llopis	4754dc7bda	feat: actualizada sql intrastat	2023-02-09 11:03:22 +01:00