update bimai export

REST/bimai.php

@@ -30,7 +30,7 @@ function bimai_exportEcommerceDate($since)
       AND YEAR(i.register_date) = 2024
       AND i.register_date > '$sinceDate'
     ORDER BY i.register_date
-    LIMIT 0,5;
+    LIMIT 0,10000;
 ";
 
     $db = $GLOBALS['db'];
@@ -59,6 +59,6 @@ function bimai_exportEcommerceDate($since)
         $data[] = $d;
     }
 
-    echo json_encode(array('ok' => true, 'data' => $data));
+    echo json_encode(array('ok' => true, 'dataSize' => count($data), 'data' => $data));
     return true;
 }

REST/functions.php

@@ -323,81 +323,97 @@ function createCSVReports()
         $jobs = [
             [
                 'sql'      => "
-                SELECT
+SELECT
     i.document_no,
     i.register_date,
     i.parent_name,
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
         WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
         WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-    END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
     ii.quantity,
-    ii.price_netto
+    ii.price_netto,
+    COALESCE(cur.name, 'PLN') AS currency_name
 FROM ecminvoiceouts AS i
-INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+INNER JOIN ecminvoiceoutitems AS ii
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecminvoiceout_id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
+       AND ii.deleted = 0
-    AND cb.bean_name = 'EcmProducts' 
+INNER JOIN ecmproducts AS p
-    AND cb.deleted = 0
+        ON ii.ecmproduct_id = p.id
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+       AND p.deleted = 0
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2024
+LEFT JOIN currencies AS cur
+        ON cur.id = i.currency_id
+       AND cur.deleted = 0
+LEFT JOIN ecmproductcategories_bean AS cb
+       ON cb.bean_id = p.id
+      AND cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+LEFT JOIN ecmproductcategories AS c
+       ON c.id = cb.ecmproductcategory_id
+      AND c.deleted = 0
+WHERE i.type = 'normal'
+  AND i.register_date BETWEEN '2024-01-01' AND '2024-12-31'
+  AND i.deleted = 0
 GROUP BY
-    i.document_no,
+    i.id,
-    i.register_date,
+    ii.id
-    i.parent_name,
+ORDER BY
-    p.code,
+    i.register_date DESC;
-    p.name,
-    p.group_ks,
-    ii.quantity,
-    ii.price_netto
-ORDER BY i.register_date DESC;
             ",
                 'filename' => 'invoices_2024.csv',
             ], // invoices 2024
             [
                 'sql'      => "
-                SELECT
+SELECT
     i.document_no,
     i.register_date,
     i.parent_name,
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
         WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
         WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-    END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
     ii.quantity,
-    ii.price_netto
+    ii.price_netto,
+    COALESCE(cur.name, 'PLN') AS currency_name
 FROM ecminvoiceouts AS i
-INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+INNER JOIN ecminvoiceoutitems AS ii
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecminvoiceout_id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
+       AND ii.deleted = 0
-    AND cb.bean_name = 'EcmProducts' 
+INNER JOIN ecmproducts AS p
-    AND cb.deleted = 0
+        ON ii.ecmproduct_id = p.id
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+       AND p.deleted = 0
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2025
+LEFT JOIN currencies AS cur
+        ON cur.id = i.currency_id
+       AND cur.deleted = 0
+LEFT JOIN ecmproductcategories_bean AS cb
+       ON cb.bean_id = p.id
+      AND cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+LEFT JOIN ecmproductcategories AS c
+       ON c.id = cb.ecmproductcategory_id
+      AND c.deleted = 0
+WHERE i.type = 'normal'
+  AND i.register_date BETWEEN '2025-01-01' AND '2025-12-31'
+  AND i.deleted = 0
 GROUP BY
-    i.document_no,
+    i.id,
-    i.register_date,
+    ii.id
-    i.parent_name,
+ORDER BY
-    p.code,
+    i.register_date DESC;
-    p.name,
-    p.group_ks,
-    ii.quantity,
-    ii.price_netto
-ORDER BY i.register_date DESC;
             ",
                 'filename' => 'invoices_2025.csv',
             ], // invoices 2025
@@ -412,39 +428,38 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-        END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
-    ii.quantity_corrected AS quantity_correced,
+    ii.quantity_corrected AS quantity_corrected,
-    ii.total_netto_corrected AS total_netto_corrected
+    ii.total_netto_corrected AS total_netto_corrected,
+    COALESCE(cur.name, 'PLN') AS currency_name
 FROM ecminvoiceouts AS i
-         INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+INNER JOIN ecminvoiceoutitems AS ii
-         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecminvoiceout_id AND ii.deleted = 0
-         INNER JOIN ecminvoiceouts AS oi ON oi.id = i.ecminvoiceout_id
+INNER JOIN ecmproducts AS p
-         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+        ON ii.ecmproduct_id = p.id AND p.deleted = 0
-    AND cb.bean_name = 'EcmProducts'
+LEFT JOIN ecminvoiceouts AS oi
-    AND cb.deleted = 0
+        ON oi.id = i.ecminvoiceout_id AND oi.deleted = 0
-         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+LEFT JOIN currencies AS cur
-WHERE i.type = 'correct' AND YEAR(i.register_date) = 2024
+       ON cur.id = i.currency_id AND cur.deleted = 0
+LEFT JOIN ecmproductcategories_bean AS cb
+       ON cb.bean_id = p.id
+      AND cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+LEFT JOIN ecmproductcategories AS c
+       ON c.id = cb.ecmproductcategory_id AND c.deleted = 0
+WHERE i.type = 'correct'
+  AND i.register_date BETWEEN '2024-01-01' AND '2024-12-31'
+  AND i.deleted = 0
 GROUP BY
-    i.document_no,
+    i.id,
-    i.register_date,
+    ii.id,
-    oi.document_no,
+    oi.id
-    oi.register_date,
+ORDER BY i.register_date DESC;
-    i.parent_name,
-    p.code,
-    p.name,
-    p.group_ks,
-    ii.quantity,
-    ii.price_netto,
-    ii.quantity_corrected,
-    ii.total_netto_corrected
-ORDER BY i.register_date DESC;   
             ",
                 'filename' => 'correct_invoices_2024.csv',
             ], // correct invoices 2024
@@ -459,38 +474,37 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
-        WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
-        WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-        END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
-    ii.quantity_corrected AS quantity_correced,
+    ii.quantity_corrected AS quantity_corrected,
-    ii.total_netto_corrected AS total_netto_corrected
+    ii.total_netto_corrected AS total_netto_corrected,
+    COALESCE(cur.name, 'PLN') AS currency_name
 FROM ecminvoiceouts AS i
-         INNER JOIN ecminvoiceoutitems AS ii ON i.id = ii.ecminvoiceout_id
+INNER JOIN ecminvoiceoutitems AS ii
-         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecminvoiceout_id AND ii.deleted = 0
-         INNER JOIN ecminvoiceouts AS oi ON oi.id = i.ecminvoiceout_id
+INNER JOIN ecmproducts AS p
-         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+        ON ii.ecmproduct_id = p.id AND p.deleted = 0
-    AND cb.bean_name = 'EcmProducts'
+LEFT JOIN ecminvoiceouts AS oi
-    AND cb.deleted = 0
+        ON oi.id = i.ecminvoiceout_id AND oi.deleted = 0
-         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+LEFT JOIN currencies AS cur
-WHERE i.type = 'correct' AND YEAR(i.register_date) = 2025
+       ON cur.id = i.currency_id AND cur.deleted = 0
+LEFT JOIN ecmproductcategories_bean AS cb
+       ON cb.bean_id = p.id
+      AND cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+LEFT JOIN ecmproductcategories AS c
+       ON c.id = cb.ecmproductcategory_id AND c.deleted = 0
+WHERE i.type = 'correct'
+  AND i.register_date BETWEEN '2025-01-01' AND '2025-12-31'
+  AND i.deleted = 0
 GROUP BY
-    i.document_no,
+    i.id,
-    i.register_date,
+    ii.id,
-    oi.document_no,
+    oi.id
-    oi.register_date,
-    i.parent_name,
-    p.code,
-    p.name,
-    p.group_ks,
-    ii.quantity,
-    ii.price_netto,
-    ii.quantity_corrected,
-    ii.total_netto_corrected
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'correct_invoices_2025.csv',
@@ -504,33 +518,37 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
         WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
         WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-    END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    pc.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 ecommerce_invoices_products AS ii
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.invoice_id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
+INNER JOIN ecmproducts AS p
-    AND cb.bean_name = 'EcmProducts' 
+        ON ii.ecmproduct_id = p.id
-    AND cb.deleted = 0
+LEFT JOIN (
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+    SELECT
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2024
+        cb.bean_id AS product_id,
-GROUP BY
+        GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category
-    i.document_no,
+    FROM ecmproductcategories_bean AS cb
-    i.register_date,
+    INNER JOIN ecmproductcategories AS c
-    i.parent_name,
+            ON c.id = cb.ecmproductcategory_id
-    p.code,
+           AND c.deleted = 0
-    p.name,
+    WHERE cb.bean_name = 'EcmProducts'
-    p.group_ks,
+      AND cb.deleted = 0
-    ii.quantity,
+    GROUP BY cb.bean_id
-    ii.price_netto
+) AS pc
+       ON pc.product_id = p.id
+WHERE i.type = 'normal'
+  AND i.register_date >= '2024-01-01'
+  AND i.register_date <  '2025-01-01'
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'ecommerce_invoices_2024.csv',
@@ -544,33 +562,37 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Usługi'
+        WHEN '3' THEN 'Usługi'
         WHEN '530547ef-2dea-7622-843b-59d745b14c64' THEN 'Materiały'
         WHEN '8451dded-710f-51c2-7ed1-60a377eaa7b7' THEN 'Surowce'
         ELSE 'Nieznane'
-    END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    pc.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 ecommerce_invoices_products AS ii
-INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.invoice_id
-LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci 
+INNER JOIN ecmproducts AS p
-    AND cb.bean_name = 'EcmProducts' 
+        ON ii.ecmproduct_id = p.id
-    AND cb.deleted = 0
+LEFT JOIN (
-LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+    SELECT
-WHERE i.type = 'normal' AND YEAR(i.register_date) = 2025
+        cb.bean_id AS product_id,
-GROUP BY
+        GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category
-    i.document_no,
+    FROM ecmproductcategories_bean AS cb
-    i.register_date,
+    INNER JOIN ecmproductcategories AS c
-    i.parent_name,
+            ON c.id = cb.ecmproductcategory_id
-    p.code,
+           AND c.deleted = 0
-    p.name,
+    WHERE cb.bean_name = 'EcmProducts'
-    p.group_ks,
+      AND cb.deleted = 0
-    ii.quantity,
+    GROUP BY cb.bean_id
-    ii.price_netto
+) AS pc
+       ON pc.product_id = p.id
+WHERE i.type = 'normal'
+  AND i.register_date >= '2025-01-01'
+  AND i.register_date <  '2026-01-01'
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'ecommerce_invoices_2025.csv',
@@ -595,32 +617,40 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Surowiec'
+        WHEN '3' THEN 'Surowiec'
-        WHEN 4 THEN 'Usługa'
+        WHEN '4' THEN 'Usługa'
         ELSE 'Nieznane'
-        END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    pc.category,
     s.name AS stock,
     ii.quantity
 FROM ecmstockdocinsideouts AS i
-         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+INNER JOIN ecmstockdocinsideoutitems AS ii
-         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecmstockdocinsideout_id
-         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+       AND ii.deleted = 0
-         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+INNER JOIN ecmproducts AS p
-    AND cb.bean_name = 'EcmProducts'
+        ON ii.ecmproduct_id = p.id
-    AND cb.deleted = 0
+       AND p.deleted = 0
-         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+INNER JOIN ecmstocks AS s
-WHERE YEAR(i.register_date) = 2025
+        ON i.stock_id = s.id
-GROUP BY
+       AND s.deleted = 0
-    i.document_no,
+LEFT JOIN (
-    i.register_date,
+    SELECT
-    p.code,
+        cb.bean_id AS product_id,
-    p.name,
+        GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category
-    p.group_ks,
+    FROM ecmproductcategories_bean AS cb
-    s.name,
+    INNER JOIN ecmproductcategories AS c
-    ii.quantity
+            ON c.id = cb.ecmproductcategory_id
+           AND c.deleted = 0
+    WHERE cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+    GROUP BY cb.bean_id
+) AS pc
+       ON pc.product_id = p.id
+WHERE i.deleted = 0
+  AND i.register_date BETWEEN '2025-01-01' AND '2025-12-31'
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'rw_2025.csv',
@@ -633,32 +663,40 @@ SELECT
     p.code,
     p.name,
     CASE p.group_ks
-        WHEN 1 THEN 'Towar handlowy'
+        WHEN '1' THEN 'Towar handlowy'
-        WHEN 2 THEN 'Wyrób gotowy'
+        WHEN '2' THEN 'Wyrób gotowy'
-        WHEN 3 THEN 'Surowiec'
+        WHEN '3' THEN 'Surowiec'
-        WHEN 4 THEN 'Usługa'
+        WHEN '4' THEN 'Usługa'
         ELSE 'Nieznane'
-        END AS group_ks,
+    END AS group_ks_name,
-    GROUP_CONCAT(c.name ORDER BY cb.position SEPARATOR ' | ') AS category,
+    pc.category,
     s.name AS stock,
     ii.quantity
 FROM ecmstockdocinsideouts AS i
-         INNER JOIN ecmstockdocinsideoutitems AS ii ON i.id = ii.ecmstockdocinsideout_id
+INNER JOIN ecmstockdocinsideoutitems AS ii
-         INNER JOIN ecmproducts AS p ON ii.ecmproduct_id = p.id
+        ON i.id = ii.ecmstockdocinsideout_id
-         INNER JOIN ecmstocks AS s ON i.stock_id = s.id
+       AND ii.deleted = 0
-         LEFT JOIN ecmproductcategories_bean AS cb ON cb.bean_id COLLATE utf8_general_ci = p.id COLLATE utf8_general_ci
+INNER JOIN ecmproducts AS p
-    AND cb.bean_name = 'EcmProducts'
+        ON ii.ecmproduct_id = p.id
-    AND cb.deleted = 0
+       AND p.deleted = 0
-         LEFT JOIN ecmproductcategories AS c ON c.id = cb.ecmproductcategory_id
+INNER JOIN ecmstocks AS s
-WHERE YEAR(i.register_date) = 2024
+        ON i.stock_id = s.id
-GROUP BY
+       AND s.deleted = 0
-    i.document_no,
+LEFT JOIN (
-    i.register_date,
+    SELECT
-    p.code,
+        cb.bean_id AS product_id,
-    p.name,
+        GROUP_CONCAT(DISTINCT c.name ORDER BY cb.position SEPARATOR ' | ') AS category
-    p.group_ks,
+    FROM ecmproductcategories_bean AS cb
-    s.name,
+    INNER JOIN ecmproductcategories AS c
-    ii.quantity
+            ON c.id = cb.ecmproductcategory_id
+           AND c.deleted = 0
+    WHERE cb.bean_name = 'EcmProducts'
+      AND cb.deleted = 0
+    GROUP BY cb.bean_id
+) AS pc
+       ON pc.product_id = p.id
+WHERE i.deleted = 0
+  AND i.register_date BETWEEN '2024-01-01' AND '2024-12-31'
 ORDER BY i.register_date DESC;
             ",
                 'filename' => 'rw_2024.csv',

index.php

@@ -1,4 +1,5 @@
 <?php
+// die('Przerwa techniczna. Michał Zieliński');
 if(!defined('sugarEntry'))define('sugarEntry', true);
 
 $SHOW_ERRORS = false; // set to true to show errors, false to hide them

modules/EcmDocumentTemplates/metadata/tmp/SearchFields.php

@@ -1,47 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- ********************************************************************************/
-$searchFields['Documents'] = 
-	array (
-		'document_name' => array( 'query_type'=>'default'),
-        'category_id'=> array('query_type'=>'default', 'options' => 'document_category_dom', 'template_var' => 'CATEGORY_OPTIONS'),
-        'subcategory_id'=> array('query_type'=>'default', 'options' => 'document_subcategory_dom', 'template_var' => 'SUBCATEGORY_OPTIONS'),
-		'active_date'=> array('query_type'=>'default'),
-		'exp_date'=> array('query_type'=>'default'),
-        
-       
-	);
-?>

modules/EcmDocumentTemplates/metadata/tmp/editviewdefs.php

@@ -1,121 +0,0 @@
-<?php
-/*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- ********************************************************************************/
-$viewdefs['Documents']['EditView'] = array(
-    'templateMeta' => array('form' => array('enctype'=>'multipart/form-data',
-                                            'hidden'=>array('<input type="hidden" name="old_id" value="{$fields.document_revision_id.value}">',
-                                            				'<input type="hidden" name="parent_id" value="{$smarty.request.parent_id}">',
-                                            				'<input type="hidden" name="parent_type" value="{$smarty.request.parent_type}">',)),
-                                            
-                            'maxColumns' => '2', 
-                            'widths' => array(
-                                            array('label' => '10', 'field' => '30'), 
-                                            array('label' => '10', 'field' => '30')
-                                            ),
-'javascript' => '<script type="text/javascript" src="include/javascript/popup_parent_helper.js?s={$SUGAR_VERSION}&c={$JS_CUSTOM_VERSION}"></script>
-<script type="text/javascript" src="include/jsolait/init.js?s={$SUGAR_VERSION}&c={$JS_CUSTOM_VERSION}"></script>
-<script type="text/javascript" src="include/jsolait/lib/urllib.js?s={$SUGAR_VERSION}&c={$JS_CUSTOM_VERSION}"></script>
-<script type="text/javascript" src="include/javascript/jsclass_base.js"></script>
-<script type="text/javascript" src="include/javascript/jsclass_async.js"></script>
-<script type="text/javascript" src="modules/Documents/documents.js?s={$SUGAR_VERSION}&c={$JS_CUSTOM_VERSION}"></script>',
-),
- 'panels' =>array (
-  'default' => 
-  array (
-    
-    array (
-      'document_name',
-    ),
-    
-    array (
-
-      array('name'=>'uploadfile', 
-            'customCode' => '<input type="hidden" name="escaped_document_name"><input name="uploadfile" type="{$FILE_OR_HIDDEN}" size="30" maxlength="" onchange="setvalue(this);" value="{$fields.filename.value}">{$fields.filename.value}',
-            'displayParams'=>array('required'=>true),
-            ),
-      array('name'=>'revision',
-            'customCode' => '<input name="revision" type="text" value="{$fields.revision.value}" {$DISABLED}>'
-           ),
-      
-    ),
-    
-    array (
-	    array (
-	      'name' => 'is_template',
-	      'label' => 'LBL_DET_IS_TEMPLATE',
-	    ),
-	    
-	    array (
-	      'name' => 'template_type',
-	      'label' => 'LBL_DET_TEMPLATE_TYPE',
-	    ),
-    ),
-    
-    array (
-       'category_id',
-       'subcategory_id',
-    ),
-    
-    array (
-      'status_id',
-
-
-
-    ),
-    
-    array (
-      array('name'=>'active_date','displayParams'=>array('required'=>true)),
-      'exp_date',
-    ),
-    
-    array (
-      array('name'=>'related_doc_name',
-            'customCode' => '<input name="related_document_name" type="text" size="30" maxlength="255" value="{$RELATED_DOCUMENT_NAME}" readonly>' .
-            		        '<input name="related_doc_id" type="hidden" value="{$fields.related_doc_id.value}"/>&nbsp;' .
-            		        '<input title="{$APP.LBL_SELECT_BUTTON_TITLE}" accessKey="{$APP.LBL_SELECT_BUTTON_KEY}" type="{$RELATED_DOCUMENT_BUTTON_AVAILABILITY}" class="button" value="{$APP.LBL_SELECT_BUTTON_LABEL}" name="btn2" onclick=\'open_popup("Documents", 600, 400, "", true, false, {$encoded_document_popup_request_data}, "single", true);\'/>'),
-      array('name'=>'related_doc_rev_number',
-            'customCode' => '<select name="related_doc_rev_id" id="related_doc_rev_id" {$RELATED_DOCUMENT_REVISION_DISABLED}>{$RELATED_DOCUMENT_REVISION_OPTIONS}</select>',
-           ),
-    ),
-    
-    array (
-      array('name'=>'description', 'displayParams'=>array('rows'=>10, 'cols'=>120)),
-    ),
-  ),
-)
-
-
-);
-?>

modules/EcmDocumentTemplates/metadata/tmp/searchdefs.php

@@ -1,57 +0,0 @@
-<?php
-/*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- ********************************************************************************/
-
-
-  $searchdefs['Documents'] = array(
-                    'templateMeta' => array('maxColumns' => '3', 
-                            'widths' => array('label' => '10', 'field' => '30'), 
-                           ),
-                    'layout' => array(
-                        'basic_search' => array(
-                                'document_name', 
-                                'category_id', 
-                                'subcategory_id',
-                            ),
-                        'advanced_search' => array(
-                                'document_name', 
-                                'category_id', 
-                                'subcategory_id',
-                                'active_date',
-                                'exp_date',
-                        ),
-                    ),
-               );
-?>

modules/EcmDocumentTemplates/metadata/tmp/sidecreateviewdefs.php

@@ -1,77 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- ********************************************************************************/
-global $mod_strings;
-$viewdefs['Documents']['SideQuickCreate'] = array(
-    'templateMeta' => array('form'=>array(
-                                          'enctype'=>'multipart/form-data',
-                                          'buttons'=>array('SAVE'),
-                                          'button_location'=>'bottom',
-                                          'headerTpl'=>'include/EditView/header.tpl',
-                                          'footerTpl'=>'include/EditView/footer.tpl',
-                                          ),
-                            'maxColumns' => '1',
-                            'panelClass'=>'none',
-
-                            'labelsOnTop'=>true,
-                            'widths' => array(
-                                            array('label' => '10', 'field' => '30'),
-                                         ),
-                        ),
- 'panels' =>array (
-  'DEFAULT' =>
-  array (
-    array (
-      array('name'=>'document_name', 'displayParams'=>array('size'=>20, 'required'=>true)),
-    ),
-    array (
-      array('name'=>'uploadfile', 'displayParams'=>array('size'=>11, 'required'=>true)),
-    ),
-    array (
-      array('name'=>'revision', 'displayParams'=>array('size'=>11, 'required'=>true)),
-    ),
-    array (
-      array('name'=>'active_date', 'displayParams'=>array('size'=>11, 'required'=>true)),
-    ),
-
-  ),
-
- )
-
-
-);
-
-?>

modules/EcmDocumentTemplates/metadata/tmp/studio.php

@@ -1,65 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/**
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- */
-
-
-
-$GLOBALS['studioDefs']['Documents'] = array(
-	'LBL_DETAILVIEW'=>array(
-				'template'=>'xtpl',
-				'template_file'=>'modules/Documents/DetailView.html',
-				'php_file'=>'modules/Documents/DetailView.php',
-				'type'=>'DetailView',
-				),
-	'LBL_EDITVIEW'=>array(
-				'template'=>'xtpl',
-				'template_file'=>'modules/Documents/EditView.html',
-				'php_file'=>'modules/Documents/EditView.php',
-				'type'=>'EditView',
-				),
-	'LBL_LISTVIEW'=>array(
-				'template'=>'listview',
-				'meta_file'=>'modules/Documents/listviewdefs.php',
-				'type'=>'ListView',
-				),
-	'LBL_SEARCHFORM'=>array(
-				'template'=>'xtpl',
-				'template_file'=>'modules/Documents/SearchForm.html',
-				'php_file'=>'modules/Documents/ListView.php',
-				'type'=>'SearchForm',
-				),
-
-);

modules/EcmDocumentTemplates/metadata/tmp/subpaneldefs.php

@@ -1,70 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/**
- * Layout definition for Quotes
- *
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- */
- 
-
-
-$layout_defs['Documents'] = array(
-	// list of what Subpanels to show in the DetailView 
-	'subpanel_setup' => array(
-		'therevisions' => array(
-			'order' => 10,
-			'sort_order' => 'desc',
-			'sort_by' => 'revision',			
-			'module' => 'DocumentRevisions',
-			'subpanel_name' => 'default',
-			'title_key' => 'LBL_DOC_REV_HEADER',
-			'get_subpanel_data' => 'revisions',
-			'fill_in_additional_fields'=>true,
-		),
-
-
-
-
-
-
-
-
-
-
-
-
-
-	),
-);
-?>

modules/EcmDocumentTemplates/metadata/tmp/subpanels/ForContractType.php

@@ -1,90 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/**
- * Subpanel Layout definition for Bugs
- *
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- */
-
-// $Id$
-$subpanel_layout = array(
-	'top_buttons' => array(
-       array('widget_class' => 'SubPanelTopCreateButton'),
-	   array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'Documents','field_to_name_array'=>array('document_revision_id'=>'REL_ATTRIBUTE_document_revision_id')),
-	),
-
-	'where' => '',
-	
-	
-
-    'list_fields'=> array(
-      'document_name'=> array(
-	    	'name' => 'document_name',
-	 		'vname' => 'LBL_LIST_DOCUMENT_NAME',
-			'widget_class' => 'SubPanelDetailViewLink',
-			'width' => '30%',
-	   ),
-       'is_template'=>array(
- 	    	'name' => 'is_template',
-	 	    'vname' => 'LBL_LIST_IS_TEMPLATE',
-		    'width' => '5%',
-		    'widget_type'=>'checkbox',
-		),
-       'template_type'=>array(
- 	    	'name' => 'template_types',
-	 	    'vname' => 'LBL_LIST_TEMPLATE_TYPE',
-		    'width' => '15%',
-		),		
-       'latest_revision'=>array(
- 	    	'name' => 'latest_revision',
-	 	    'vname' => 'LBL_LATEST_REVISION',
-		    'width' => '10%',
-            'sortable' => false
-		),
-		'edit_button'=>array(
-			'widget_class' => 'SubPanelEditButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),
-		'remove_button'=>array(
-			'widget_class' => 'SubPanelRemoveButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),		
-		'document_revision_id'=>array(
-			'usage'=>'query_only'
-		),
-	),
-);
-?>

modules/EcmDocumentTemplates/metadata/tmp/subpanels/default.php

@@ -1,109 +0,0 @@
-<?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
-/**
- * Subpanel Layout definition for Bugs
- *
- * SugarCRM is a customer relationship management program developed by
- * SugarCRM, Inc. Copyright (C) 2004 - 2007 SugarCRM Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation with the addition of the following permission added
- * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
- * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
- * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, see http://www.gnu.org/licenses or write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- * 
- * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
- * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * SugarCRM" logo. If the display of the logo is not reasonably feasible for
- * technical reasons, the Appropriate Legal Notices must display the words
- * "Powered by SugarCRM".
- */
-
-
-$subpanel_layout = array(
-	'top_buttons' => array(
-       array('widget_class' => 'SubPanelTopCreateButton'),
-	   array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'Documents','field_to_name_array'=>array('document_revision_id'=>'REL_ATTRIBUTE_document_revision_id')),
-	),
-
-	'where' => '',
-	
-	
-
-    'list_fields'=> array(
-		'object_image'=>array(
-			'widget_class' => 'SubPanelIcon',
- 		 	'width' => '2%',
- 		 	'image2'=>'attachment',
- 		 	'image2_url_field'=>array('id_field'=>'selected_revision_id','filename_field'=>'selected_revision_filename'),
- 		 	'attachment_image_only'=>true,
- 		 	
-		),
-      'document_name'=> array(
-	    	'name' => 'document_name',
-	 		'vname' => 'LBL_LIST_DOCUMENT_NAME',
-			'widget_class' => 'SubPanelDetailViewLink',
-			'width' => '30%',
-	   ),
-       'is_template'=>array(
- 	    	'name' => 'is_template',
-	 	    'vname' => 'LBL_LIST_IS_TEMPLATE',
-		    'width' => '5%',
-		    'widget_type'=>'checkbox',
-		),
-       'template_type'=>array(
- 	    	'name' => 'template_types',
-	 	    'vname' => 'LBL_LIST_TEMPLATE_TYPE',
-		    'width' => '15%',
-		),		
-       'selected_revision_name'=>array(
- 	    	'name' => 'selected_revision_name',
-	 	    'vname' => 'LBL_LIST_SELECTED_REVISION',
-		    'width' => '10%',
-		),
-       'latest_revision_name'=>array(
- 	    	'name' => 'latest_revision_name',
-	 	    'vname' => 'LBL_LIST_LATEST_REVISION',
-		    'width' => '10%',
-		),
-		'get_latest'=>array(
-			'widget_class' => 'SubPanelGetLatestButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),
-		'load_signed'=>array(
-			'widget_class' => 'SubPanelLoadSignedButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),		
-		'edit_button'=>array(
-			'widget_class' => 'SubPanelEditButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),
-		'remove_button'=>array(
-			'widget_class' => 'SubPanelRemoveButton',
-		 	'module' => 'Documents',
-			'width' => '5%',
-		),		
-	),
-);
-?>

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/TEMU/temuInvoicesListView.php

@@ -0,0 +1,80 @@
+<?php
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
+ini_set('display_errors', 1);
+
+$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/TEMU/files/10-2025.csv';
+$handle = fopen($filename, 'r');
+if ($handle === false) {
+    die('Cannot open file: ' . $filename);
+}
+
+$invoices = [];
+$documentsNo = [];
+$isFirstRow = true;
+while (($data = fgetcsv($handle, 0, ",")) !== false) {
+    if ($isFirstRow) {
+        $isFirstRow = false;
+        continue;
+    }
+    for ($i = 10; $i <= 20; $i++) {
+        $data[$i] = str_replace(',', '.', $data[$i]);
+    }
+    if ($data[6] != '23%') {
+        die('VAT inny niż 23%! '.$data[6]);
+    }
+    if ($data[21] != 'PLN') {
+        die('Waluta inna niż PLN! '.$data[21]);
+    }
+    if (!isset($invoices[$data[22]])) {
+        $inv = array();
+        $inv['document_no'] = $data[22];
+        $inv['order_no'] = $data[0];
+        $inv['parent_name'] = 'TemuCustomer';
+        $inv['parent_hash'] = substr(md5($inv['parent_name']), 0, 20);
+        $inv['parent_short_name'] = substr($inv['parent_name'], 0, 40);
+        $inv['parent_address_city'] = '';
+        $inv['parent_address_postalcode'] = '';
+        $inv['parent_address_street'] = '';
+        $inv['parent_nip'] = '';
+        $inv['category'] = "Sprzedaż";
+        $inv['register_date'] = $data[3];
+        $inv['sell_date'] = $data[3];
+
+        $inv['total_netto'] = floatval($data[10]) + floatval($data[11]) + floatval($data[12]) + floatval($data[13]);
+        $inv['total_vat'] = floatval($data[20]);
+        $inv['vat_calculated'] = round($inv['total_netto'] * 0.23,2);
+        $inv['total_brutto'] = $inv['total_netto'] + $inv['total_vat'];
+        if (substr($data[22], 0, 2) == 'CN') {
+            $inv['type'] = 'correcting';
+        } else {
+            $inv['type'] = 'normal';
+        }
+    } else {
+        $inv = $invoices[$data[22]];
+        $inv['total_netto'] += floatval($data[10]) + floatval($data[11]) + floatval($data[12]) + floatval($data[13]);
+        $inv['total_vat'] += floatval($data[20]);
+        $inv['vat_calculated'] = round($inv['total_netto'] * 0.23,2);
+        $inv['total_brutto'] = $inv['total_netto'] + $inv['total_vat'];
+    }
+    $invoices[$data[22]] = $inv;
+}
+fclose($handle);
+
+$db = $GLOBALS['db'];
+$db->query("SET NAMES utf8mb4");
+foreach ($invoices as $inv) {
+    $query = sprintf("INSERT INTO ecommerce_invoices VALUES ('%s', '%s', '%s', '%s', '%s', 'temu', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f', '%f', '%f', null, null, null, null, null, null);",
+        getId(), $inv['document_no'], $inv['type'], $inv['register_date'], $inv['sell_date'],
+        $inv['order_no'], 'TemuCustomer', $inv['parent_nip'], null, null, '',
+        '', null, 'PLN', $inv['total_netto'], $inv['total_brutto'], $inv['total_vat']);
+    $res = $db->query($query);
+    if (!$res) {
+        echo "Query error: ".$query.PHP_EOL;
+    }
+}
+
+function getId() {
+    $db = $GLOBALS['db'];
+    $res = $db->fetchByAssoc($db->query("SELECT UUID() as id;"));
+    return $res['id'];
+}

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/B2BReader.php

@@ -9,7 +9,7 @@ DELETE FROM ecommerce_invoices_products WHERE invoice_id IN (
 DELETE FROM ecommerce_invoices WHERE origin='amazon b2b' AND register_date LIKE '2025-09-%';
 */
 
-$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/09-2025.csv';
+$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/10-2025.csv';
 $handle = fopen($filename, 'r');
 if ($handle === false) {
     die('Cannot open file: ' . $filename);

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php

@@ -1,7 +1,7 @@
 <?php
 // https://crm.twinpol.com/?module=EcmInvoiceOuts&action=ecommerce&amazon-wz=true
 
-$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/amazon-wz-09-2025.csv';
+$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/amazon-wz-10-2025.csv';
 $handle = fopen($filename, 'r');
 if ($handle === false) {
     die('Cannot open file: ' . $filename);

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/localVatReader.php

@@ -9,7 +9,7 @@ DELETE FROM ecommerce_invoices_products WHERE invoice_id IN (
 DELETE FROM ecommerce_invoices WHERE origin='amazon vat local' AND register_date LIKE '2025-02-%';
 */
 
-$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/09-2025.csv';
+$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/10-2025.csv';
 $handle = fopen($filename, 'r');
 if ($handle === false) {
     die('Cannot open file: ' . $filename);

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/wdtReader.php

@@ -4,7 +4,7 @@ error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 ini_set('display_errors', 1);
 
 // read csv file tab separated
-$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/09-2025.csv';
+$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/10-2025.csv';
 $handle = fopen($filename, 'r');
 if ($handle === false) {
     die('Cannot open file: ' . $filename);
@@ -31,12 +31,12 @@ fclose($handle);
 //if (count($de) == 0) {
 //    die('No data for DE');
 //}
-//createInvoice('DE', $de);
+//createInvoice('DE', $de, true);
 
 if (count($cz) == 0) {
     die('No data for CZ');
 }
-createInvoice('CZ', $cz, true);
+createInvoice('CZ', $cz, true );
 
 function createInvoice($type, $products, $DO_REAL_SAVE = false)
 {
@@ -57,7 +57,7 @@ function createInvoice($type, $products, $DO_REAL_SAVE = false)
     $invoice->parent_address_city = 'Obrowo';
 
     $invoice->type = 'normal';
-    $date = '31.08.2025';
+    $date = '31.10.2025';
     $invoice->register_date = $date;
     $invoice->sell_date = $date;
     $invoice->validtill_date = $date;

modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/importApiloInvoices.php

@@ -3,27 +3,27 @@
 //error_reporting(LC_ALL);
 //ini_set('display_errors', 1);
 // ?XDEBUG_SESSION_START=PHPSTORM
+//apilo_importInvoices();
+
 function apilo_importInvoices()
 {
     $apilo_config = apilo_loadConfiguration();
     $db = $GLOBALS['db'];
 
-
     $dbRes = $db->query("SELECT COUNT(id) as last_id FROM ecommerce_invoices WHERE origin LIKE 'apilo%'");
     $offset = intval($db->fetchByAssoc($dbRes)['last_id']);
 
     $invoices = apilo_loadInvoices($apilo_config['token'], $offset);
-    brecho($apilo_config);
+    if (isset($invoices->error)) {
-    if (isset($invoices->errors)) {
         if (apilo_refreshToken($apilo_config['refreshToken'], $apilo_config['clientId'], $apilo_config['clientSecret']) == true) {
-            //$apilo_config = apilo_loadConfiguration();
+            $apilo_config = apilo_loadConfiguration();
-            //$invoices = apilo_loadInvoices($apilo_config['token'], $offset);
+            $invoices = apilo_loadInvoices($apilo_config['token'], $offset);
         } else {
             return false;
         }
     }
 
-    brecho($invoices);
+    brecho(count($invoices->documents));
 
     $GLOBALS['log']->bimit('----- Importing invoices from Apilo, documents count', count($invoices->documents));
 
@@ -56,7 +56,7 @@ function apilo_loadInvoices($token, $offset)
     $url = "https://twinpol.apilo.com/rest/api/finance/documents/";
     $params = [
         'type' => 1,
-        'limit' => 50,
+        'limit' => 100,
         'offset' => $offset
     ];
     $url .= '?' . http_build_query($params);
@@ -105,19 +105,19 @@ function apilo_refreshToken($refreshToken, $clientId, $clientSecret)
     $err = curl_error($curl);
     curl_close($curl);
 
-    brecho($response);
+
-    brecho($httpCode);
+    if ($httpCode !== 201) {
-    if ($httpCode !== 200) {
         return false;
     }
     $tokenData = json_decode($response, true);
 
-    brecho($tokenData);
+    var_dump($tokenData);
+
     if (isset($tokenData['accessToken'])) {
         global $db;
-        $db->query("UPDATE config SET value='" . $tokenData['access_token'] . "' WHERE category='apilo' AND name='access_token'");
+        $db->query("UPDATE config SET value='" . $tokenData['accessToken'] . "' WHERE category='apilo' AND name='token'");
-        if (isset($tokenData['refresh_token'])) {
+        if (isset($tokenData['refreshToken'])) {
-            $db->query("UPDATE config SET value='" . $tokenData['refresh_token'] . "' WHERE category='apilo' AND name='refresh_token'");
+            $db->query("UPDATE config SET value='" . $tokenData['refreshToken'] . "' WHERE category='apilo' AND name='refreshToken'");
         }
         return true;
     }

modules/EcmInvoiceOuts/Menu.php

@@ -1,108 +1,60 @@
 <?php
 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*****************************************************************************
-
  * The contents of this file are subject to the RECIPROCAL PUBLIC LICENSE
-
  * Version 1.1 ("License"); You may not use this file except in compliance
-
  * with the License. You may obtain a copy of the License at
-
  * http://opensource.org/licenses/rpl.php. Software distributed under the
-
  * License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
-
  * either express or implied.
-
  *
-
  * You may:
-
  * a) Use and distribute this code exactly as you received without payment or
-
  *    a royalty or other fee.
-
  * b) Create extensions for this code, provided that you make the extensions
-
  *    publicly available and document your modifications clearly.
-
  * c) Charge for a fee for warranty or support or for accepting liability
-
  *    obligations for your customers.
-
  *
-
  * You may NOT:
-
  * a) Charge for the use of the original code or extensions, including in
-
  *    electronic distribution models, such as ASP (Application Service
-
  *    Provider).
-
  * b) Charge for the original source code or your extensions other than a
-
  *    nominal fee to cover distribution costs where such distribution
-
  *    involves PHYSICAL media.
-
  * c) Modify or delete any pre-existing copyright notices, change notices,
-
  *    or License text in the Licensed Software
-
  * d) Assert any patent claims against the Licensor or Contributors, or
-
  *    which would in any way restrict the ability of any third party to use the
-
  *    Licensed Software.
-
  *
-
  * You must:
-
  * a) Document any modifications you make to this code including the nature of
-
  *    the change, the authors of the change, and the date of the change.
-
  * b) Make the source code for any extensions you deploy available via an
-
  *    Electronic Distribution Mechanism such as FTP or HTTP download.
-
  * c) Notify the licensor of the availability of source code to your extensions
-
  *    and include instructions on how to acquire the source code and updates.
-
  * d) Grant Licensor a world-wide, non-exclusive, royalty-free license to use,
-
  *    reproduce, perform, modify, sublicense, and distribute your extensions.
-
  *
-
  * The Original Code is: CommuniCore
-
  *                       Olavo Farias
-
  *                       2006-04-7 olavo.farias@gmail.com
-
  *
-
  * The Initial Developer of the Original Code is CommuniCore.
-
  * Portions created by CommuniCore are Copyright (C) 2005 CommuniCore Ltda
-
  * All Rights Reserved.
-
  ********************************************************************************/
 
-  global $mod_strings, $current_user;
+global $mod_strings, $current_user;
 
-  if(ACLController::checkAccess('EcmInvoiceOuts', "edit", true)) $module_menu [] =	Array("index.php?module=".'EcmInvoiceOuts'."&action=EditView&return_module=".'EcmInvoiceOuts'."&return_action=DetailView", translate('LNK_NEW_'.'ECMQUOTE', 'EcmInvoiceOuts'),"CreateEcmInvoiceOuts", 'EcmInvoiceOuts');
+if (ACLController::checkAccess('EcmInvoiceOuts', "edit", true)) $module_menu [] = array("index.php?module=" . 'EcmInvoiceOuts' . "&action=EditView&return_module=" . 'EcmInvoiceOuts' . "&return_action=DetailView", translate('LNK_NEW_' . 'ECMQUOTE', 'EcmInvoiceOuts'), "CreateEcmInvoiceOuts", 'EcmInvoiceOuts');
 
-  if(ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] =	Array("index.php?module=EcmInvoiceOuts&action=index&return_module=EcmInvoiceOuts&return_action=DetailView", translate('LNK_ECMQUOTES_LIST','EcmInvoiceOuts'),"EcmInvoiceOuts", 'EcmInvoiceOuts');
+if (ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] = array("index.php?module=EcmInvoiceOuts&action=index&return_module=EcmInvoiceOuts&return_action=DetailView", translate('LNK_ECMQUOTES_LIST', 'EcmInvoiceOuts'), "EcmInvoiceOuts", 'EcmInvoiceOuts');
-  if(ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] =	Array("index.php?module=EcmInvoiceOuts&action=Report_INTRASTAT", "Raport INTRASTAT","EcmInvoiceOuts", 'EcmInvoiceOuts');
+if (ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] = array("index.php?module=EcmInvoiceOuts&action=Report_INTRASTAT", "Raport INTRASTAT", "EcmInvoiceOuts", 'EcmInvoiceOuts');
-  
+if (ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] = array("index.php?module=EcmInvoiceOuts&action=ecommerce", "Faktury E-Commerce", "EcmInvoiceOuts", 'EcmInvoiceOuts');
-  if(ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] =	Array("index.php?module=EcmInvoiceOuts&action=ecommerce", "Faktury E-Commerce","EcmInvoiceOuts", 'EcmInvoiceOuts');
+if (ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] = array("index.php?module=EcmInvoiceOuts&action=bimit_invoiceSummary", "Analiza faktur", "EcmInvoiceOuts", 'EcmInvoiceOuts');
-
-  if(ACLController::checkAccess('EcmInvoiceOuts', "list", true)) $module_menu [] =	Array("index.php?module=EcmInvoiceOuts&action=bimit_invoiceSummary", "Analiza faktur","EcmInvoiceOuts", 'EcmInvoiceOuts');

modules/EcmInvoiceOuts/ecommerce.php

@@ -27,6 +27,8 @@ if (isset($_REQUEST['import_baselinker'])) {
     include_once(getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/baselinkerInvoiceDetails.php');
 } else if (isset($_REQUEST['apilo_products'])) {
     include_once(getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/checkApiloProducts.php');
+} else if (isset($_REQUEST['temu'])) {
+    include_once(getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/TEMU/temuInvoicesListView.php');
 } else {
     include_once(getcwd().'/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/ecommerceInvoicesListView.php');
 }

modules/EcmSales/EditView.php

@@ -114,7 +114,7 @@ GROUP BY ip.ecmproduct_id, ip.price_netto;
         foreach($order->products as $product) {
             $prod = $db->fetchByAssoc($db->query("SELECT id, name, code, unit_id FROM ecmproducts WHERE code = '".$product->extCode."' AND deleted = 0"));
             if (!isset($prod)) {
-                echo 'Brak produktu, nie wystawiaj dokumentu! '.$product->extCode.'<br>';
+                echo 'Brak produktu, nie wystawiaj dokumentu! '.$product->extCode.' (Zamówienie: '.$order->orderNumber.')<br>';
             } else {
                 $products[] = array(
                     'product_id' => $prod['id'],