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

ProductionPlanning - few fixes

Browse Source
This commit is contained in:
Michał Zieliński
2025-07-29 10:07:19 +02:00
parent a29c9aa231
commit f0e0a3dce1
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js
View File

@@ -211,7 +211,7 @@ function drawComponents(data) {
tr.append("<td>" + el.orderType + "</td>"); tr.append("<td>" + el.orderType + "</td>");
tr.append("<td>" + el.orderStatus + "</td>"); tr.append("<td>" + el.orderStatus + "</td>");
tr.append("<td><a target=\"_blank\" href=\"index.php?module=EcmProducts&action=DetailView&record=" + el.mainProductId + "\">" + el.mainProductCode + "</a></td>"); tr.append("<td><a target=\"_blank\" href=\"index.php?module=EcmProducts&action=DetailView&record=" + el.mainProductId + "\">" + el.mainProductCode + "</a></td>");
tr.append("<td><a target=\"_blank\" href=\"index.php?module=Accounts&action=DetailView&record=" + el.orderParentId + "\">" + el.orderParent + "</a></td>"); tr.append("<td>" + el.orderParent + "</td>");
tr.append("<td>" + el.productShape + "</td>"); tr.append("<td>" + el.productShape + "</td>");
tr.append("<td>" + el.productBrand + "</td>"); tr.append("<td>" + el.productBrand + "</td>");
tr.append("<td>" + el.orderSendDate + "</td>"); tr.append("<td>" + el.orderSendDate + "</td>");

12
modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.php
View File

@@ -381,14 +381,13 @@ function getComponents2($ids) {
$db = $GLOBALS['db']; $db = $GLOBALS['db'];
global $app_list_strings; global $app_list_strings;
$idsString = join("','", $ids); $idsString = join("','", $ids);
$mainProduct = $db->fetchByAssoc($db->query(sprintf("SELECT name FROM ecmproducts WHERE id IN ('%s')", $idsString)));; $productsQuery = "SELECT si.ecmproduct_id, si.quantity as quantity, s.document_no,
$productsQuery = "SELECT si.ecmproduct_id, SUM(si.quantity) as quantity, s.document_no, s.parent_id, s.parent_name, s.id, s.type, s.status, s.send_date, s.shipping_address_name
s.id, s.type, s.status, s.send_date
FROM ecmsaleitems AS si FROM ecmsaleitems AS si
INNER JOIN ecmsales AS s INNER JOIN ecmsales AS s
ON s.id = si.ecmsale_id ON s.id = si.ecmsale_id
WHERE si.id IN ('" . $idsString . "') WHERE si.id IN ('" . $idsString . "')";
GROUP BY si.ecmproduct_id";
$rows = $db->query($productsQuery); $rows = $db->query($productsQuery);
$componentsData = array(); $componentsData = array();
@@ -418,8 +417,7 @@ function getComponents2($ids) {
$row['orderId'] = $r['id']; $row['orderId'] = $r['id'];
$row['orderStatus'] = $app_list_strings['ecmsales_status_dom'][$r['status']]; $row['orderStatus'] = $app_list_strings['ecmsales_status_dom'][$r['status']];
$row['orderType'] = $app_list_strings['ecmsales_type_dom'][$r['type']]; $row['orderType'] = $app_list_strings['ecmsales_type_dom'][$r['type']];
$row['orderParent'] = $r['parent_name']; $row['orderParent'] = ($r['shipping_address_name'] == 'Adres korespondencyjny' ? '' : $r['shipping_address_name']);
$row['orderParentId'] = $r['parent_id'];
$row['orderSendDate'] = $r['send_date']; $row['orderSendDate'] = $r['send_date'];
$componentsData[] = $row; $componentsData[] = $row;
} }