{PAGINATION1}
diff --git a/modules/EcmProducts/EcmProduct.php b/modules/EcmProducts/EcmProduct.php
index 47f2c75a..1e7d95b2 100755
--- a/modules/EcmProducts/EcmProduct.php
+++ b/modules/EcmProducts/EcmProduct.php
@@ -316,8 +316,8 @@ class EcmProduct extends SugarBean {
$this->url9 = '
- {/if}
+
diff --git a/modules/EcmReports/ReportSales.inc.php b/modules/EcmReports/ReportSales.inc.php
index c06da8be..5195722a 100644
--- a/modules/EcmReports/ReportSales.inc.php
+++ b/modules/EcmReports/ReportSales.inc.php
@@ -1,88 +1,83 @@
query ($queryUsers);
- while($rowUser = $db->fetchByAssoc ( $rowsUsers ))
- {
- $users["first"] = $rowUser["first"];
- $users["last"] = $rowUser["last"];
- $users["id"] = $rowUser["id"];
- $datausers [] = $users;
- }
-
- if($searchBy=="contractor")
- {
- $groupBy="name";
- }else{
- $groupBy="id";
- }
-
- if($searchBy=="product")
- {
- $query = "SELECT
+$rowsUsers = $db->query($queryUsers);
+while ($rowUser = $db->fetchByAssoc($rowsUsers)) {
+ $users["first"] = $rowUser["first"];
+ $users["last"] = $rowUser["last"];
+ $users["id"] = $rowUser["id"];
+ $datausers[] = $users;
+}
+
+if ($searchBy == "contractor") {
+ $groupBy = "name";
+} else {
+ $groupBy = "id";
+}
+
+if ($searchBy == "product") {
+ $query = "SELECT
pozycja.name,
pozycja.ecmproduct_id as 'id',
faktura.parent_id as 'parent_id',
@@ -127,7 +122,14 @@
pozycja.price_purchase*pozycja.quantity_corrected
END
) as koszt,
- (SELECT SUM(s.quantity) FROM ecmstockstates s WHERE s.product_id = pozycja.ecmproduct_id) as state
+ (SELECT SUM(s.quantity) FROM ecmstockstates s WHERE s.product_id = pozycja.ecmproduct_id) as state,
+ (SELECT SUM(si.quantity)
+ FROM ecmsaleitems si
+ JOIN ecmsales sa ON si.ecmsale_id = sa.id
+ WHERE si.ecmproduct_id = pozycja.ecmproduct_id
+ AND sa.status = 's30'
+ AND sa.type = 'sales_order'
+ AND sa.send_date >= NOW()) AS ordered_quantity
FROM
ecminvoiceoutitems pozycja
JOIN
@@ -136,27 +138,26 @@
ecmproducts produkt ON pozycja.ecmproduct_id = produkt.id
WHERE
faktura.register_date BETWEEN
- '".$date_from_to_query->format('Y-m-d')."' AND
- '".$date_to_to_query->format('Y-m-d')."'
- and faktura.type like '".$searchByType."'
+ '" . $date_from_to_query->format('Y-m-d') . "' AND
+ '" . $date_to_to_query->format('Y-m-d') . "'
+ and faktura.type like '" . $searchByType . "'
and faktura.canceled = 0
and faktura.deleted= 0";
- if ($selectPdfType!="")
- $query.= " and faktura.pdf_type='$selectPdfType'";
- $query .= " and pozycja.deleted= 0 ";
-
- if($addTwinpol ===0 ){
- $query .= " and faktura.parent_id <> '1b9643ca-5b1a-8f9b-b809-586b5619b068' ";
- }
-
- if($group_ks!='%'){
- $query .= "AND produkt.group_ks LIKE '$group_ks'";
- }
- $query .= "GROUP BY pozycja.id
+ if ($selectPdfType != "")
+ $query .= " and faktura.pdf_type='$selectPdfType'";
+ $query .= " and pozycja.deleted= 0 ";
+
+ if ($addTwinpol === 0) {
+ $query .= " and faktura.parent_id <> '1b9643ca-5b1a-8f9b-b809-586b5619b068' ";
+ }
+
+ if ($group_ks != '%') {
+ $query .= "AND produkt.group_ks LIKE '$group_ks'";
+ }
+ $query .= "GROUP BY pozycja.id
COLLATE utf8_polish_ci;";
-
- }else if ($searchBy=="contractor"){
- $query = "SELECT
+} else if ($searchBy == "contractor") {
+ $query = "SELECT
faktura.parent_name as 'name',
faktura.parent_id as 'parent_id',
pozycja.name as 'product_name',
@@ -209,350 +210,309 @@
accounts acco ON acco.id = faktura.parent_id
WHERE
faktura.register_date BETWEEN
- '".$date_from_to_query->format('Y-m-d')."' AND
- '".$date_to_to_query->format('Y-m-d')."'
- and faktura.type like '".$searchByType."'
+ '" . $date_from_to_query->format('Y-m-d') . "' AND
+ '" . $date_to_to_query->format('Y-m-d') . "'
+ and faktura.type like '" . $searchByType . "'
and faktura.canceled = 0
and faktura.deleted= 0";
- if ($selectPdfType!="")
- $query.= " and faktura.pdf_type='$selectPdfType'";
- $query .= " and pozycja.deleted= 0
+ if ($selectPdfType != "")
+ $query .= " and faktura.pdf_type='$selectPdfType'";
+ $query .= " and pozycja.deleted= 0
and produkt.group_ks LIKE '$group_ks'";
-
- if($addTwinpol ===0 ){
- $query .= " and faktura.parent_id <> '1b9643ca-5b1a-8f9b-b809-586b5619b068' ";
- }
- $query .= "GROUP BY pozycja.id
+ if ($addTwinpol === 0) {
+ $query .= " and faktura.parent_id <> '1b9643ca-5b1a-8f9b-b809-586b5619b068' ";
+ }
+
+ $query .= "GROUP BY pozycja.id
COLLATE utf8_polish_ci;";
- }
-
-
- /*****************************************************/
- /*************** GET DATA FROM DB*********************/
- /*****************************************************/
- $rows = $db->query ($query);
- // prepare data for Smarty
- while($r = $db->fetchByAssoc ( $rows ))
- {
- $row = array();
- $row["id"] = $r["id"];
- if( $r["parent2"] == 1249)
- $row["name"] = "Media Saturn Holding";
- else
- $row["name"] = $r["name"];
-
- $row["code"]=$r["code"];
- $row["state"]=$r["state"];
- $row["parent_id"]=$r["parent_id"];
- $row["type"]=$r["type"];
-
- $userBool=1;
- if($selectUser!="")
- {
- $userBool=0;
- $querySelectUsers="SELECT user.id,
+}
+
+
+/*****************************************************/
+/*************** GET DATA FROM DB*********************/
+/*****************************************************/
+$rows = $db->query($query);
+// prepare data for Smarty
+while ($r = $db->fetchByAssoc($rows)) {
+ $row = array();
+ $row["id"] = $r["id"];
+ if ($r["parent2"] == 1249)
+ $row["name"] = "Media Saturn Holding";
+ else
+ $row["name"] = $r["name"];
+
+ $row["code"] = $r["code"];
+ $row["state"] = $r["state"];
+ $row["ordered_quantity"] = $r["ordered_quantity"];
+ $row["parent_id"] = $r["parent_id"];
+ $row["type"] = $r["type"];
+
+ $userBool = 1;
+ if ($selectUser != "") {
+ $userBool = 0;
+ $querySelectUsers = "SELECT user.id,
first_name as 'first',
last_name as 'last'
FROM
accounts acc
JOIN
users user ON acc.assigned_user_id=user.id
- WHERE acc.id='".$r["parent_id"]."';";
- $rowsSelectUsers = $db->query ($querySelectUsers);
- while($rowSelectUser = $db->fetchByAssoc ( $rowsSelectUsers ))
- {
- if($rowSelectUser["id"]==$selectUser)
- {
- $userBool=1;
- }else{
- $userBool=0;
- }
- }
- }
-
- if($userBool==1)
- {
- if($searchBy=="contractor")
- {
- $row["product_name"]=$r["product_name"];
- }else{
- $row["product_name"]=$r["name"];
- }
+ WHERE acc.id='" . $r["parent_id"] . "';";
+ $rowsSelectUsers = $db->query($querySelectUsers);
+ while ($rowSelectUser = $db->fetchByAssoc($rowsSelectUsers)) {
+ if ($rowSelectUser["id"] == $selectUser) {
+ $userBool = 1;
+ } else {
+ $userBool = 0;
+ }
+ }
+ }
-
- $querySubCategory="SELECT category.name as 'podkategoria'
+ if ($userBool == 1) {
+ if ($searchBy == "contractor") {
+ $row["product_name"] = $r["product_name"];
+ } else {
+ $row["product_name"] = $r["name"];
+ }
+
+
+ $querySubCategory = "SELECT category.name as 'podkategoria'
FROM
ecmproductcategories_bean bean
JOIN
ecmproductcategories category ON bean.ecmproductcategory_id = category.id
- WHERE bean.bean_id='".$row["id"]."'
+ WHERE bean.bean_id='" . $row["id"] . "'
and bean.position = '1'
and bean.deleted = '0'
and category.deleted = '0';";
- $rowsSubCategory = $db->query ($querySubCategory);
- while($rowSubCategory = $db->fetchByAssoc ( $rowsSubCategory ))
- {
- $row["podkategoria"] = $rowSubCategory["podkategoria"];
- }
-
- $queryCategory="SELECT category.name as 'kategoria'
+ $rowsSubCategory = $db->query($querySubCategory);
+ while ($rowSubCategory = $db->fetchByAssoc($rowsSubCategory)) {
+ $row["podkategoria"] = $rowSubCategory["podkategoria"];
+ }
+
+ $queryCategory = "SELECT category.name as 'kategoria'
FROM
ecmproductcategories_bean bean
JOIN
ecmproductcategories category ON bean.ecmproductcategory_id = category.id
- WHERE bean.bean_id='".$row["id"]."'
+ WHERE bean.bean_id='" . $row["id"] . "'
and bean.position = '0'
and bean.deleted = '0'
and category.deleted = '0';";
- $rowscategory = $db->query ($queryCategory);
- while($rowcategory = $db->fetchByAssoc ( $rowscategory ))
- {
-
- $row["kategoria"] = $rowcategory["kategoria"];
- }
- $row["ilosc"] = $r["ilosc"];
- $row["netto"] = $r["netto"];
- $row["srednia"] = $row["netto"]/$row["ilosc"];
- $row["koszt"] = $r["koszt"];
- //if($row["netto"]>$row["koszt"])
- //{
- $row["marza"] = ($row["netto"]-$row["koszt"])/($row["netto"])*100;
- //}else{
- //$row["marza"] = 0;
- //}
-
- $data [] = $row;
- }
+ $rowscategory = $db->query($queryCategory);
+ while ($rowcategory = $db->fetchByAssoc($rowscategory)) {
+
+ $row["kategoria"] = $rowcategory["kategoria"];
+ }
+ $row["ilosc"] = $r["ilosc"];
+ $row["netto"] = $r["netto"];
+ $row["srednia"] = $row["netto"] / $row["ilosc"];
+ $row["koszt"] = $r["koszt"];
+ //if($row["netto"]>$row["koszt"])
+ //{
+ $row["marza"] = ($row["netto"] - $row["koszt"]) / ($row["netto"]) * 100;
+ //}else{
+ //$row["marza"] = 0;
+ //}
+
+ $data[] = $row;
}
-
- if($searchBy!="")
+}
+
+if ($searchBy != "") {
+ ////////////////// SUM /////////////////////////////////
+ foreach ($data as $key => &$element) {
+ if ($element["netto"] != 0) {
+ $categoryArray[$element["kategoria"] == "" ? "Inne" : $element["kategoria"]][$element["podkategoria"] == "" ? "Reszta" : $element["podkategoria"]][$key] = $element;
+ } else {
+ //echo "Nie przechodzi:
{if $searchBy=="product"}
-
+
+
{/if}
@@ -271,6 +272,7 @@
{if $searchBy=="product"}
{$DATA.$CATNAME.IloscSum|number_format:0:",":"." } {$DATA.$CATNAME.SoldSum|number_format:2:",":"." } {$CAT.$CAT2NAME.IloscSum2|number_format:0:",":"." } {$CAT.$CAT2NAME.SoldSum2|number_format:2:",":"." } {$ROW.code}
{$ROW.state}
+ {$ROW.ordered_quantity}
{/if}
{$ROW.ilosc|number_format:0:",":"."}
{$ROW.netto|number_format:2:",":"."}
@@ -352,6 +356,7 @@
{if $searchBy=="product"}
{$SUM.IloscSumSum|number_format:0:",":"." } {$SUM.SoldSumSum|number_format:2:",":"." }
- {if $ROW.scheduled > 0}
-
- {/if}
+