Merge remote-tracking branch 'origin' into feat-pedidos

2025-12-11 10:08:12 -03:00
parent 864226256a 6b4cdb7497
commit bd0ac0a3b4
194 changed files with 30374 additions and 10247 deletions
--- a/packages/backend/convex/tables/funcionarios.ts
+++ b/packages/backend/convex/tables/funcionarios.ts
@@ -35,7 +35,9 @@ export const funcionariosTables = {
 		simboloId: v.id('simbolos'),
 		simboloTipo: simboloTipo,
 		gestorId: v.optional(v.id('usuarios')),
-		statusFerias: v.optional(v.union(v.literal('ativo'), v.literal('em_ferias'))),
+		statusFerias: v.optional(
+			v.union(v.literal('ativo'), v.literal('em_ferias'), v.literal('em_licenca'))
+		),

 		// Regime de trabalho (para cálculo correto de férias)
 		regimeTrabalho: v.optional(