Add states to sales report
This commit is contained in:
@@ -126,13 +126,16 @@
|
||||
ELSE
|
||||
pozycja.price_purchase*pozycja.quantity_corrected
|
||||
END
|
||||
) as koszt
|
||||
) as koszt,
|
||||
sum(s.quantity) AS 'state'
|
||||
FROM
|
||||
ecminvoiceoutitems pozycja
|
||||
JOIN
|
||||
ecminvoiceouts faktura ON pozycja.ecminvoiceout_id = faktura.id
|
||||
LEFT JOIN
|
||||
ecmproducts produkt ON pozycja.ecmproduct_id = produkt.id
|
||||
LEFT JOIN
|
||||
ecmstockstates s ON s.product_id = pozycja.ecmproduct_id
|
||||
WHERE
|
||||
faktura.register_date BETWEEN
|
||||
'".$date_from_to_query->format('Y-m-d')."' AND
|
||||
@@ -153,6 +156,8 @@
|
||||
}
|
||||
$query .= "GROUP BY pozycja.id
|
||||
COLLATE utf8_polish_ci;";
|
||||
|
||||
echo $query;
|
||||
|
||||
|
||||
}else if ($searchBy=="contractor"){
|
||||
@@ -243,6 +248,7 @@
|
||||
$row["name"] = $r["name"];
|
||||
|
||||
$row["code"]=$r["code"];
|
||||
$row["state"]=$r["state"];
|
||||
$row["parent_id"]=$r["parent_id"];
|
||||
$row["type"]=$r["type"];
|
||||
|
||||
@@ -442,6 +448,7 @@
|
||||
$tmp2[$key1][$key2][$i]["id"]=$element3["id"];
|
||||
$tmp2[$key1][$key2][$i]["name"]=$element3["name"];
|
||||
$tmp2[$key1][$key2][$i]["code"]=$element3["code"];
|
||||
$tmp2[$key1][$key2][$i]["state"]=$element3["state"];
|
||||
$tmp2[$key1][$key2][$i]["parent_id"]=$element3["parent_id"];
|
||||
}
|
||||
//if($element3["type"]=="normal")
|
||||
|
||||
Reference in New Issue
Block a user