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

Some fixes :)

Browse Source
This commit is contained in:
Michał Zieliński
2025-01-16 10:16:01 +00:00
parent 87010acdcc
commit a4a65d5b4f
9 changed files with 160 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php
View File

@@ -20,7 +20,7 @@ if (!isset($_GET['ajaxAction'])) {
$dateTo = date("Y-m-d", strtotime("+ 1 month"));
}
$query = "SELECT s.id, s.document_no, s.status, s.parent_name, s.parent_id, s.send_date, s.type,
$query = "SELECT s.id as orderId, s.document_no, s.status, s.parent_name, s.parent_id, s.send_date, s.type,
p.code, p.name, ps.ecmproduct_id, ps.description,
si.quantity, p.vendor_part_no as kind, p.brand, p.part_no as size, p.shape,
ss.quantity as stockState, si.id as item_id, s.shipping_address_name, ps.production_date,
@@ -34,9 +34,14 @@ if (!isset($_GET['ajaxAction'])) {
ON ps.ecmproduct_id = p.id
LEFT JOIN ecmstockstates AS ss
ON ss.product_id = ps.ecmproduct_id AND ss.stock_id = 'c7afd71a-4c3a-bde4-138d-4acaee1644e4'
WHERE ps.deleted = 0 AND ps.production_date >= '$dateFrom' AND ps.production_date <= '$dateTo'
WHERE ps.deleted = 0 AND
(
(ps.production_date >= '$dateFrom' AND ps.production_date <= '$dateTo')
OR ps.production_date IS NULL OR ps.production_date = '0000-00-00')
ORDER BY s.delivery_date, s.register_date, s.document_no";
//echo $query;
$rows = $db->query($query);
$data = array();
$i = 0;
@@ -57,7 +62,7 @@ if (!isset($_GET['ajaxAction'])) {
$row['productShape'] = $app_list_strings['ecmproducts_shape_dom'][$r['shape']];
$row['productBrand'] = $app_list_strings['ecmproducts_brand_dom'][$r['brand']];
$row['orderNo'] = $r['document_no'];
$row['orderId'] = $r['id'];
$row['orderId'] = $r['orderId'];
$row['orderStatus'] = $app_list_strings['ecmsales_status_dom'][$r['status']];
$row['orderType'] = $app_list_strings['ecmsales_type_dom'][$r['type']];
$row['orderParent'] = $r['parent_name'];