diff --git a/REST/functions.php b/REST/functions.php
index 3aba624e..65abfbd7 100644
--- a/REST/functions.php
+++ b/REST/functions.php
@@ -257,9 +257,8 @@ function createCSVReports()
     CASE p.group_ks
         WHEN 1 THEN 'Towar handlowy'
         WHEN 2 THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
         ELSE 'Nieznane'
     END AS group_ks,
     GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
@@ -297,9 +296,8 @@ ORDER BY i.register_date DESC;
     CASE p.group_ks
         WHEN 1 THEN 'Towar handlowy'
         WHEN 2 THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
         ELSE 'Nieznane'
     END AS group_ks,
     GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
@@ -331,80 +329,76 @@ ORDER BY i.register_date DESC;
 SELECT
     i.document_no,
     i.register_date,
-    i.parent_name,
     p.code,
     p.name,
     CASE p.group_ks
         WHEN 1 THEN 'Towar handlowy'
         WHEN 2 THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
         ELSE 'Nieznane'
-    END AS group_ks,
+        END AS group_ks,
     GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
-    ii.quantity,
-    ii.price_netto
-FROM ecommerce_invoices AS i
-INNER JOIN ecommerce_invoices_products AS ii ON i.id = ii.invoice_id
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
-    AND cb.bean_name = 'EcmProducts' 
+    s.name AS stock,
+    ii.quantity
+FROM ecmstockdocinsideouts AS i
+         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
     AND cb.deleted = 0
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2024
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE YEAR(i.register_date) = 2025
 GROUP BY
     i.document_no,
     i.register_date,
-    i.parent_name,
     p.code,
     p.name,
     p.group_ks,
-    ii.quantity,
-    ii.price_netto
+    s.name,
+    ii.quantity
 ORDER BY i.register_date DESC;
             ",
-                'filename' => 'ecommerce_invoices_2024.csv',
+                'filename' => 'rw_2025.csv',
             ],
             [
                 'sql'      => "
 SELECT
     i.document_no,
     i.register_date,
-    i.parent_name,
     p.code,
     p.name,
     CASE p.group_ks
         WHEN 1 THEN 'Towar handlowy'
         WHEN 2 THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
+        WHEN 3 THEN 'Surowiec'
+        WHEN 4 THEN 'Usługa'
         ELSE 'Nieznane'
-    END AS group_ks,
+        END AS group_ks,
     GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
-    ii.quantity,
-    ii.price_netto
-FROM ecommerce_invoices AS i
-INNER JOIN ecommerce_invoices_products AS ii ON i.id = ii.invoice_id
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
-    AND cb.bean_name = 'EcmProducts' 
+    s.name AS stock,
+    ii.quantity
+FROM ecmstockdocinsideouts AS i
+         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+    AND cb.bean_name = 'EcmProducts'
     AND cb.deleted = 0
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2025
+         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+WHERE YEAR(i.register_date) = 2024
 GROUP BY
     i.document_no,
     i.register_date,
-    i.parent_name,
     p.code,
     p.name,
     p.group_ks,
-    ii.quantity,
-    ii.price_netto
+    s.name,
+    ii.quantity
 ORDER BY i.register_date DESC;
             ",
-                'filename' => 'ecommerce_invoices_2025.csv',
+                'filename' => 'rw_2024.csv',
             ],
             [
                 'sql'      => "