8462 Commits

Author	SHA1	Message	Date
Vicent Llopis	dd1dbcbd4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-08-22 13:39:09 +02:00
Vicent Llopis	c7c17e6e4a	Merge branch 'dev' into 6013-sendMail_fix	2023-08-22 11:18:08 +00:00
Vicent Llopis	2f2611a705	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-08-22 10:31:17 +00:00
Carlos Satorres	b1b6bd13ea	refs #5843 change userFk	2023-08-22 10:45:41 +02:00
Alex Moreno	a26652045c	refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel	2023-08-22 10:17:46 +02:00
Guillermo Bonet	6d60592fb9	Merge branch 'master' into test	2023-08-21 09:34:32 +02:00
Guillermo Bonet	86def6e212	refs #5995 Changed query getExternalCmrs	2023-08-21 08:47:28 +02:00
Jorge Penadés	040f5be85c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-18 12:18:30 +02:00
Alex Moreno	518d5111e4	refs #6127 hotFix(ticketRefund): get ticketFk front ticketService	2023-08-17 08:42:04 +02:00
Alex Moreno	868fbbfc2e	cau #103812 hotFix(supplier): beforeSave name	2023-08-16 08:04:32 +02:00
Sergio De la torre	8d0b3efa11	refs #4815 feat:DeviceLog Model	2023-08-14 09:39:40 +02:00
Alex Moreno	1ec51d94cf	refs #5134 feat: correct sql	2023-08-11 12:53:43 +02:00
Sergio De la torre	a6047d257b	refs #5134 feat:modelsSalix	2023-08-11 12:45:18 +02:00
Alex Moreno	9ef4ba9bef	refs #5134 feat: add saleMistake model	2023-08-11 12:32:49 +02:00
Sergio De la torre	6eb88f8ab7	refs #5134 feat: models	2023-08-11 11:58:30 +02:00
Alex Moreno	00fa5b7ce3	Merge branch 'dev' into fix-fixtures_test	2023-08-11 07:38:53 +00:00
Jorge Penadés	27ab6639c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-10 13:26:42 +02:00
Alex Moreno	afc0c98065	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-10 11:05:37 +02:00
Alex Moreno	bdf0138c70	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-08-10 10:40:40 +02:00
Guillermo Bonet	b197109556	refs #5995 Requested changes	2023-08-10 10:14:22 +02:00
Carlos Satorres	a11905ee63	Merge branch 'dev' into fix-fixtures_test	2023-08-10 08:00:07 +00:00
Carlos Satorres	8807b9f87f	fix upper	2023-08-10 09:58:48 +02:00
Alex Moreno	de773bc849	Merge branch 'master' into 5995-liliumExternalCmr	2023-08-10 06:55:56 +00:00
Guillermo Bonet	d6b30271f2	refs #5995 Requested changes	2023-08-10 08:12:52 +02:00
Guillermo Bonet	ed88a5b25f	refs #5995 Minor change	2023-08-10 07:54:49 +02:00
Alex Moreno	209cac2a6a	Merge branch 'dev' into 5762-recoverPassword-multiplatform	2023-08-09 13:05:16 +00:00
Carlos Satorres	5653a39e3b	fix fixtures names, socialnames streets	2023-08-09 13:10:05 +02:00
Carlos Satorres	f70b767506	Merge branch 'dev' into 5976-transferSale_call_setDeleted	2023-08-09 08:05:46 +00:00
Alex Moreno	aee78960b0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-09 08:00:54 +02:00
Alex Moreno	765ab054a1	refs #5934 fix(clientSms): add vn-tooltip	2023-08-09 07:41:38 +02:00
Jorge Penadés	132640cddf	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-08 15:10:40 +02:00
Jorge Penadés	7ca6c6b96d	refs #5914 fix merge	2023-08-08 15:10:15 +02:00
Alex Moreno	ce78fc8e5d	refs #5986 feat: state model add classColor properties	2023-08-08 15:06:28 +02:00
Alex Moreno	19c09d60a2	refs #5986 feat(ticket_filter): add classColor column	2023-08-08 15:04:21 +02:00
Guillermo Bonet	2f64a41f64	refs #5995 Added getExternalCmrs	2023-08-08 14:16:47 +02:00
Alex Moreno	0d5c6ffdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted	2023-08-08 07:10:25 +02:00
Alex Moreno	00fcd3a800	refs #6083 feat: add lilium ticketSms	2023-08-07 14:03:07 +02:00
Alex Moreno	e85cddec3c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-07 10:19:27 +02:00
Alex Moreno	26d6bbff4c	refs #5929 hotFix: add UserError	2023-08-07 10:04:46 +02:00
Alex Moreno	4191d2529d	refs #5712 warnFix: getById condition	2023-08-07 07:57:38 +02:00
Alex Moreno	75d3d12ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform	2023-08-04 14:31:56 +02:00
Guillermo Bonet	eeb68e1ad9	Merge branch 'dev' into test	2023-08-04 08:54:41 +00:00
Alex Moreno	700ba4a7b1	refs #5914 feat(transferInvoiceOut): optimization	2023-08-04 08:22:43 +02:00
Carlos Satorres	1308efb98d	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-04 01:21:52 +00:00
Alex Moreno	83d0a394e3	refs #5973 refactor(item_fetched-tags): restyle empty tags	2023-08-03 15:59:09 +02:00
Jorge Penadés	725fe674c0	refs #5914 WIP fixing transacticions	2023-08-03 14:01:50 +02:00
Guillermo Bonet	602f57bca9	Merge branch 'test' into master	2023-08-03 08:54:32 +00:00
Carlos Satorres	3388fd7c59	fix test back	2023-08-03 10:26:29 +02:00
Carlos Satorres	4fb0ad415c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:03:15 +02:00
Carlos Satorres	183fdacefc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:01:11 +02:00
Guillermo Bonet	8deb8c1f54	Merge branch 'master' into 5995-newCmr	2023-08-03 06:50:04 +00:00
Guillermo Bonet	aab0771e6e	refs #5995 Removed my code in closure.js	2023-08-02 14:37:38 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Guillermo Bonet	4a0b8f37cd	refs #5995 Load blob	2023-08-02 13:41:44 +02:00
Alex Moreno	56cd94feaa	refs #5843 fix(timeControl_filter): not use userFk	2023-08-02 13:26:42 +02:00
Guillermo Bonet	16353dfddc	refs #5995 First commit	2023-08-02 07:35:40 +02:00
Jorge Penadés	bd122e6327	refs #5014 WIP trasactions added	2023-08-01 16:13:24 +02:00
Alex Moreno	b8780dfbbf	Merge branch 'master' into hotifx-loadDataDepartment	2023-08-01 12:12:17 +00:00
Carlos Satorres	2bde94a667	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-08-01 11:40:29 +00:00
Jorge Penadés	fc32f48b64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-01 12:46:15 +02:00
Jorge Penadés	3ef74cab5c	refs #5914 WIP created transferInvoiceOut	2023-08-01 12:45:57 +02:00
Carlos Satorres	79d88facc3	refs #4764 add test front	2023-08-01 12:33:56 +02:00
Alex Moreno	30c5e8d8cc	hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0	2023-08-01 11:11:29 +02:00
Carlos Satorres	40607a42cf	hotfix-loadData	2023-08-01 10:25:44 +02:00
Carlos Satorres	12acda0b1c	refs #4764 ticketSerivce refund add	2023-07-31 11:06:19 +02:00
Vicent Llopis	db992a9b91	Merge branch 'dev' into hotfix_workCenter_isNull	2023-07-31 08:54:37 +00:00
Jorge Penadés	22f76ec6a9	refs #5914 WIP clone method created	2023-07-31 10:33:51 +02:00
Jorge Penadés	e63efa4f0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-07-31 10:32:41 +02:00
Vicent Llopis	7d10be37ec	Merge branch 'dev' into 6013-sendMail_fix	2023-07-31 08:26:30 +00:00
Jorge Penadés	50155cea8d	refs #5914 WIP transfer invoiceOut	2023-07-28 15:21:43 +02:00
Carlos Andrés	6872cea6bf	Merge branch 'master' into 6077-Log-InvoiceInDueday-incorrecto-Salix	2023-07-28 13:13:59 +00:00
Vicent Llopis	81dc163819	ya no muestra error en el front	2023-07-28 14:40:03 +02:00
Alex Moreno	e253dd7982	refs #5351 fix(worker_model): remove required userFk	2023-07-28 14:39:01 +02:00
Carlos Andrés	136b401ede	refs #6077 espacios correctos	2023-07-28 14:17:50 +02:00
Carlos Andrés	4061f3e5ce	#refs 6077 espacios por tabulaciones	2023-07-28 12:28:41 +02:00
Vicent Llopis	1d4ce2c703	refs #5804 fix: delete transaction	2023-07-28 12:24:24 +02:00
Vicent Llopis	251ed36eca	refs #6013 feat: mostrar error en el mail	2023-07-28 10:51:48 +02:00
Carlos Satorres	af60412232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-07-27 17:24:50 +02:00
Carlos Satorres	d01584bfb3	refs #4764 service	2023-07-27 15:15:55 +02:00
Vicent Llopis	0054f2d82f	refs #6013 fix: codigo no bloqueante	2023-07-27 15:07:10 +02:00
Vicent Llopis	7367d1cdfe	refs #6013 fix: add await	2023-07-27 14:41:53 +02:00
Carlos Andrés	3bc3ffe115	refs #6077 Log-InvoiceInDueday-incorrecto	2023-07-27 13:40:39 +02:00
Vicent Llopis	65b9cadd9e	refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker	2023-07-27 12:51:14 +02:00
Vicent Llopis	777426aa05	refs #5561 add backTest	2023-07-27 07:58:55 +02:00
Alex Moreno	305caaf8aa	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-27 07:20:34 +02:00
Alex Moreno	61b17d1fa5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-27 07:19:48 +02:00
Jorge Penadés	10361ba78e	refs #5216 addExpeditionState refactored	2023-07-26 13:33:56 +02:00
Carlos Satorres	118f41c898	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-07-26 13:12:01 +02:00
Jorge Penadés	bbc26d8ba4	WIP refs #5216 addExpeditionState	2023-07-26 12:36:30 +02:00
Jorge Penadés	0b88194f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:27:01 +02:00
Jorge Penadés	05eff94217	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:22:32 +02:00
Jorge Penadés	a0fee6ad50	refs #5929 removed useless vars	2023-07-26 09:20:54 +02:00
Jorge Penadés	0b6fb70f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice	2023-07-26 08:36:29 +02:00
Alex Moreno	af28cfe6df	Merge branch 'dev' into 6047-addEditableTd	2023-07-26 05:22:44 +00:00
Jorge Penadés	fa9dfdf411	refs #5216 try ACL updateExpeditionState	2023-07-25 16:32:38 +02:00
Jorge Penadés	96483a827f	Merge branch 'dev' into 5929-editTicketPrice	2023-07-25 13:40:08 +00:00
Jorge Penadés	543fbf3c0a	refs #5929 isEditableOrThrow created, tests passed	2023-07-25 15:35:08 +02:00
Jorge Penadés	9978db9d52	refs #5929 WIP test created	2023-07-25 11:33:01 +02:00
Alex Moreno	44ceeac9c4	refs #5983 feat(itemShelving): add userFk field	2023-07-25 10:21:54 +02:00
Jorge Penadés	ea4190f15c	refs #5216 update expedition state added	2023-07-24 13:32:28 +02:00
Jorge Penadés	4f80221101	refs #5929 added ACL and accurate errors	2023-07-24 10:34:44 +02:00
Jorge Penadés	55f32397c5	removed unnecesary comments	2023-07-21 13:13:44 +02:00
Jorge Penadés	ade7303a6f	refs #6047 added editable-td component	2023-07-21 13:05:55 +02:00
Vicent Llopis	8267daef3a	refs #5918 fix: permite reenviar el correo si ha dado fallo	2023-07-21 12:58:44 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Alex Moreno	985e258529	refs #5769 fix(web-access): email rule	2023-07-21 12:33:14 +02:00
Vicent Llopis	9bf891fcec	refs #5561 fixed	2023-07-21 12:20:06 +02:00
Vicent Llopis	f926c60017	remove file	2023-07-21 12:02:02 +02:00
Vicent Llopis	51f9055d23	remove file	2023-07-21 12:01:57 +02:00
Vicent Llopis	cf0b6f8c6e	refs #5561 fix: saleGroupDetail.saleFk UNIQUE	2023-07-21 12:01:01 +02:00
Vicent Llopis	f52b398596	refs #5561 refactor: sustituidos sql por loopback	2023-07-21 09:50:27 +02:00
Alex Moreno	eb963ff993	refs #5866 fix(transferClient): correct variable name	2023-07-21 08:28:19 +02:00
Jorge Penadés	618989052a	refs #5866 fix transferClient and test added	2023-07-20 15:15:33 +02:00
Vicent Llopis	7d2e98267f	refs #5561 eliminados valores a piñon	2023-07-20 15:09:31 +02:00
Jorge Penadés	8281dbacd1	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 12:34:16 +00:00
Vicent Llopis	8f7caa1183	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-20 11:42:10 +02:00
Jorge Penadés	2fa1c4b6ca	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 08:23:07 +00:00
Jorge Penadés	9db8ae237f	refs #5866 addBackTransferClient	2023-07-20 10:19:03 +02:00
Vicent Llopis	1215b8cd57	Merge branch 'dev' into 5849-makeInvoice_solved	2023-07-20 08:15:57 +00:00
Vicent Llopis	7312ed9cc4	refs #5244 fix back test	2023-07-20 09:56:07 +02:00
Vicent Llopis	d6a27741b5	a	2023-07-20 09:50:56 +02:00
Vicent Llopis	04ca5743a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-20 09:40:41 +02:00
Alex Moreno	5771ccb488	Merge branch 'dev' into 5934-clientSms	2023-07-20 06:50:56 +00:00
Alex Moreno	aefcb8c49a	Merge branch 'dev' into 5837-quitRestrictionFrance	2023-07-20 06:40:23 +00:00
Alex Moreno	60e75d7825	refs #5837 fix client condition	2023-07-20 08:23:43 +02:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Vicent Llopis	6df1ef9d4c	Merge branch 'dev' into 5934-clientSms	2023-07-20 05:16:54 +00:00
Vicent Llopis	ab95ef74a9	refs #5934 refactor: nombres variables	2023-07-20 07:17:35 +02:00
Alex Moreno	8c84f006b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-20 07:15:30 +02:00
Carlos Satorres	6efda27f0c	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-07-20 04:06:29 +00:00
Sergio De la torre	6344c11d1e	Merge branch 'dev' into 5983_inventory_parking	2023-07-19 14:29:18 +00:00
Alex Moreno	2c79056f34	refs #5976 error extended	2023-07-19 13:44:04 +02:00
Carlos Satorres	579d6d53d8	Merge branch 'dev' into 5837-quitRestrictionFrance	2023-07-19 10:46:17 +00:00
Carlos Satorres	36c31af455	refs #5690 rounding translate	2023-07-19 12:38:13 +02:00
Carlos Satorres	aaba4e74b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems	2023-07-19 12:00:59 +02:00
Sergio De la torre	e2f50d63f6	Merge branch 'dev' into 5983_inventory_parking	2023-07-19 05:02:39 +00:00
Carlos Satorres	25ce685116	Merge branch 'dev' into 5824-fixUpsertFixedPrice	2023-07-19 04:36:51 +00:00
Carlos Satorres	36db2ee883	Merge branch 'dev' into 5066-vehicleSorted	2023-07-18 15:05:56 +00:00
Alex Moreno	2f6c988005	Merge branch 'dev' into 5983_inventory_parking	2023-07-18 13:53:17 +00:00
Sergio De la torre	49c656928e	refs #5983 feat(itemShelving): add visible	2023-07-18 15:43:11 +02:00
Carlos Satorres	bd723bb7ba	refs #5824 mod ng	2023-07-18 15:01:58 +02:00
Alex Moreno	f07ac89cb6	refs #5976 add custom error	2023-07-18 15:01:04 +02:00
Vicent Llopis	d3165fcdc7	refs #5849 fix: tback	2023-07-18 14:25:53 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Sergio De la torre	9076553070	refs #5983 test(itemShelving): add getInventory	2023-07-18 14:11:50 +02:00
Vicent Llopis	3e8775149a	refs #5934 feat: change icon	2023-07-18 13:02:42 +02:00
Vicent Llopis	b3a7a170f0	refs #5934 feat: añadido clientSms log	2023-07-18 11:54:43 +02:00
Sergio De la torre	93da129239	refs #5983 feat(itemShelving): add getInventory	2023-07-18 08:54:45 +02:00
Carlos Satorres	47e8fab8d9	refs remove	2023-07-17 19:51:46 +02:00
Alex Moreno	15dee8bef4	refs #5976 refactor: transaferSale call setDeleted	2023-07-17 15:19:36 +02:00
Alex Moreno	d2120cdc3d	refs #5762 feat: multiplatform recover-password and change-password	2023-07-17 14:24:50 +02:00
Carlos Satorres	52f58a92c8	refs err.sqlMessage	2023-07-17 14:11:05 +02:00
Carlos Satorres	a5d1c68511	change err and traduction	2023-07-17 14:07:45 +02:00
Carlos Satorres	10e726c486	move vehicleInvoice	2023-07-17 13:51:16 +02:00
Sergio De la torre	639d5963a3	refs #6028 get_routes	2023-07-17 13:50:07 +02:00
Carlos Satorres	6f3cdd3508	refs #5640 fix e2e back	2023-07-17 12:30:48 +02:00
Carlos Satorres	b2b335326e	Merge branch 'dev' into 5066-vehicleSorted	2023-07-14 11:49:26 +00:00
Carlos Satorres	b113052b5c	refs #5640 fixtures and test fix	2023-07-14 13:48:36 +02:00
Carlos Satorres	87f125453d	refs #5640 fix mayus quit function	2023-07-14 13:35:13 +02:00
Carlos Satorres	fa3745820d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-07-14 13:20:19 +02:00
Vicent Llopis	6980392ba1	fix: tabulacion	2023-07-14 13:11:09 +02:00
Carlos Satorres	93387cae62	refs #5837 if isSocialNameUnique	2023-07-14 13:07:40 +02:00
Vicent Llopis	28eedbfd23	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-14 11:04:06 +00:00
Vicent Llopis	5716acaa3c	fix: test	2023-07-14 13:01:31 +02:00
Vicent Llopis	4f183d1c6a	fix: worker.basic-data el boton guardar estava activo al hacer F5	2023-07-14 12:18:41 +02:00
Vicent Llopis	4a7cfe9122	fix: workCenter	2023-07-14 11:51:15 +02:00
Carlos Satorres	765c22df96	refs #5837 new table	2023-07-14 11:30:13 +02:00
Carlos Satorres	6d8b3e346d	refs #5837 fix filter existingClient France	2023-07-14 09:40:16 +02:00
Carlos Satorres	190db79019	Merge branch 'master' into 5999-defaultCountry	2023-07-14 07:34:27 +00:00
Alex Moreno	29a4c51518	Merge branch 'master' into 5964-supplyFixValidation	2023-07-14 05:34:18 +00:00
Guillermo Bonet	765a84e2eb	refs #5819 Added param to call zone_getLeaves	2023-07-14 07:27:04 +02:00
Carlos Satorres	173ed251c3	refs #5964 fix supply	2023-07-13 13:45:07 +02:00
Alex Moreno	4632ed298d	Merge branch 'master' into 5999-defaultCountry	2023-07-13 11:41:40 +00:00
Vicent Llopis	75a66571ba	refs #5244 refactor: modificados todos los url='activeWith...'	2023-07-13 12:59:39 +02:00
Vicent Llopis	c876719a5c	refs #5244 fix: corregidos errores	2023-07-13 12:59:02 +02:00
Vicent Llopis	1d7f0e2135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-13 11:42:49 +02:00
Carlos Satorres	191f478523	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem	2023-07-13 10:58:09 +02:00
Carlos Satorres	2627cafc22	refs #5999 defaulter country autocomplete	2023-07-13 10:54:22 +02:00
Carlos Satorres	660612cb84	refs #5999 url	2023-07-13 10:22:41 +02:00
Vicent Llopis	392dc5060a	refs #4770 delete test	2023-07-13 10:19:12 +02:00
Vicent Llopis	01dc26f64e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2	2023-07-13 09:42:53 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	337ce56a60	refs #5887 test exlcuido	2023-07-13 08:37:11 +02:00
Alex Moreno	978224c21c	Merge branch 'master' into hotfix_mailAlias	2023-07-13 06:14:53 +00:00
Alex Moreno	e994e54e4b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-13 07:11:09 +02:00
Carlos Satorres	7da1824e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem	2023-07-13 06:39:05 +02:00
Vicent Llopis	7aaaf5492c	refs #5887 refacotr: move code to hook	2023-07-12 15:07:06 +02:00
Vicent Llopis	ef6a2ae578	refs #5887 fix: delete requires	2023-07-12 14:06:28 +02:00
Vicent Llopis	c0d329edca	a	2023-07-12 14:04:17 +02:00
Alex Moreno	78108b2ca5	Merge branch 'master' into hotfix-travel	2023-07-12 12:01:26 +00:00
Vicent Llopis	551d06ee83	refs #5887 para eliminar sigue las mismas reglas que para añadir	2023-07-12 13:55:57 +02:00
Vicent Llopis	954c2f5435	refs #5244 feat: carga valor inicial	2023-07-12 13:12:51 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Carlos Satorres	510b78c703	refs #6006 mod dias anteriores	2023-07-12 13:08:46 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Alex Moreno	d7ac20dc6a	hotFix(supplier): fix accessToken in before save	2023-07-12 13:02:27 +02:00
Vicent Llopis	bd85cf4e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-12 12:29:17 +02:00
Vicent Llopis	a831a1534b	Merge branch 'dev' into 4770-routes_roadmap2	2023-07-11 11:50:15 +00:00
Vicent Llopis	6655807d80	refs #4770 refactor: change acl	2023-07-11 13:50:38 +02:00
Vicent Llopis	5a5a1ed20b	refs #5887 feat: addback test	2023-07-11 13:22:54 +02:00
Vicent Llopis	e1f12bea02	a	2023-07-11 12:33:44 +02:00
Vicent Llopis	da13f0811c	refs 5887 cambiado drop y create por create or replace	2023-07-11 09:59:11 +02:00
Vicent Llopis	93e70e699a	refs #5874 feat: refactorizado proceso facturación	2023-07-11 09:19:15 +02:00
Carlos Satorres	7291b793ae	refs #5949 fix traduct	2023-07-11 08:41:43 +02:00
Carlos Satorres	ba109dccc5	refs #5949 trad	2023-07-11 07:58:18 +02:00
Carlos Satorres	d1c8f0ff11	refs #5949 itemRecycle	2023-07-11 07:37:51 +02:00
Alex Moreno	5e6d941f36	Merge branch 'dev' into 4614-ticket_weight	2023-07-10 06:53:11 +00:00
Alex Moreno	d941e2e18f	Merge branch 'master' into hotfix-extraCommunityEntryRef	2023-07-10 05:26:05 +00:00
Carlos Satorres	9f2ef5c2c0	change ref master	2023-07-10 07:22:23 +02:00
Alex Moreno	8922d27f20	refs #4614 fix e2e	2023-07-07 12:25:02 +02:00
Alex Moreno	d9a5868ce4	refs #5930 fix(claim_updateClaim) options	2023-07-07 10:55:45 +02:00
Vicent Llopis	7030be3efa	fix	2023-07-07 09:30:04 +02:00
Alex Moreno	8fe9b387ce	refs #4614 test: front and correct folder	2023-07-06 15:16:52 +02:00
Alex Moreno	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +02:00
Alex Moreno	63a8f40443	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-07-06 10:42:53 +02:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Carlos Satorres	3d9f0e1497	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-06 05:48:45 +02:00
Alex Moreno	6530e87508	refs #4614 feat(ticket): prevent invoice without weight	2023-07-05 15:20:51 +02:00
Alex Moreno	040e9e4197	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-05 12:50:45 +02:00
Alex Moreno	d7fca07446	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-07-05 10:17:42 +00:00
Alex Moreno	5d933da28a	refs #5712 fix empty data	2023-07-05 12:14:26 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Carlos Satorres	f42273006c	refs #4764 service ant	2023-07-05 07:36:01 +02:00
Alex Moreno	1a18ba66a9	refs #5712 fix(workerDms): filter	2023-07-04 15:18:57 +02:00
Vicent Llopis	4369d275f8	refs #4770 feat: add test	2023-07-04 15:04:32 +02:00
Vicent Llopis	e58d4e5db3	refs #4770 feat: añadida sección 'Troncales'	2023-07-04 14:42:51 +02:00
Carlos Satorres	3b81198a05	refs #4764 mod button	2023-07-04 13:57:52 +02:00
Carlos Satorres	6b813cb859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-07-04 11:54:19 +02:00
Carlos Satorres	5000e05e05	refs #5334 merge + e2e solve	2023-07-04 09:57:16 +02:00
Carlos Satorres	f1502139ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-04 09:56:38 +02:00
Alex Moreno	4f616397a2	refs #5712 use dmsType readRole	2023-07-03 15:05:39 +02:00
Carlos Satorres	983d028d06	refs #5334 popover y basic data	2023-07-03 13:58:40 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Pablo Natek	8ef6f0dd17	Merge branch 'dev' into 5347-clientCreateRefactor	2023-07-03 11:35:50 +00:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Alex Moreno	2d1420e3f8	Merge branch 'dev' into 5836-clientDefaulterisWorker	2023-07-03 09:51:48 +00:00
Carlos Satorres	4d03ef8f09	Merge branch 'dev' into 5836-clientDefaulterisWorker	2023-07-03 09:47:43 +00:00
Carlos Satorres	c3ef642017	refs #5836 fix fk	2023-07-03 11:45:05 +02:00
Carlos Satorres	d03df4c5cc	refs #5690 ticketproblems	2023-07-03 11:38:38 +02:00
Carlos Satorres	5e68363312	refs #5334 onsearch postlink	2023-07-03 09:38:36 +02:00
Alex Moreno	d1fb2859be	Merge branch 'dev' into 5753_232401_db_dump	2023-07-03 06:59:42 +00:00
Carlos Satorres	dc10c20fe3	refs #5334 email validate	2023-07-03 07:29:58 +02:00
Carlos Satorres	dc36c6fd9d	refs #5334 basicData solve e2e	2023-06-30 13:52:46 +02:00
Vicent Llopis	7b4e8570aa	refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker	2023-06-30 12:03:26 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Carlos Satorres	e6ed834bf0	refs #5836 remove case	2023-06-30 10:07:29 +02:00
Carlos Satorres	3d93043b98	Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-30 09:40:15 +02:00
Carlos Satorres	83b096c206	refs #5334 fix errors	2023-06-30 09:40:12 +02:00
Carlos Satorres	6b4501146d	refs #5334 fix errors	2023-06-30 09:39:48 +02:00
Alex Moreno	6fcbf69f60	refs #5753 isNotEditableCredit to zeroCreditEditor	2023-06-30 08:26:51 +02:00
Alex Moreno	ff320895a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump	2023-06-30 08:23:00 +02:00
Alex Moreno	5f42ee5f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 07:55:47 +02:00
Vicent Llopis	f3e771747a	refs #5244 fix: getItemTypeWorker permite filtrar por id	2023-06-29 15:56:07 +02:00
Vicent Llopis	3cedef6f16	refs #5244 fix: add id	2023-06-29 15:22:53 +02:00
Alex Moreno	b062cec747	refs #5475 fix setPassword options/cb	2023-06-29 15:01:24 +02:00
Alex Moreno	c6bee8f2f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-29 14:50:06 +02:00
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Carlos Satorres	af91630852	refs #5836 e2e fix	2023-06-29 13:22:51 +02:00
Vicent Llopis	011db142d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-29 12:49:55 +02:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Carlos Satorres	bb4951bbc8	Merge branch 'dev' into 5334-editDepartment	2023-06-29 07:47:41 +00:00
Carlos Satorres	9dc52b6011	refs #5334 fix labels trad	2023-06-29 09:44:21 +02:00
Carlos Satorres	454cf30de7	refs #4764 boton save	2023-06-29 08:27:20 +02:00
Pablo Natek	bbc5ed2683	Merge branch 'dev' into 5347-clientCreate-→-client_create	2023-06-29 05:22:06 +00:00
Carlos Satorres	319c6af354	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-29 06:37:23 +02:00
Vicent Llopis	c5660a21a1	Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 12:41:26 +00:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Vicent Llopis	3128601027	Merge branch 'dev' into 5808-client.credit-management	2023-06-28 11:47:39 +00:00
Vicent Llopis	6894da7e22	refs #5688 fix: front test	2023-06-28 13:27:18 +02:00
Alex Moreno	da50ea1dd0	Merge branch 'dev' into 5688-worker.calendar_workCenter	2023-06-28 11:10:51 +00:00
Carlos Satorres	f02019d64d	refs #5334 fix words	2023-06-28 11:52:53 +02:00
Alex Moreno	89c25c07b6	refs #5475 fix e2e and back test	2023-06-28 09:59:55 +02:00
Alex Moreno	9b0cf7f378	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-28 07:20:12 +02:00
Alex Moreno	31d637c8a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:19:04 +02:00
Alex Moreno	162faf0d01	Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:18:10 +02:00
Alex Moreno	4b8b7a9d82	refs #5475 fix accessScope	2023-06-27 15:30:54 +02:00
Alex Moreno	f8a972c2f2	refs #5094 fix translation	2023-06-27 14:48:22 +02:00
Carlos Satorres	07712f58e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-27 13:36:51 +02:00
Carlos Satorres	a930963ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-06-27 12:34:37 +02:00
Carlos Satorres	7e542f93a1	Merge branch 'test' into warnFix_travel_summary_entry	2023-06-27 10:11:59 +00:00
Carlos Satorres	8e5a6dbab3	fix warn	2023-06-27 11:44:23 +02:00
Vicent Llopis	87c233d221	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management	2023-06-27 10:33:15 +02:00
Carlos Satorres	5216f12001	refs #5836 check fix	2023-06-27 10:27:39 +02:00
Carlos Satorres	549235429c	refs #5640 oldBranch	2023-06-27 07:18:36 +02:00
Carlos Satorres	24ea18aeb0	refs #5836 isworker back	2023-06-26 13:55:39 +02:00
Alex Moreno	15c45bb544	Merge branch 'test' into hotfix-filterScopeDays	2023-06-26 10:30:57 +00:00
Alex Moreno	224a44847d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-26 11:56:07 +02:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Carlos Satorres	88e845b511	change applyFilters	2023-06-26 10:49:09 +02:00
Guillermo Bonet	e54e0784bf	Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs	2023-06-26 10:06:41 +02:00
Guillermo Bonet	cc5021a75f	refs #5684 Removed xxxLog.create and dependences	2023-06-26 09:40:55 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Carlos Satorres	eff46c1cec	refs #5066 e2e fix, vnConfig	2023-06-26 07:43:36 +02:00
Carlos Satorres	dcbe8c5f7a	refs #5066 quit if	2023-06-26 06:28:35 +02:00
Carlos Satorres	abfe012a78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-06-26 06:12:22 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Juan Ferrer	f70df714df	refs #5772, #5900 InvoiceOut back test removed, logs improved	2023-06-25 16:31:24 +02:00
Juan Ferrer	7660d76850	refs #5772 Test environment fix	2023-06-23 22:52:03 +02:00
Juan Ferrer	665339c8d2	refs #5772 Fix for unhandled ENOENT error	2023-06-23 22:02:33 +02:00
Juan Ferrer	2fec5bf2aa	Merge pull request 'refs #5772 test into dev' (!1633) from test into dev ... Reviewed-on: #1633	2023-06-23 09:51:44 +00:00
Juan Ferrer	8c0e8e9e12	refs #5772 Fixes fetching parallelism from front	2023-06-23 11:50:40 +02:00
Juan Ferrer	47a4a9950f	refs #5772 Parallelism added to PDF generation	2023-06-23 11:42:30 +02:00
Pablo Natek	16af0c5d6c	Merge branch 'dev' into 5347-clientCreate-→-client_create	2023-06-22 16:02:30 +00:00
Carlos Satorres	beb173f6ce	refs #5334 quit e2e no necesario	2023-06-22 15:20:28 +02:00
Vicent Llopis	d9b1f4b8a1	refs #5688 fix: test e2e	2023-06-22 15:06:27 +02:00
Carlos Satorres	137e01e60c	refs #5334 fix acl, filter	2023-06-22 15:00:59 +02:00
Vicent Llopis	d272121258	refs 5688 fix: e2e	2023-06-22 14:52:42 +02:00
Carlos Satorres	757360f3d1	Merge branch 'dev' into 5728-bugEntry/buy	2023-06-22 12:46:36 +00:00
Carlos Satorres	4931745cde	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-22 14:42:28 +02:00
Vicent Llopis	389b53ceff	refs #5772 fix: back test	2023-06-22 13:37:43 +02:00
Vicent Llopis	d26778e94e	refs #5688 fix: e2e	2023-06-22 13:30:53 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Vicent Llopis	591fc14ffa	refs #5772 refactor: movido codigo para enviar rocket al back	2023-06-22 12:48:50 +02:00
Carlos Satorres	7f9d8da7a7	refs #5836 defaulter	2023-06-22 11:42:21 +02:00
Vicent Llopis	9d1a181b73	refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial	2023-06-22 11:10:56 +02:00
Vicent Llopis	d8fe284bcd	Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys	2023-06-22 07:53:11 +00:00
Vicent Llopis	5f4b62f133	refs #5688 fix: test front	2023-06-22 09:48:14 +02:00
Alex Moreno	18a8106461	refs #5339 fix after save	2023-06-22 08:56:27 +02:00
Carlos Andrés	807596f735	refs #5772	2023-06-22 08:50:18 +02:00
Vicent Llopis	473b218da1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter	2023-06-22 08:04:17 +02:00
Carlos Andrés	10a25ff590	refs #5772	2023-06-22 07:49:35 +02:00
Alex Moreno	aea32492e3	Merge branch 'master' into 5339_instance_vs_data	2023-06-22 05:33:34 +00:00
Vicent Llopis	e9ef81f8d7	refs #5244 feat: coge todos los hijos recursivamente	2023-06-21 15:00:46 +02:00
Alex Moreno	6ab431f8ef	refs #5475 tests	2023-06-21 14:17:25 +02:00
Vicent Llopis	a699e2d874	refs #5244 feat: añadido 'depatments' como binding	2023-06-21 14:07:36 +02:00
Carlos Satorres	9870cc7b14	refs #5660 change assist	2023-06-21 13:34:27 +02:00
Vicent Llopis	dd75302bbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-21 13:33:09 +02:00
Carlos Satorres	168d05a830	refs #5334 fix errors	2023-06-21 13:07:04 +02:00
Juan Ferrer	dfdd3a1733	Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize	2023-06-21 11:08:29 +02:00
Juan Ferrer	44192c0606	refs #5667 Client translations added	2023-06-21 11:08:28 +02:00
Carlos Andrés	6f9fd9bb72	refs #5772 mensajes de error	2023-06-21 09:40:14 +02:00
Alex Moreno	38de19f044	Merge branch 'dev' into 5728-bugEntry/buy	2023-06-21 06:44:13 +00:00
Alex Moreno	2ddf8e5de6	Merge branch 'dev' into 5334-editDepartment	2023-06-21 06:24:19 +00:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Pablo Natek	e741904250	refs #5347	2023-06-20 17:01:06 +02:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Carlos Satorres	fa10070675	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-06-20 14:04:38 +02:00
Vicent Llopis	e99627c0b2	codigo innecesario	2023-06-20 11:28:25 +02:00
Vicent Llopis	cea6fae649	fix: eliminada variable que no estaba definida	2023-06-20 10:40:57 +02:00
Vicent Llopis	6c00e704cc	refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente	2023-06-20 09:42:08 +02:00
Carlos Satorres	f0f8b112cd	Merge branch 'dev' into 5334-editDepartment	2023-06-20 07:22:52 +00:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Alex Moreno	dcfb991f94	hotFix(getLeaves): remoteMethodCtx correct defined	2023-06-20 09:20:06 +02:00
Carlos Satorres	c63df30e5c	refs #5334 fix back	2023-06-20 09:19:20 +02:00
Carlos Satorres	a155f846c2	refs #5334 fix ctx	2023-06-20 09:15:37 +02:00
Carlos Satorres	4537344790	merge	2023-06-20 08:20:13 +02:00
Carlos Satorres	7f20973650	refs #5334 merge	2023-06-20 08:16:36 +02:00
Vicent Llopis	8a2cab0e62	Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys	2023-06-20 05:30:55 +00:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Juan Ferrer	9fa6e2df71	refs #5595 VnModel.rawSql() bugfix	2023-06-19 14:54:32 +02:00
Alex Moreno	63888e2d64	refs #5595 console.log(orderFk, userId) for rawSQL logs	2023-06-19 13:52:25 +02:00
Carlos Satorres	3701acd26e	refs #5334 error getLeaves solve	2023-06-19 13:48:14 +02:00
Carlos Satorres	98125f8974	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-19 13:22:41 +02:00
Sergio De la torre	b6c8ca20ee	refs #5339 data	2023-06-19 08:58:20 +02:00
Carlos Satorres	8dd360bf1e	refs #4764 e2e solve	2023-06-19 08:46:15 +02:00
Alex Moreno	2197441159	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-19 07:20:00 +02:00
Alex Moreno	ee1b901dea	refs #5475 feat(account_changePassword): accessScope	2023-06-16 14:31:14 +02:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Juan Ferrer	081cf43ece	refs #5667 SupplierAccount translation added	2023-06-16 13:39:24 +02:00
Alexandre Riera	9c18391c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded	2023-06-16 13:21:11 +02:00
Vicent Llopis	55e123e795	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-16 11:45:08 +02:00
Alex Moreno	cf01c8d46e	refs #5475 feat(account_changePassword)	2023-06-16 09:35:20 +02:00
Carlos Satorres	0eca606de0	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-06-16 07:29:30 +00:00
Carlos Satorres	fbe4441eda	refs #4764 e2e solve	2023-06-16 09:06:25 +02:00
Alex Moreno	50fe53fbb6	Merge branch 'test' into warnFix_ticket_sale_orderBy	2023-06-16 05:38:14 +00:00
Carlos Satorres	9b950cd8d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-16 07:23:41 +02:00
Alexandre Riera	73133778fc	Merge branch 'dev' into 5513-back-embalaje	2023-06-16 05:07:16 +00:00
Carlos Satorres	7bff915a7f	refs #5325 back fix correct	2023-06-15 17:14:34 +02:00
Carlos Satorres	4157e30d4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-15 16:47:33 +02:00
Alex Moreno	b96f0f22b5	refs #5475 feat(account_changePassword)	2023-06-15 15:16:51 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Vicent Llopis	55990869e2	refs #5688 ya no muestra mensaje de error	2023-06-15 14:16:26 +02:00
Vicent Llopis	b7b6f413ba	refs #5688 feat: no mostrar datos si no tiene workerCenterFk	2023-06-15 14:15:22 +02:00
Vicent Llopis	192f4c7864	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter	2023-06-15 14:15:00 +02:00
Juan Ferrer	1c666cd48e	refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm	2023-06-15 13:10:44 +02:00
Carlos Satorres	8b832c68b3	refs #5325 fix back	2023-06-15 12:49:53 +02:00
Alex Moreno	71651b96a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 11:49:40 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Vicent Llopis	5f2c5c5f9d	refs #5842 delete console.log	2023-06-15 09:55:32 +02:00
Vicent Llopis	a50de4e509	refs #5842 feat: comprueba que invoiceDate no sea null	2023-06-15 09:50:46 +02:00
Alex Moreno	a206f64e3c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:27:04 +02:00
Vicent Llopis	14ebcf96c0	refs #5842 refactor: change names	2023-06-15 07:24:17 +02:00
Sergio De la torre	1f454e6219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 07:22:10 +02:00
Carlos Satorres	b3022d0ce2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-14 17:47:56 +02:00
Carlos Satorres	9cdc914a25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-14 17:03:09 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Vicent Llopis	7fa4eabf86	refs #5842 fix: recalcula invoiceDate cuando se cambia la company	2023-06-14 14:59:18 +02:00
Sergio De la torre	e8b98a2daf	Merge branch 'dev' into 5651-packingSiteAdvanced	2023-06-14 11:18:24 +00:00
Vicent Llopis	98b270b885	refs #5528 feat: add back test	2023-06-14 13:05:46 +02:00
Vicent Llopis	9e89167d27	Merge branch 'dev' into 5691-route.index_optimizar	2023-06-14 10:57:58 +00:00
Vicent Llopis	65108943ab	refs #5528 feat: back test	2023-06-14 12:48:14 +02:00
Vicent Llopis	e62a3ce166	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys	2023-06-14 12:39:16 +02:00
Sergio De la torre	c62e6fa0eb	refs #5651 packingSiteAdvanced	2023-06-14 10:51:22 +02:00
Juan Ferrer	961941ecb3	refs #5667 TicketRequest translations added/fixed	2023-06-13 20:52:26 +02:00
Carlos Satorres	66c5eda6f2	refs #5325 remove defaultSearch	2023-06-13 16:08:11 +02:00
Alex Moreno	aeb04efe82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-13 11:49:42 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Vicent Llopis	72b779f5c0	refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro	2023-06-13 10:26:12 +02:00
Vicent Llopis	fa9719de78	refs #5691 feat: cambiado url por data en los crudModel	2023-06-13 08:16:37 +02:00
Vicent Llopis	0aae1732bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-13 07:35:29 +02:00
Vicent Llopis	6f3c28c4a4	refs #5468 refactor: eliminado código obsoleto	2023-06-13 07:34:41 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Juan Ferrer	cc788d7e06	refs #5667 Account translations added	2023-06-12 16:28:47 +02:00
Juan Ferrer	3386af9b17	refs #5667 MailAliasAccount translations added	2023-06-12 16:27:02 +02:00
Carlos Satorres	59642ab3ca	refs #5325 defaultSearch	2023-06-12 15:44:22 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02:00
Carlos Satorres	c9c9b64884	refs #5660 deliveryAssit	2023-06-12 14:57:41 +02:00
Alex Moreno	f113bfbc95	Merge branch 'dev' into test	2023-06-12 12:32:29 +00:00
Carlos Satorres	58bcad7b2d	refs #4764 validator create	2023-06-12 12:42:30 +02:00
Alex Moreno	24b3697ac6	Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:31:25 +00:00
Carlos Satorres	c9bf74dcc4	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-12 09:56:34 +00:00
Alex Moreno	1c39ad873c	resolve dev conflicts	2023-06-12 11:06:45 +02:00
Alex Moreno	22e69e6e91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-12 11:06:27 +02:00
Alex Moreno	5c1b867d05	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
Alexandre Riera	f9129afc17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-12 10:27:18 +02:00
Alexandre Riera	703c224e91	refs #5513 modified-entry email	2023-06-12 10:26:50 +02:00
Alex Moreno	051269d646	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-12 09:11:17 +02:00
Alex Moreno	2c0c0f24b0	reactive	2023-06-12 08:36:19 +02:00
Alex Moreno	1a58424531	refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType	2023-06-12 08:33:31 +02:00
Alexandre Riera	48ee29568d	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-06-12 05:26:28 +00:00
Alex Moreno	d735f142a1	Merge branch 'dev' into 5472-user_passExpired	2023-06-12 05:04:28 +00:00
Carlos Satorres	06d1334e1f	refs #4764 withWarehouse	2023-06-09 14:30:46 +02:00
Carlos Satorres	9ca82a2f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-09 14:23:55 +02:00
Carlos Satorres	61d9e2dcd3	refs #4764 remake refund, back front	2023-06-09 14:19:17 +02:00
Carlos Satorres	9b4c4496b6	Merge branch 'dev' into 5760-changesSMS	2023-06-09 11:16:02 +00:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Pablo Natek	ac67a2606f	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:11:13 +02:00
Carlos Satorres	bdffc0401f	refs #5760 update getChanges, traduccion	2023-06-08 15:29:03 +02:00
Alex Moreno	96d88cdf4b	refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking	2023-06-08 14:42:07 +02:00
Vicent Llopis	f47a049d7a	refs #5244 fix: cambiada descripción erronea	2023-06-08 13:39:21 +02:00
Vicent Llopis	653c37f048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-08 13:12:59 +02:00
Vicent Llopis	7dd5a5ac8e	refs #5244 feat: hereda correctamente	2023-06-08 13:12:30 +02:00
Carlos Satorres	7ea7816800	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy	2023-06-08 12:49:28 +02:00
Juan Ferrer	32a0955c1d	refs #5667 Zone translations fixed	2023-06-08 12:48:14 +02:00
Alex Moreno	3e39564695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-08 12:39:36 +02:00
Vicent Llopis	1e759119db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-08 11:13:07 +02:00
Vicent Llopis	874255f2e5	refs #5244 feat: extiende correctamente	2023-06-08 11:07:57 +02:00
Carlos Satorres	0afc26e20c	refs #5728 remove add, quit e2e	2023-06-08 10:30:03 +02:00
Alex Moreno	5ba8a15316	refs #5809 deploy 232401 dev in test	2023-06-08 10:25:25 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +00:00
Vicent Llopis	0dbd3abd65	refs #5808 fix: corregido el condicional	2023-06-07 15:06:37 +02:00
Vicent Llopis	e2c7a38e82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-06-07 14:18:36 +02:00
Carlos Satorres	a34519f6d0	refs #4764 refundTicket	2023-06-07 14:12:04 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alex Moreno	1240a6b71a	Merge branch 'dev' into 5472-user_passExpired	2023-06-07 11:44:47 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Carlos Satorres	4e08f51848	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 07:16:13 +00:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Alex Moreno	abf454496d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 08:34:55 +02:00
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00:00
Carlos Satorres	cc27d1fa97	refs #5066 fix vehicle res.data	2023-06-07 08:30:37 +02:00
Carlos Satorres	738b04af4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-06-07 08:15:50 +02:00
Carlos Satorres	d09075d490	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 05:57:05 +00:00
Vicent Llopis	3805812aba	fix: backTest	2023-06-07 07:43:44 +02:00
Alexandre Riera	16ad082967	back fixed	2023-06-07 07:36:30 +02:00
Alex Moreno	ac0e7ae32b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 07:08:02 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Vicent Llopis	391dba6d2c	refs #5561 feat: add async functions	2023-06-06 12:15:39 +02:00
Vicent Llopis	024cb1e3f4	refs #5561 feat: permite modificar registros	2023-06-06 11:56:14 +02:00
Carlos Satorres	05111c9268	hotfix test front	2023-06-06 11:43:14 +02:00
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Alexandre Riera	daf85368a0	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-06-06 08:40:07 +00:00
Alexandre Riera	6e4d7e8b01	refs #5749 added id	2023-06-06 10:31:08 +02:00
Alexandre Riera	36b0216640	refs #5513 changed tests description	2023-06-06 07:40:38 +02:00
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00:00
Carlos Satorres	4d333c3a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-05 10:38:59 +02:00
Vicent Llopis	5eac9d20dc	a	2023-06-05 09:43:39 +02: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
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00
Carlos Satorres	d8f5978284	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 08:30:12 +02:00
Carlos Satorres	c1cda1a3ff	refs #5334 basicData e2e	2023-06-05 08:29:56 +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
Juan Ferrer	47c6ad6a71	refs #5667 Translation fix	2023-06-02 15:48:27 +02:00
Juan Ferrer	45eba4533a	refs #5667 VnUser translation added	2023-06-02 15:47:45 +02:00
Juan Ferrer	5be79bbdef	refs #5667 VnUser translations added	2023-06-02 15:31:36 +02:00
Alex Moreno	86cd5f5237	refs #5472 fix sync	2023-06-02 15:07:02 +02:00
Carlos Satorres	1095a59954	refs #5334 rest back, e2e summary, less e2e basic	2023-06-02 14:44:56 +02:00
Vicent Llopis	67413360c6	refs #5561 feat: utilizar métodos bd	2023-06-02 13:31:41 +02:00
Vicent Llopis	01175a4c6c	quitado vn	2023-06-02 12:32:34 +02:00
Vicent Llopis	186ec2ea41	fix sendMail: sustituido modelo Journey por BusinessSchedule	2023-06-02 12:22:27 +02:00
Vicent Llopis	ba64dbbe46	refs #5561 refactor: actualizados nombres	2023-06-02 12:20:29 +02:00
Juan Ferrer	c05d6bb9a1	refs #5563 WorkerDocument translation fixes	2023-06-02 11:43:44 +02:00
Vicent Llopis	02d2afcb8b	refs #5561 feat: permite coloear todos los circulos	2023-06-02 10:57:28 +02:00
Alexandre Riera	37bbc66ca4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-06-02 09:39:46 +02:00
Juan Ferrer	95715763a1	refs #5667 Worker translations added/fixed	2023-06-02 08:57:22 +02:00
Vicent Llopis	cf2bf0a17b	refs #5561 delete: codigo obsoleto	2023-06-02 08:23:44 +02:00
Carlos Satorres	5f72fabf8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-02 08:21:14 +02:00
Carlos Satorres	04780e211d	refs #5334 test front & 1/2 back	2023-06-01 16:03:55 +02:00
Vicent Llopis	d727ea83ab	refs # 5561 feat: cambiar url del crud-model	2023-06-01 15:31:16 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Vicent Llopis	0d85069e0f	refs #5561 feat: permite colorear	2023-06-01 15:01:38 +02:00
Carlos Satorres	bb5247c49b	refs #5334 tree	2023-06-01 14:19:50 +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	69bf26433d	fix(workerLog): acl to hr	2023-06-01 13:19:34 +02:00
Carlos Satorres	f37c66304f	refs #5334 change info	2023-06-01 12:00:15 +02:00
Carlos Satorres	4c7c7f5c96	refs #5334 mod search-panel	2023-06-01 11:30:28 +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
Vicent Llopis	d5aae8f824	refs #5688 refactor: muestra un mensaje de error controlado	2023-05-31 14:53:31 +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
Vicent Llopis	3b4626ee74	a	2023-05-31 13:01:16 +02:00
Carlos Satorres	eb6953a2b6	refs #5334 department	2023-05-31 12:50:02 +02:00
Vicent Llopis	02665ec8e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-05-31 12:28:13 +02:00
Carlos Satorres	d1a61b3e0d	refs #5334 dinamic	2023-05-31 12:26:49 +02:00
Carlos Satorres	489012886b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-31 12:04:26 +02:00
Carlos Satorres	e38bf4f1b3	refs #5334 button delete, btn popover	2023-05-31 12:02:22 +02:00
Alex Moreno	9ebac5a3f8	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-05-31 09:40:32 +00:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Carlos Satorres	0774a94d8b	refs #5334 params	2023-05-31 11:24:11 +02:00
Carlos Satorres	d18137bce0	refs #5066 not dense	2023-05-31 10:20:13 +02:00
Vicent Llopis	a539abf3d8	refs #5244 feat: creado back para buscar trabjadores por name. nickname y code	2023-05-31 10:15:16 +02:00
Carlos Satorres	cfe0ba7a77	Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-05-31 10:04:36 +02:00
Carlos Satorres	dfebb3b307	refs #5066 sorted without CONCAT, order=false	2023-05-31 10:04:34 +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
Carlos Satorres	0fd7f4183e	refs #5334 fk	2023-05-30 15:36:39 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Vicent Llopis	daeed312d0	refs #5244 fix: añadido vn-drop-down em html	2023-05-30 15:16:15 +02:00
Carlos Satorres	1dcaba1fdc	refs #5334 department workers list	2023-05-30 15:13:16 +02:00
Vicent Llopis	6cf1e0953d	refs #5244 feat: intento de crear el componente workerAutocomplete	2023-05-30 14:49:28 +02:00
Carlos Satorres	26187898e1	refs #5334 popover	2023-05-30 14:02:34 +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
Carlos Satorres	8860c77147	refs #5334 fix descriptor	2023-05-30 13:21:57 +02:00
Carlos Satorres	45085cccc8	refs #5334 fix search-panel	2023-05-30 12:54:51 +02:00
Carlos Satorres	813c4ede00	Merge branch 'dev' into 5066-vehicleSorted	2023-05-30 10:22:49 +00:00
Carlos Satorres	eaffd61579	Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-05-30 12:21:47 +02:00
Carlos Satorres	0661bf8fa9	refs #5066 remake sql without ROW_ORDER	2023-05-30 12:21:44 +02:00
Carlos Satorres	e7d25a6cf3	refs #5334 filter	2023-05-30 12:08:45 +02:00
Carlos Satorres	e26eedb51c	refs #5334 descriptor wprkerFk clientFk	2023-05-30 11:54:14 +02:00
Vicent Llopis	4f9dae3522	refs #5468 fix: no muestra el id de contrato en worker/calendar	2023-05-30 11:52:04 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Carlos Satorres	cf632040e7	refs #5334 workFk, clientFk	2023-05-30 11:48:39 +02: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
Carlos Satorres	2778858705	refs #5334 search-panel	2023-05-30 10:27:49 +02:00
Alexandre Riera	e05d3b0793	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-05-30 08:27:35 +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
Carlos Satorres	107d8d1edd	refs #5334 model y vista	2023-05-30 10:13:49 +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
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
Carlos Satorres	d9a64211de	refs #5334 fix descriptor, basic-data, summary	2023-05-30 09:16:02 +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	8fff3989e7	Merge branch 'dev' into 5066-vehicleSorted	2023-05-30 06:30:48 +00:00
Vicent Llopis	27700bd72c	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-30 06:14:48 +00:00
Carlos Satorres	9ee653dbd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-30 08:05:17 +02:00
Carlos Satorres	2d6f0bb2ce	refs #5334 front fix	2023-05-29 15:27:50 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Carlos Satorres	f4e877dada	refs #5334 refactor summary	2023-05-29 14:46:39 +02:00
Carlos Satorres	3423ce612c	refs #5066 e2e fixs, change name sorted	2023-05-29 13:49:32 +02: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
Carlos Satorres	d8e7c2700a	refs #5066 fix autocomplete	2023-05-29 12:42:27 +02:00
Vicent Llopis	d2355412a0	Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas	2023-05-29 08:59:20 +00:00
Carlos Satorres	2e83d91006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted	2023-05-29 10:24:19 +02: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
Carlos Satorres	2a78a912eb	refs #5334 worker.department	2023-05-26 14:35:12 +02:00
Carlos Satorres	3aa5ce6208	refs #5334 fix hasToSendMail	2023-05-26 14:23:34 +02:00
Carlos Satorres	ceaaece007	refs #5334 label-value	2023-05-26 14:08:37 +02:00
Carlos Satorres	07e176ae4f	refs #5334 fix checks basic-data	2023-05-26 13:25:49 +02:00
Carlos Satorres	f74c370446	refs #5334 checks vertical	2023-05-26 13:15:47 +02:00
Alex Moreno	0789804352	refs #5334 fix basic-data	2023-05-26 12:58:03 +02:00
Alex Moreno	2b06c62876	refs #5334 left-menu	2023-05-26 12:21:15 +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	027d45bc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-26 11:47:04 +02:00
Carlos Satorres	10e085ca1b	refs #5334 link department	2023-05-26 11:43:51 +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
Vicent Llopis	c9b4c68b0c	refs #5468 refactor: actualizada vista	2023-05-23 13:41:13 +02:00
Carlos Satorres	4f5bd95d21	refs #5639 order	2023-05-23 13:23:46 +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	b7e3e9fa71	refs #5468 feat: add testBack	2023-05-23 13:08:10 +02:00
Vicent Llopis	db55c3e81b	refs #5468 fix: fornt test	2023-05-23 12:49:34 +02:00
Vicent Llopis	191fe4ebf6	refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'	2023-05-23 12:40:49 +02:00
Carlos Satorres	e2bea16e68	refs #5639 select country, paymethod	2023-05-23 12:31:02 +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
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
Vicent Llopis	96163cb07f	refs #5468 feat: update acls	2023-05-23 10:43:46 +02:00
Vicent Llopis	cd244daf84	refs #5468 feat: checkbox 'activo' marcado por defecto	2023-05-23 10:04:31 +02:00
Vicent Llopis	6135a8f576	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 10:03:40 +02:00
Vicent Llopis	4bed88faf5	refs #5468 fix: e2e test	2023-05-23 09:44:07 +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
Vicent Llopis	9426ff204f	refs #5468 fix: testFront	2023-05-23 09:12:27 +02:00
Carlos Satorres	0c673e43bc	refs #5639 smart-tabla defaulter	2023-05-23 09:02:05 +02:00
Vicent Llopis	aea39dd0b7	refs #5468 feat: modificalos acl de VnUser	2023-05-23 08:45:03 +02:00
Alexandre Riera	bf8d82f3c6	refs #5581 refresh model	2023-05-23 08:43:31 +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
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
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +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
Vicent Llopis	b65ebc6af3	refs #5468 feat: cambiados acls	2023-05-23 07:09:51 +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
Carlos Satorres	5e651d7b8c	Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim	2023-05-22 14:30:06 +02:00
Carlos Satorres	6d147e7af7	refs #5648 fix spaces	2023-05-22 14:30:04 +02:00
Carlos Satorres	6093cb4794	Merge branch 'dev' into 5648-sureClaim	2023-05-22 10:26:57 +00:00
Carlos Satorres	9bc20493fe	#refs #5648 e2e fix	2023-05-22 12:02:07 +02:00
Carlos Satorres	1b19035d8d	refs #5648 vn-confirm	2023-05-22 10:41:02 +02:00
Alex Moreno	ddab59a10c	refs #5472 refactor(changePassword): convert in async	2023-05-22 09:17:40 +02:00
Carlos Satorres	e9222dbcb7	Merge branch 'dev' into 5689-fixedPricesSize	2023-05-22 06:31:51 +00:00
Carlos Satorres	23287e5ebf	refs #5648 setTimeout	2023-05-22 08:30:23 +02:00
Carlos Satorres	32ce0c1a1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim	2023-05-22 08:13:31 +02:00
Juan Ferrer	69b892f2fd	refs #5667 Translations	2023-05-20 16:59:39 +02:00
Vicent Llopis	8eedba8a66	refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa	2023-05-19 13:34:07 +02:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Vicent Llopis	5ec107188c	refs #5609 feat: no deja buscar si no tiene un filtro de fecha	2023-05-19 10:30:36 +02:00
Vicent Llopis	8cf988b7d2	refs #5638 refactor: code	2023-05-19 08:02:17 +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
Carlos Satorres	2b1e951692	refs #5635 smart-table	2023-05-18 15:33:54 +02:00
Alexandre Riera	58c25786a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-18 14:52:33 +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
Alex Moreno	f54d9180b1	fix front test	2023-05-18 14:44:05 +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
Alex Moreno	15a1965a53	refs #5094 add scopes	2023-05-18 14:12:46 +02:00
Vicent Llopis	ec02972efb	refs #5609 mostrar filtro por defecto	2023-05-18 14:11:29 +02:00
Carlos Satorres	814568f2a9	refs #5297 errors solve, trad	2023-05-18 13:11:17 +02:00
Alexandre Riera	2591d2d115	refs #3628 added check & date-picker	2023-05-18 11:42:22 +02:00
Alexandre Riera	4bcb461d36	refs #3628 added check & date-picker	2023-05-18 11:41:46 +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	02451818ef	typo	2023-05-17 14:31:19 +02:00
Carlos Satorres	69a25d8d03	refs #5696 horas a 00	2023-05-17 14:04:13 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Carlos Satorres	c31eee4906	refs #5696 landed	2023-05-17 13:35:55 +02:00
Carlos Satorres	60bfb1b079	refs #5689 fix pixels	2023-05-17 12:53:18 +02:00
Juan Ferrer	0d51987d47	refs #5667 Client sample translations	2023-05-17 12:41:25 +02:00
Alexandre Riera	0d980334b8	refs #5634 conditional merge	2023-05-17 12:41:00 +02:00
Juan Ferrer	f9fdf80350	refs #5667 Item translations added	2023-05-17 12:06:31 +02:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Carlos Satorres	adafd7444b	refs #5334 worker-department	2023-05-17 10:04:44 +02:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Carlos Satorres	f63dd0f9a3	refs #5334 datos	2023-05-17 09:05:28 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Carlos Satorres	5c9ee21cfc	refs #5334 department.card	2023-05-16 14:00:05 +02:00
Carlos Satorres	9f9963af56	refs #5334 descriptor	2023-05-16 13:10:26 +02:00
Carlos Satorres	d09889b08a	refs #5334 fix summary route	2023-05-16 12:12:25 +02:00
Carlos Satorres	3dcdbe0223	refs #5334 summary basic data	2023-05-16 11:41:42 +02:00
Carlos Satorres	612d0a2dfb	refs #5334 fix index	2023-05-16 09:52:48 +02:00
Carlos Satorres	fd4d04756a	refs #5334 routes index fix	2023-05-16 08:54:54 +02:00
Alexandre Riera	d4e2049bc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:49 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	443821b5c2	refs #5334 ?q	2023-05-15 13:59:54 +02:00
Carlos Satorres	071849065a	refs #5334 fix main	2023-05-15 13:55:35 +02:00
Carlos Satorres	598067f757	refs #5334 routes	2023-05-15 13:15:33 +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
Carlos Satorres	87e1caa4eb	refs #5334 department seccion	2023-05-15 10:43:06 +02:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +02:00
Carlos Satorres	8a6881bf73	refs #4764 mod tabindex	2023-05-12 15:50:32 +02:00
Carlos Satorres	ce62b51b29	refs #4764 remove br	2023-05-12 15:08:04 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +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
Carlos Satorres	9cbf3006a0	refs #5599 futureState	2023-05-12 11:17:51 +02:00
Vicent Llopis	3f26072787	refs #5468 eliminados getters a VnUser	2023-05-12 09:02:55 +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
Vicent Llopis	b10f90fbe1	refs #5468 a la seccion privileges se le pasa el parametro user	2023-05-11 15:25:37 +02:00
Vicent Llopis	2ed99426ef	eliminado focus	2023-05-11 10:18:02 +02:00
Vicent Llopis	90b844062d	refs #5327 add frontTest	2023-05-11 10:17:41 +02:00
Vicent Llopis	59f4b63db7	borrado espacio	2023-05-11 10:04:59 +02:00
Vicent Llopis	a7fcd8a1bf	changes	2023-05-11 10:04:15 +02:00
Vicent Llopis	f00643505d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-05-11 10:03:07 +02:00
Vicent Llopis	8ed17d99c3	refs #5327 permite filtrar por columnas (desde el front)	2023-05-11 10:02:45 +02:00
Alex Moreno	7704256079	master to test	2023-05-11 08:00:49 +02:00
Carlos Satorres	43a91194fd	refs #5599 remove e2e	2023-05-10 15:59:29 +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
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
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
Carlos Satorres	f4be69c85c	refs #5599 select state.classColor	2023-05-10 11:55:56 +02:00
Carlos Satorres	61d6f47162	refs #5599 remove returns	2023-05-10 11:31:58 +02:00
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +02:00
Carlos Satorres	65646d3b65	refs #4764 validServices	2023-05-09 19:49:16 +02:00
Carlos Satorres	212b848131	refs #4764 check selectedvalidservices	2023-05-09 19:43:55 +02:00
Carlos Satorres	aa96f1eb97	refs #4764 without checkbox	2023-05-09 19:42:25 +02:00
Carlos Satorres	78f337c6d4	refs 4764 quit index	2023-05-09 14:56:32 +02:00
Carlos Satorres	5c8e635509	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-05-09 13:38:04 +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
Alexandre Riera	b37bde2ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-09 08:14:42 +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
Juan Ferrer	2aaded4ed4	refs #5517 Fix: Show spinner when loading	2023-05-08 16:30:21 +02:00
Carlos Satorres	0b2c91466e	refs #5648 create vn-confirm	2023-05-08 13:25:42 +02:00
Alex Moreno	ebbc860ba3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 12:03:53 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +02:00
Carlos Satorres	202544565e	refs #4764 mod query post	2023-05-08 11:36:52 +02:00
Alex Moreno	7273dd4f1e	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-08 08:56:06 +00: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	372b9a2ce2	refs #5513 test getItemsPackaging	2023-05-08 09:46:56 +02:00
Alexandre Riera	d21b949ffb	refs #5513 fix getItemsPackaging	2023-05-08 09:18:53 +02:00
Carlos Satorres	0acb7906cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-05-08 08:33:37 +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
Juan Ferrer	ea5b032b40	refs #5517 Travel create E2E fixes	2023-05-05 13:00:45 +02:00
Carlos Satorres	c0e13d3339	refs #4754 del ticket.card.service	2023-05-05 12:00:37 +02:00
Carlos Satorres	80ee73a59b	refs #4764 creacion de métodos y back	2023-05-05 10:01:15 +02:00
Carlos Satorres	8119d38414	Merge branch 'dev'	2023-05-05 09:35:39 +02:00
Juan Ferrer	805e678ca7	Merge branch 'dev' into 5517-e2eFix	2023-05-05 08:14:13 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Alex Moreno	2da4289695	refs #5472 feat(vn-user): override change-password & set-password	2023-05-04 15:01:29 +02:00
Vicent Llopis	404acdab6f	refs #5638 fix: solucionado problema con el limit	2023-05-04 14:51:47 +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
Juan Ferrer	677764f302	refs #5517 Fix e2e	2023-05-04 10:00:21 +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
Alex Moreno	1fa5926c17	Merge branch 'dev' into client_use_account_setPassword	2023-05-04 07:06:44 +00:00
Alex Moreno	b2027fddf3	fix(client): use account setPassword	2023-05-03 14:56:14 +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	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Alexandre Riera	4c0ec6faf5	changedModel sms	2023-05-02 14:26:47 +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
Alexandre Riera	13c37e88ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-02 11:38:07 +02:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Carlos Satorres	5436eec63e	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-05-02 10:00:50 +02:00
Carlos Satorres	8156c17c7d	refs #5540 del jasmine	2023-05-02 10:00:47 +02:00
Alexandre Riera	c2de5c5ff4	refs #4797 added redirection section	2023-05-02 07:28:59 +02:00
Javi Gallego	ed6b2cf25b	refs #5615	2023-05-01 14:57:50 +02:00
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Carlos Satorres	fb59371d54	refs #5540 quit logs	2023-04-28 14:38:49 +02:00
Carlos Satorres	0e0db960af	refs #5540 supplier	2023-04-28 14:23:44 +02:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Carlos Satorres	c0deb745d6	refs #5540 arreglo en supplier	2023-04-28 14:03:21 +02:00
Carlos Satorres	38142c121d	refs #5540 mods client	2023-04-28 12:12:26 +02:00
Alex Moreno	e00edf0266	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-04-28 12:06:45 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Carlos Satorres	cdbbec9d36	refs #5540 validate	2023-04-28 10:21:54 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Carlos Satorres	b8f7f7bd69	refs #5540 create validateIban	2023-04-28 09:07:06 +02:00
Juan Ferrer	2cfd2d9dda	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-27 18:13:24 +02:00
Vicent Llopis	87ffd2668e	refs #5468 scope para VnUser	2023-04-27 15:06:05 +02:00
Vicent Llopis	1597f7ab69	refs #5468 permitir acceso al módulo 'Usuarios'	2023-04-27 15:05:41 +02:00
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00:00
Pablo Natek	51624882e8	Merge branch 'dev' into 4795-client_getDebt	2023-04-27 12:05:12 +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
Carlos Satorres	d15a671359	refs #5540 traduccion	2023-04-27 11:40:42 +02:00
Carlos Satorres	07148f6c29	refs #5540 mon message	2023-04-27 11:31:26 +02:00
Alexandre Riera	3bd5582794	Merge branch 'dev' into 5255-revisar-ticketBoxing	2023-04-27 08:42:21 +00:00
Carlos Satorres	f8f4e14351	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 10:40:01 +02:00
Carlos Satorres	dd4d0bca84	refs #5540 delete tinIsValid, solve test back, e2e	2023-04-27 10:39:58 +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
Pablo Natek	990bfc63a8	Merge branch 'dev' into 4795-client_getDebt	2023-04-26 16:10:39 +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
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
Alex Moreno	c62f8e1c14	refs #5297 feat(worker): iban and bankEntity not required	2023-04-26 12:13:14 +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
Alexandre Riera	1219cfcc5c	refs #5255 fixed condition	2023-04-26 12:03:17 +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	b25071f52b	refs #5316 solve e2e	2023-04-26 11:40:18 +02:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Carlos Satorres	899ef23541	refs #084200 test back solve	2023-04-26 10:03:01 +02:00
Vicent Llopis	d6ff61b768	refs #5468 corregidas condiciones de autorización	2023-04-26 09:48:02 +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	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
Alexandre Riera	edb1e2197c	Merge branch 'master' into hotfix-negativeBases	2023-04-25 06:23:08 +00:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Carlos Satorres	40da3dfe52	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 12:53:28 +00:00
Carlos Satorres	08e890d6d9	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 12:40:57 +00:00
Carlos Satorres	1088422360	refs #4764 boton abonar y datos	2023-04-24 13:14:38 +02:00
Juan Ferrer	a053764122	refs #5517 E2E fixes	2023-04-24 12:59:56 +02:00
Alex Moreno	8502b74dee	feat(): replace hasRole to checkAccessAcl	2023-04-24 11:07:04 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Carlos Satorres	4473cc11c7	Merge branch 'dev' into 5439-inheritRole	2023-04-24 08:43:19 +00:00
Carlos Satorres	210bd949d2	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 08:38:06 +00:00
Carlos Satorres	1717f03ccc	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 07:38:06 +00:00
Vicent Llopis	4983aa1632	refs #5542 fix backTest	2023-04-24 09:11:09 +02:00
Carlos Satorres	5ec0cd962d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-04-24 09:04:33 +02:00
Vicent Llopis	9b432bac85	refs #5542 fix: test	2023-04-24 08:57:10 +02:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Carlos Satorres	cd4f66e292	refs #5540 arreglar e2e	2023-04-24 08:48:35 +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
Alex Moreno	ef12fdf889	Merge branch 'dev' into 5575-tercerDecimalLatest	2023-04-24 06:02:34 +00:00
Alex Moreno	5e33395534	Merge branch 'dev' into 5436-mensajeClienteSinCorreo	2023-04-24 06:02:00 +00:00
Vicent Llopis	5b7ca82509	Merge branch 'dev' into 5318-deviceProductionLog_toSalix	2023-04-24 04:58:30 +00:00
Alexandre Riera	6609f96f92	Merge branch 'master' into hotfix-negativeBases	2023-04-21 12:56:15 +00: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	e24366707b	refactor: añadido focus a la seccion usuarios	2023-04-21 14:26:12 +02:00
Vicent Llopis	2b74ab43ae	refactor front	2023-04-21 14:12:53 +02:00
Vicent Llopis	9f04581862	refs #5542 "importar reclamacion" crea un registro en ticketRefund	2023-04-21 14:00:28 +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	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	a9caa92f5c	refs #4764 boton abonar	2023-04-21 12:46:01 +02:00
Carlos Satorres	397d8f658e	refs #5540 error trad	2023-04-21 10:41:50 +02:00
Vicent Llopis	83f71cdd36	refactor: mostrar en columnas visibles 'Frágil'	2023-04-21 10:31:23 +02:00
Vicent Llopis	5af961ac69	fix: maneja si se elimina la sale	2023-04-21 09:53:21 +02:00
Alexandre Riera	af1ad7e08c	fixed e2e	2023-04-21 09:47:34 +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
Juan Ferrer	9694a35343	refs #5517 Added: Tests, filter panel, model and props titles	2023-04-20 19:46:57 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Carlos Satorres	33c296c34d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole	2023-04-20 14:31:46 +02:00
Vicent Llopis	ec9a5722c2	refs #5128 añadido icono de grafana	2023-04-20 13:58:49 +02:00
Carlos Satorres	d6e6dab03b	Merge branch 'dev'	2023-04-20 11:55:52 +02:00
Carlos Satorres	b4183c2698	refs #5436 mod de error	2023-04-20 11:33:28 +02:00
Carlos Satorres	c103eeab7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo	2023-04-20 10:40:22 +02:00
Carlos Satorres	237c83c6f5	refs #5066 getVehicleSorted small mod	2023-04-20 10:20:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Carlos Satorres	b45b0ff826	refs #5066 copy project from the other	2023-04-20 08:23:46 +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
Alexandre Riera	84c2512847	refs #5293 open lilium in the same page	2023-04-20 07:51:25 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Vicent Llopis	f6bf92b74b	refs #5128 intentando poner icono grafana	2023-04-19 15:21:59 +02:00
Vicent Llopis	6fbb734a34	quitado salto de linea	2023-04-19 14:43:23 +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	5ace66ebca	refs #5318 fix e2e	2023-04-19 09:54:54 +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
Carlos Satorres	a559c1f648	refs #5575 mod3Decimal	2023-04-19 09:02:04 +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	6f2aa0f618	Worker note ACL	2023-04-18 14:51:48 +02:00
Joan Sanchez	c3443ecc7c	Updated e2e	2023-04-18 14:37:20 +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
Joan Sanchez	a5f6991511	continue	2023-04-18 10:18:44 +02:00
Joan Sanchez	aabc4ec58d	fix(consumption): continue queue if client mailing fails	2023-04-18 10:08:04 +02:00
Alexandre Riera	28a7722bb6	Merge branch 'dev' into 5518-log-user-role	2023-04-18 08:01:42 +00:00
Joan Sanchez	fded7d062b	section fix	2023-04-18 09:49:23 +02:00
Vicent Llopis	b3e7cedd1e	refs #5128 borrada línea por error	2023-04-18 09:49:12 +02:00
Vicent Llopis	c5225cb632	refs #5128 borrado código innecesario	2023-04-18 09:23:19 +02:00
Vicent Llopis	48cd23750e	refs #5128 add testBack	2023-04-18 09:09:09 +02: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
Joan Sanchez	6d593a0937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2	2023-04-18 08:32:22 +02:00
Pablo Natek	3636543f73	refs #5075	2023-04-18 08:19:23 +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
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
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
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
Carlos Satorres	d399cda050	refs #5316 quitar comment	2023-04-17 10:34:08 +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	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +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
Carlos Satorres	af8603185c	refs #5439 inheritedRole	2023-04-17 08:35:44 +02: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	2af48b3049	refs #4480 Fix: VnUser before save hook removed -> setting password attribute	2023-04-15 01:51:38 +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
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +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
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
Carlos Satorres	a2ddbd8a66	refs #5284 test update	2023-04-13 14:04:10 +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
Carlos Satorres	90268a79b0	refs #5284 test createClaim	2023-04-13 13:41:10 +02:00
Vicent Llopis	2ada64e1bf	refs #5517 eliminadas traducciones duplicadas	2023-04-13 08:49:50 +02:00
Alexandre Riera	71e202d586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro	2023-04-13 08:45:05 +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
Carlos Satorres	ad267c933c	refs #5540 country.code	2023-04-13 08:30:33 +02:00
Pablo Natek	9594bd68b5	refs #4795	2023-04-12 21:10:50 +02:00
Juan Ferrer	7e1d6f4339	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-12 15:33:23 +00:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Carlos Satorres	60103fa80a	refs #5540 validacion nif	2023-04-12 14:39:40 +02:00
Carlos Satorres	ef6e85532e	refs #5213 cambios e2e, descriptor	2023-04-12 14:20:05 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +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	1456da58f5	refs #5075	2023-04-11 15:41:45 +02:00
Pablo Natek	c928274e24	Merge branch 'dev' into 5075-client_balance	2023-04-11 13:19:54 +00:00
Carlos Satorres	1ce2705869	refs #5316 last kkentry	2023-04-11 15:04:49 +02:00
Vicent Llopis	d03ca01b73	refs #5128 añadida subseccion "Gestión de crédito"	2023-04-11 14:57:56 +02:00
Pablo Natek	ccf26c5413	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-11 11:56:33 +00:00
Pablo Natek	1770b8c038	refs #5075	2023-04-11 13:42:28 +02:00
Carlos Satorres	d21ab7a5a7	refs #5316 primer kkeo	2023-04-11 10:32:21 +02:00
Vicent Llopis	ec03c6edfa	fix intermittent backTest	2023-04-11 10:23:33 +02:00
Alexandre Riera	161fc25c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-11 10:01: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	5732f9a33b	Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ... Reviewed-on: #1407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:07:55 +00:00
Joan Sanchez	fe0d861dc0	Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev ... Reviewed-on: #1418 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:06:04 +00:00
Vicent Llopis	cd6a6f65b3	Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-04-11 07:45:20 +02:00
Vicent Llopis	cc9ce65678	test	2023-04-11 07:44:25 +02:00
Vicent Llopis	ba31613ac9	Merge branch 'dev' into 5275-item.fixed-price_refactor	2023-04-06 09:58:07 +00:00
Carlos Satorres	b3f946e15f	Merge branch 'dev' into 5250-observacionesWorker	2023-04-06 08:32:05 +00:00
Vicent Llopis	d9ae24c927	Merge branch 'dev' into 4856-worker.time-control_2	2023-04-06 08:08:10 +00:00
Vicent Llopis	8a297469d6	refs #4856 añadido myOptions	2023-04-06 10:06:29 +02:00
Vicent Llopis	faab024e24	test	2023-04-06 09:59:45 +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
Alexandre Riera	5cbc826281	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:16:00 +00:00
Joan Sanchez	b71ad207ff	Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ... Reviewed-on: #1420 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:07:35 +00:00
Joan Sanchez	a8af280de5	Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev ... Reviewed-on: #1406 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:05:18 +00:00
Vicent Llopis	041590e541	refs #4856 maneja errores y notifica a los jefes	2023-04-06 08:54:12 +02:00
Vicent Llopis	6fc2867551	permite decimales	2023-04-06 08:05:37 +02:00
Alexandre Riera	c823a0d6f1	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 05:44:33 +00:00
Vicent Llopis	a44a640d15	refs #4856 manejo errores	2023-04-05 15:14:42 +02:00
Vicent Llopis	6a0bca1a94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-05 14:06:33 +02:00
David Domenech	44d4df9c21	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-05 11:00:08 +00:00
Carlos Satorres	8741a9f913	Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra	2023-04-05 06:51:21 +00:00
Carlos Satorres	7d3c6a98f3	refs #5439 search panel solve	2023-04-05 08:48:15 +02:00
Vicent Llopis	fb5969a120	refs #5275 add test	2023-04-05 08:43:47 +02: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
Vicent Llopis	e97b5a9f80	refs #5275 fix backTest	2023-04-05 07:54:56 +02:00
Vicent Llopis	28a12d0706	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor	2023-04-05 07:36:53 +02:00
Carlos Andrés	e342852ed8	Merge branch 'master' into 5529-invoicingFixes	2023-04-04 13:05:49 +00:00
Carlos Andrés	0372d44415	fixes #5529 Fixes: missing awaits, buffer-to-file	2023-04-04 15:00:28 +02:00
Alexandre Riera	eed1ecc208	refs #4954 trigger modified	2023-04-04 14:47:13 +02:00
Vicent Llopis	35d19e586a	add translatiojn	2023-04-04 14:27:16 +02:00
Vicent Llopis	7a274e2721	Merge branch 'dev' into 5410-client.defaulter_getChecked	2023-04-04 12:12:20 +00:00
Vicent Llopis	3630c7d398	refs #5410 creada ruta de back para enviar emails	2023-04-04 14:09:55 +02:00
Joan Sanchez	c126c6044a	Updated format	2023-04-04 13:55:44 +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	9380b88460	refs #5437 back and test deprecated	2023-04-04 12:40:03 +02:00
Vicent Llopis	0bfa4c54aa	fix: inserta en workerTimeControlMail	2023-04-04 09:52:46 +02:00
Alexandre Riera	1a14c793cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-04 09:47:31 +02:00
Vicent Llopis	0db3bc5e26	refs #4856 fix test	2023-04-04 09:29:51 +02:00
Vicent Llopis	21b7050cfd	refs #4856 otros usuarios pueden actualizar el estado	2023-04-04 09:29:40 +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
Vicent Llopis	d1100384bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2	2023-04-04 08:27:27 +02:00
Vicent Llopis	862101c4b0	refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador	2023-04-03 21:29:02 +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
Vicent Llopis	67689695e4	refs #5275 filtra por defecto por el this.vnConfig.warehouseFk	2023-03-30 14:29:19 +02:00
Vicent Llopis	e1bfdc3f3c	eliminada variable que no se usa	2023-03-30 11:13:40 +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
Carlos Satorres	4edb2463b8	refs #5250 eliminacion isEnabled	2023-03-30 08:23:53 +02:00
Vicent Llopis	5a67f47305	refs #4856 fix: actualizar estado a 'SENDED' movido al back	2023-03-30 08:14:17 +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	cafb21d90b	Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev ... Reviewed-on: #1384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-30 05:21:24 +00:00
Joan Sanchez	26bddef5e5	Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev ... Reviewed-on: #1394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:50 +00:00
Joan Sanchez	ea60e31361	Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev ... Reviewed-on: #1396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:28 +00:00