7324 Commits

Author	SHA1	Message	Date
Carlos Satorres	3b1f10d466	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-08-10 10:45:08 +00: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	209cac2a6a	Merge branch 'dev' into 5762-recoverPassword-multiplatform	2023-08-09 13:05:16 +00:00
Carlos Satorres	f70b767506	Merge branch 'dev' into 5976-transferSale_call_setDeleted	2023-08-09 08:05:46 +00: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
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	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
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
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
Alex Moreno	7c0eb16e5b	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-08-03 07:23:59 +00: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
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
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
Vicent Llopis	db992a9b91	Merge branch 'dev' into hotfix_workCenter_isNull	2023-07-31 08:54:37 +00: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
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 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
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	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	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	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