mz/crm.e5.pl
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Update google password

Browse Source
This commit is contained in:
Michał Zieliński
2025-09-17 10:11:11 +00:00
parent 52f306cef9
commit e759b6eb46
3 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
REST/functions.php
View File

@@ -520,7 +520,7 @@ LEFT JOIN (
SUM(i.quantity) AS ordered_quantity
FROM ecmsaleitems AS i
JOIN ecmsales AS es ON es.id = i.ecmsale_id
WHERE es.status IN ('s10','s20','s30')
WHERE es.status IN ('s20','s30')
GROUP BY i.ecmproduct_id
) AS si ON si.ecmproduct_id = ss.product_id
ORDER BY quantity + 0 DESC;",
@@ -535,7 +535,6 @@ ORDER BY quantity + 0 DESC;",
i.price_netto,
es.document_no,
CASE es.status
WHEN 's10' THEN 'Planowany'
WHEN 's20' THEN 'Oczekujący'
WHEN 's30' THEN 'Zaakceptowany'
ELSE 'Nieznane'
@@ -545,13 +544,37 @@ ORDER BY quantity + 0 DESC;",
es.send_date
FROM ecmsaleitems AS i
JOIN ecmsales AS es ON es.id = i.ecmsale_id
WHERE es.status IN ('s10','s20','s30')
WHERE es.status IN ('s20','s30')
AND es.deleted = '0'
AND i.deleted = '0'
ORDER BY es.register_date DESC, i.position;
ORDER BY es.register_date DESC, es.document_no DESC, i.position;
",
'filename' => 'sales.csv',
'filename' => 'zs.csv',
], //sales
[
'sql' => "
SELECT
i.code AS product_code,
i.name AS product_name,
i.quantity,
i.price_start,
es.document_no,
CASE es.status
WHEN 'accepted' THEN 'Zaakceptowany'
WHEN 'registered' THEN 'Zarejestrowany'
ELSE 'Nieznane'
END AS status,
es.register_date,
es.delivery_date
FROM ecmpurchaseorderitems AS i
JOIN ecmpurchaseorders AS es ON es.id = i.ecmpurchaseorder_id
WHERE es.status IN ('accepted','registered')
AND es.deleted = '0'
AND i.deleted = '0'
ORDER BY es.register_date DESC, es.document_no DESC, i.position;
",
'filename' => 'zz.csv',
], //orders
];
$report = [];

14
include/language/en_us.EcmDropdownEditor.php
View File

@@ -1,5 +1,5 @@
<?php
// created: 2025-09-14 08:35:03
// created: 2025-09-15 20:41:31
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -231,17 +231,19 @@ $customDoms = array (
'ecmactions_category_dom' =>
array (
'dd4ddbad-c949-0ee5-fb73-54cb9b6c86ef' => 'None',
'8519dfc8-5eec-0233-7f84-54d1fe00e9fc' => 'PK1',
'55020d96-73d5-7b29-3bab-654f4818e0cd' => 'HP1',
'5d843f39-893f-51f8-3df5-68c86f1d41c3' => 'HP1',
'31174829-986e-4d7f-4262-68b2e73742e9' => 'HP2',
'8519dfc8-5eec-0233-7f84-54d1fe00e9fc' => 'Pakowalnia 1 Hala 1',
'2bdf9315-5c31-778d-4922-68c86f4af827' => 'Pakowalnia 2 Hala 1',
'55020d96-73d5-7b29-3bab-654f4818e0cd' => 'Mieszalnia Hala 1',
'de2448f8-45ac-6b2a-f2b1-68b2e7e40a6f' => 'Mieszalnik1 Hala 2',
'9bc2bafc-0608-7bc7-468b-686a94772424' => 'BL1',
'347509e3-fff6-4db9-761e-68b2e36436c6' => 'Opis',
'347509e3-fff6-4db9-761e-68b2e36436c6' => 'LNE1',
'26c3b7fa-e1ac-66d9-517b-68b2e4c6cae8' => 'LNE2',
'5664a1b1-42dc-2bb8-ad24-68b2e52df143' => 'LNE3',
'307b8935-5235-628f-aac1-68b2e56d3f4d' => 'LNE4',
'8d68df07-0779-5a23-aaf3-68b2e5d72a46' => 'LNE5',
'31174829-986e-4d7f-4262-68b2e73742e9' => 'Mieszalnik 100L',
'53d9cae1-1ec5-71e4-5a3c-68b2e77b6d92' => 'MDC5',
'de2448f8-45ac-6b2a-f2b1-68b2e7e40a6f' => 'HP2',
'3fea0360-a9d8-93fc-1984-68b2e89e4ec8' => 'FPH9',
'6159a89b-219c-bb4e-1505-68b2e9da1b7c' => 'LNEZ7',
'9bc005d7-5222-3d65-b754-68b2e9854af7' => 'LE10',

12
include/language/pl_pl.EcmDropdownEditor.php
View File

@@ -1,5 +1,5 @@
<?php
// created: 2025-09-14 08:35:03
// created: 2025-09-15 20:41:31
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -231,17 +231,19 @@ $customDoms = array (
'ecmactions_category_dom' =>
array (
'dd4ddbad-c949-0ee5-fb73-54cb9b6c86ef' => 'None',
'8519dfc8-5eec-0233-7f84-54d1fe00e9fc' => 'PK1',
'55020d96-73d5-7b29-3bab-654f4818e0cd' => 'HP1',
'5d843f39-893f-51f8-3df5-68c86f1d41c3' => 'HP1',
'31174829-986e-4d7f-4262-68b2e73742e9' => 'HP2',
'8519dfc8-5eec-0233-7f84-54d1fe00e9fc' => 'PAK1',
'2bdf9315-5c31-778d-4922-68c86f4af827' => 'PAK2',
'55020d96-73d5-7b29-3bab-654f4818e0cd' => 'MIE_HP1',
'de2448f8-45ac-6b2a-f2b1-68b2e7e40a6f' => 'M1_HP2',
'9bc2bafc-0608-7bc7-468b-686a94772424' => 'BL1',
'347509e3-fff6-4db9-761e-68b2e36436c6' => 'LNE1',
'26c3b7fa-e1ac-66d9-517b-68b2e4c6cae8' => 'LNE2',
'5664a1b1-42dc-2bb8-ad24-68b2e52df143' => 'LNE3',
'307b8935-5235-628f-aac1-68b2e56d3f4d' => 'LNE4',
'8d68df07-0779-5a23-aaf3-68b2e5d72a46' => 'LNE5',
'31174829-986e-4d7f-4262-68b2e73742e9' => 'M1',
'53d9cae1-1ec5-71e4-5a3c-68b2e77b6d92' => 'MDC5',
'de2448f8-45ac-6b2a-f2b1-68b2e7e40a6f' => 'HP2',
'3fea0360-a9d8-93fc-1984-68b2e89e4ec8' => 'FPH9',
'6159a89b-219c-bb4e-1505-68b2e9da1b7c' => 'LNEZ7',
'9bc005d7-5222-3d65-b754-68b2e9854af7' => 'LE10',