diff --git a/queries.py b/queries.py
index 8201586..dabcabd 100644
--- a/queries.py
+++ b/queries.py
@@ -34,7 +34,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
 WHERE f.sters = 0
   AND f.tip > 0
-  AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 GROUP BY f.id_part, p.denumire, p.cod_fiscal
@@ -62,7 +62,7 @@ SELECT * FROM (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part, p.denumire, p.cod_fiscal
@@ -95,7 +95,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_articole art ON d.id_articol = art.id_articol
 LEFT JOIN vgest_art_sbgr sg ON art.id_subgrupa = sg.id_subgrupa
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 GROUP BY sg.id_grupa, sg.grupa, art.id_subgrupa, sg.subgrupa
@@ -125,7 +125,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 GROUP BY CASE
@@ -158,7 +158,7 @@ WITH preturi_detalii AS (
     LEFT JOIN nom_articole a ON d.id_articol = a.id_articol
     LEFT JOIN gest_art_sbgr g ON a.id_subgrupa = g.id_subgrupa
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
       AND d.pret > 0
@@ -200,7 +200,7 @@ WITH base_prices AS (
                                      AND d.id_valuta = c.id_valuta
     JOIN NOM_PARTENERI p ON f.id_part = p.id_part
     WHERE f.sters = 0 AND d.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
       AND d.pret > 0
@@ -250,7 +250,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
 LEFT JOIN nom_articole art ON d.id_articol = art.id_articol
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
   AND d.pret_achizitie > 0
@@ -279,7 +279,7 @@ WITH vanzari_perioade AS (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part, p.denumire
@@ -317,7 +317,7 @@ WITH total_vanzari AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
 ),
@@ -332,7 +332,7 @@ vanzari_client AS (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part, p.denumire
@@ -388,7 +388,7 @@ JOIN VANZARI_DETALII d ON d.id_vanzare = f.id_vanzare
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
 WHERE f.sters = 0 AND d.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
 GROUP BY TO_CHAR(f.data_act, 'YYYY-MM')
@@ -542,7 +542,7 @@ WITH base_data AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0 AND d.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
 ),
@@ -625,7 +625,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_articole a ON d.id_articol = a.id_articol
 LEFT JOIN gest_art_sbgr g ON a.id_subgrupa = g.id_subgrupa
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 GROUP BY d.id_articol, NVL2(d.id_articol, a.denumire, d.explicatie), g.subgrupa, a.um
@@ -654,7 +654,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_gestiuni g ON d.id_gestiune = g.id_gestiune
 JOIN nom_articole a ON d.id_articol = a.id_articol
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
   AND NVL(a.in_stoc, 1) = 1
@@ -687,7 +687,7 @@ JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
 LEFT JOIN nom_articole art ON d.id_articol = art.id_articol
 LEFT JOIN vgest_art_sbgr sg ON art.id_subgrupa = sg.id_subgrupa
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
   AND NVL(art.in_stoc, 0) = 0
@@ -1026,7 +1026,7 @@ WITH metrici AS (
          FROM vanzari f
          JOIN vanzari_detalii d ON d.id_vanzare = f.id_vanzare AND d.sters = 0
          WHERE f.sters = 0
-           AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+           AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
            AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta) AS cogs_12_luni,
         -- Creanțe clienți
@@ -1138,7 +1138,7 @@ WITH vanzari_detaliate AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 ),
@@ -1174,7 +1174,7 @@ WITH vanzari_lunare AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
     GROUP BY EXTRACT(MONTH FROM f.data_act), TO_CHAR(f.data_act, 'Month', 'NLS_DATE_LANGUAGE=ROMANIAN'), EXTRACT(YEAR FROM f.data_act)
@@ -1216,21 +1216,21 @@ PORTOFOLIU_CLIENTI = """
 WITH clienti_activi_3_luni AS (
     SELECT /*+ INDEX(f IDX_VANZARI_NR) */ COUNT(DISTINCT f.id_part) AS cnt
     FROM vanzari f
-    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -3)
       AND f.data_act < :data_referinta
 ),
 clienti_activi_12_luni AS (
     SELECT /*+ INDEX(f IDX_VANZARI_NR) */ COUNT(DISTINCT f.id_part) AS cnt
     FROM vanzari f
-    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
 ),
 clienti_noi AS (
     SELECT /*+ INDEX(f IDX_VANZARI_NR) */ COUNT(DISTINCT f.id_part) AS cnt
     FROM vanzari f
-    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
       AND f.id_part NOT IN (
@@ -1243,7 +1243,7 @@ clienti_noi AS (
 clienti_pierduti AS (
     SELECT /*+ INDEX(f IDX_VANZARI_NR) */ COUNT(DISTINCT f.id_part) AS cnt
     FROM vanzari f
-    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -6)
@@ -1257,7 +1257,7 @@ clienti_pierduti AS (
 clienti_inactivi AS (
     SELECT /*+ INDEX(f IDX_VANZARI_NR) */ COUNT(DISTINCT f.id_part) AS cnt
     FROM vanzari f
-    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+    WHERE f.sters = 0 AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -6)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -3)
@@ -1296,7 +1296,7 @@ WITH frecventa_curenta AS (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part, p.denumire
@@ -1307,7 +1307,7 @@ frecventa_anterioara AS (
         COUNT(DISTINCT f.id_vanzare) AS comenzi_an_anterior
     FROM vanzari f
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -12)
@@ -1342,7 +1342,7 @@ WITH total_vanzari AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
 ),
@@ -1356,7 +1356,7 @@ vanzari_client AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part
@@ -1415,7 +1415,7 @@ WITH vanzari_client AS (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part, p.denumire
@@ -1460,7 +1460,7 @@ LEFT JOIN nom_parteneri p ON f.id_part = p.id_part
 LEFT JOIN nom_articole art ON d.id_articol = art.id_articol
 LEFT JOIN vgest_art_sbgr sg ON art.id_subgrupa = sg.id_subgrupa
 WHERE f.sters = 0
-  AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+  AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
   AND f.data_act >= ADD_MONTHS(:data_referinta, -:months)
   AND f.data_act < :data_referinta
 GROUP BY f.id_part, p.denumire, sg.id_grupa, sg.grupa
@@ -1483,7 +1483,7 @@ WITH preturi_vechi AS (
                                      AND d.id_valuta = c.id_valuta
     LEFT JOIN nom_articole a ON d.id_articol = a.id_articol
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -6)
@@ -1500,7 +1500,7 @@ preturi_noi AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -6)
       AND f.data_act < :data_referinta
       AND d.pret > 0
@@ -1563,7 +1563,7 @@ vanzari_calc AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
 )
@@ -2103,7 +2103,7 @@ vanzari_curente AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
 ),
@@ -2137,7 +2137,7 @@ vanzari_anterioare AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -12)
@@ -2214,7 +2214,7 @@ vanzari_curent AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -12)
       AND f.data_act < :data_referinta
     GROUP BY f.id_part
@@ -2241,7 +2241,7 @@ vanzari_anterior AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
       AND f.data_act < ADD_MONTHS(:data_referinta, -12)
@@ -2342,7 +2342,7 @@ WITH base_data AS (
     LEFT JOIN VANZARI_CURSURI c ON d.id_vanzare = c.id_vanzare
                                      AND d.id_valuta = c.id_valuta
     WHERE f.sters = 0 AND d.sters = 0
-      AND f.tip > 0 AND f.tip NOT IN (7, 8, 9, 24)
+      AND f.tip > 0 AND f.tip NOT IN (21, 22, 23, 24, 25)
       AND f.data_act >= ADD_MONTHS(:data_referinta, -24)
       AND f.data_act < :data_referinta
 )