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

production scheduler fix

Browse Source
This commit is contained in:
Michał Zieliński
2025-04-02 15:24:40 +00:00
parent a879b73ea6
commit 8095cfe88a
11 changed files with 398 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
REST/functions.php
View File

@@ -143,7 +143,7 @@
$new->parent_nip = "8792676609";
$new->parent_iln = "5909000837119";
$new->pricebook_id = "13b29aa1-48f0-de58-7630-59c22756c5e4";
$new->status = "s10";
$new->status = "s30";
$new->type = "sales_order";
$new->name = $sale->name;
$new->ecmpaymentcondition_name = "90 dni";

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

@@ -1,5 +1,5 @@
<?php
// created: 2025-02-10 11:34:48
// created: 2025-03-31 14:19:04
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -73,6 +73,8 @@ $customDoms = array (
'cb66a685-53e1-5f87-0a25-66967c7cb63b' => 'Doypack 210x285mm',
'75f4bd2a-51a8-0767-635e-66dde15af79e' => 'Foam 200ml',
'225115e4-1ce2-9a98-b7a0-672930e3318c' => 'Blister tabletki 10szt. 2 g',
'e6900d92-6fde-90e6-b872-67d1938745e6' => 'Słoik 400 ml',
'e3e0c9da-6d08-e1e0-b9ba-67eaa437cb84' => 'Bottle B1_30ml',
),
'ecmproducts_brand_dom' =>
array (
@@ -156,6 +158,11 @@ $customDoms = array (
'7ceeacc7-e79b-4eb0-2aa3-676529593a3c' => 'PureNest',
'ca4ee928-3385-d7f8-090e-678e697c3b8e' => 'gc clean!',
'9d630708-a3f3-de9b-bbe0-67a9dfd114a2' => 'MPM',
'842115cd-b258-862b-1f7e-67b437f1358e' => 'Praxs',
'c1e01314-cf64-a48f-9b24-67b58e00952b' => '3mk',
'661388b9-ac42-d5a8-2503-67b856a06f52' => 'Coffeeano',
'1f9d4c5d-670e-4c77-d4de-67cddc908559' => 'DeCal',
'5c883b90-f1fb-83d1-6347-67dbd49469f0' => 'EntertainME',
),
'ecmproducts_category_dom' =>
array (
@@ -197,6 +204,7 @@ $customDoms = array (
'f2156355-d06b-2904-d759-67923795c77b' => 'Oven Cleaners',
'27697ebf-0d8e-5156-528e-679237ffd78f' => 'Toilet Cleaners',
'f03ef1ce-e218-97eb-623e-679d00f02f98' => 'Car Cleaning',
'30f0082f-6f41-a3ee-cb9a-67caecd873ab' => 'Impregantors',
),
'ecmquotes_status_dom' =>
array (

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

@@ -1,5 +1,5 @@
<?php
// created: 2025-02-10 11:34:48
// created: 2025-03-31 14:19:04
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -73,6 +73,8 @@ $customDoms = array (
'cb66a685-53e1-5f87-0a25-66967c7cb63b' => 'Doypack 210x285mm',
'75f4bd2a-51a8-0767-635e-66dde15af79e' => 'Pianka 200ml',
'225115e4-1ce2-9a98-b7a0-672930e3318c' => 'Blister tabletki 10szt. 2 g',
'e6900d92-6fde-90e6-b872-67d1938745e6' => 'Słoik 400 ml',
'e3e0c9da-6d08-e1e0-b9ba-67eaa437cb84' => 'Butelka B1_30ml',
),
'ecmproducts_brand_dom' =>
array (
@@ -156,6 +158,11 @@ $customDoms = array (
'7ceeacc7-e79b-4eb0-2aa3-676529593a3c' => 'PureNest',
'ca4ee928-3385-d7f8-090e-678e697c3b8e' => 'gc clean!',
'9d630708-a3f3-de9b-bbe0-67a9dfd114a2' => 'MPM',
'842115cd-b258-862b-1f7e-67b437f1358e' => 'Praxs',
'c1e01314-cf64-a48f-9b24-67b58e00952b' => '3mk',
'661388b9-ac42-d5a8-2503-67b856a06f52' => 'Coffeeano',
'1f9d4c5d-670e-4c77-d4de-67cddc908559' => 'DeCal',
'5c883b90-f1fb-83d1-6347-67dbd49469f0' => 'EntertainME',
),
'ecmproducts_category_dom' =>
array (
@@ -197,6 +204,7 @@ $customDoms = array (
'f2156355-d06b-2904-d759-67923795c77b' => 'Środki do czyszczenia piekarnika',
'27697ebf-0d8e-5156-528e-679237ffd78f' => 'Środki do czyszczenia toalet',
'f03ef1ce-e218-97eb-623e-679d00f02f98' => 'Środki do czyszczenia samochodów',
'30f0082f-6f41-a3ee-cb9a-67caecd873ab' => 'Środki do impregnacji powierzchni',
),
'ecmquotes_status_dom' =>
array (

1
modules/EcmPriceBooks/DetailView.html
View File

@@ -129,7 +129,6 @@ function showBlock(id)
</ul>
<br />
<div id="details_block" style="display:block;">
<table width="100%" border="0" cellspacing="{GRIDLINE}" cellpadding="0">
{PAGINATION1}
<th class="dataLabel" align="left" colspan="8">

4
modules/EcmProducts/EcmProduct.php
View File

@@ -316,8 +316,8 @@ class EcmProduct extends SugarBean {
$this->url9 = '<a href="'.$this->url9.'" target="_blank"/>'.$this->url9.'</a>';
}
$r = $GLOBALS['db']->fetchByAssoc($GLOBALS['db']->query("SELECT SUM(quantity) as qty FROM ecmstockstates WHERE product_id='".$this->id."'"));
$this->ems_qty_in_stock = $r['qty'];
//$r = $GLOBALS['db']->fetchByAssoc($GLOBALS['db']->query("SELECT SUM(quantity) as qty FROM ecmstockstates WHERE product_id='".$this->id."'"));
//$this->ems_qty_in_stock = $r['qty'];
}
function getSale($date){
foreach($date as $d){

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

@@ -478,6 +478,7 @@ function addToProductionScheduler(orderItemId) {
success: function ()
{
hideLoader();
$("#productScheduled-"+orderItemId).css('visibility', 'visible');
window.alert("Dodano do harmonogramu produkcji.");
},
});

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

@@ -353,9 +353,9 @@ function getProductRawMaterials($productId, $quantity)
function addToProductionScheduler($orderItemId) {
$db = $GLOBALS['db'];
global $current_user;
$res = $db->fetchByAssoc($db->query("SELECT quantity, ecmproduct_id, production_date, description, ecmsale_id FROM ecmsaleitems WHERE id ='$orderItemId'"));
$query = sprintf("INSERT INTO productionScheduler VALUES ('%s', '%s', '%s', '%d', NOW(), NOW(), '%s', '%s', 0, '%s', 0, '%s', '%s');",
generateUuidV4(), $orderItemId, $res['ecmsale_id'], $res['quantity'], $current_user->id, $current_user->id, $res['ecmproduct_id'], $res['production_date'], $res['description']);
$res = $db->fetchByAssoc($db->query("SELECT quantity, ecmproduct_id, description, ecmsale_id FROM ecmsaleitems WHERE id ='$orderItemId'"));
$query = sprintf("INSERT INTO productionScheduler VALUES ('%s', '%s', '%s', '%d', NOW(), NOW(), '%s', '%s', 0, '%s', 0, '','%s');",
generateUuidV4(), $orderItemId, $res['ecmsale_id'], $res['quantity'], $current_user->id, $current_user->id, $res['ecmproduct_id'], $res['description']);
$db->query($query);
}

4
modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.tpl
View File

@@ -178,9 +178,7 @@
<td>
<input type="checkbox" value="{$ROW.orderItemId}" class="allCheck"/>
<br><img src="modules/EcmQuotes/images/add_position.gif" style="margin-top: 3px; margin-right: 3px; cursor: pointer" width="12" alt="" onclick="addToProductionScheduler('{$ROW.orderItemId}')">
{if $ROW.scheduled > 0}
<div style="background-color: green; width: 8px; height: 8px; border-radius: 50%; margin-top: 2px; margin-left: 2px;"></div>
{/if}
<div id="productScheduled-{$ROW.orderItemId}" style="background-color: green; width: 8px; height: 8px; border-radius: 50%; margin-top: 2px; margin-left: 2px; visibility: {if $ROW.scheduled > 0}visible{else}hidden{/if};"></div>
<input type="hidden" id="productId-{$ROW.orderItemId}" value="{$ROW.productId}"/>
</td>
<td>

150
modules/EcmReports/ReportSales.inc.php
View File

@@ -10,15 +10,13 @@
global $app_list_strings;
$all_groups_ks = $app_list_strings["ecmproducts_group_ks_dom"];
if($_GET['selectUser']!="")
{
if ($_GET['selectUser'] != "") {
$selectUser = $_GET['selectUser'];
} else {
$selectUser = "";
}
if($_GET['selectPdfType']!="")
{
if ($_GET['selectPdfType'] != "") {
$selectPdfType = $_GET['selectPdfType'];
} else {
$selectPdfType = "";
@@ -65,23 +63,20 @@
where deleted= 0
and status = 'Active';";
$rowsUsers = $db->query($queryUsers);
while($rowUser = $db->fetchByAssoc ( $rowsUsers ))
{
while ($rowUser = $db->fetchByAssoc($rowsUsers)) {
$users["first"] = $rowUser["first"];
$users["last"] = $rowUser["last"];
$users["id"] = $rowUser["id"];
$datausers[] = $users;
}
if($searchBy=="contractor")
{
if ($searchBy == "contractor") {
$groupBy = "name";
} else {
$groupBy = "id";
}
if($searchBy=="product")
{
if ($searchBy == "product") {
$query = "SELECT
pozycja.name,
pozycja.ecmproduct_id as '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
@@ -154,7 +156,6 @@
}
$query .= "GROUP BY pozycja.id
COLLATE utf8_polish_ci;";
} else if ($searchBy == "contractor") {
$query = "SELECT
faktura.parent_name as 'name',
@@ -233,8 +234,7 @@
/*****************************************************/
$rows = $db->query($query);
// prepare data for Smarty
while($r = $db->fetchByAssoc ( $rows ))
{
while ($r = $db->fetchByAssoc($rows)) {
$row = array();
$row["id"] = $r["id"];
if ($r["parent2"] == 1249)
@@ -244,12 +244,12 @@
$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!="")
{
if ($selectUser != "") {
$userBool = 0;
$querySelectUsers = "SELECT user.id,
first_name as 'first',
@@ -260,10 +260,8 @@
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)
{
while ($rowSelectUser = $db->fetchByAssoc($rowsSelectUsers)) {
if ($rowSelectUser["id"] == $selectUser) {
$userBool = 1;
} else {
$userBool = 0;
@@ -271,10 +269,8 @@
}
}
if($userBool==1)
{
if($searchBy=="contractor")
{
if ($userBool == 1) {
if ($searchBy == "contractor") {
$row["product_name"] = $r["product_name"];
} else {
$row["product_name"] = $r["name"];
@@ -291,8 +287,7 @@
and bean.deleted = '0'
and category.deleted = '0';";
$rowsSubCategory = $db->query($querySubCategory);
while($rowSubCategory = $db->fetchByAssoc ( $rowsSubCategory ))
{
while ($rowSubCategory = $db->fetchByAssoc($rowsSubCategory)) {
$row["podkategoria"] = $rowSubCategory["podkategoria"];
}
@@ -306,8 +301,7 @@
and bean.deleted = '0'
and category.deleted = '0';";
$rowscategory = $db->query($queryCategory);
while($rowcategory = $db->fetchByAssoc ( $rowscategory ))
{
while ($rowcategory = $db->fetchByAssoc($rowscategory)) {
$row["kategoria"] = $rowcategory["kategoria"];
}
@@ -326,12 +320,10 @@
}
}
if($searchBy!="")
{
if ($searchBy != "") {
////////////////// SUM /////////////////////////////////
foreach( $data as $key=>&$element )
{ if($element["netto"]!=0)
{
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: <br>";
@@ -339,12 +331,9 @@
}
}
foreach( $categoryArray as $key=>&$element )
{
foreach( $element as $keyy=>&$elementt )
{
foreach( $elementt as $keyyy=>&$elementtt )
{
foreach ($categoryArray as $key => &$element) {
foreach ($element as $keyy => &$elementt) {
foreach ($elementt as $keyyy => &$elementtt) {
$sumSub["IloscSum"][$key] += $elementtt["ilosc"];
$sumSub["SoldSum"][$key] += $elementtt["netto"];
//if($elementtt["type"]=="normal")
@@ -374,7 +363,6 @@
$categoryArray[$key][$keyy]["SoldSumNormal2"] = $sumSub2["SoldSumNormal"][$key][$keyy];
$categoryArray[$key][$keyy]["IloscNormal2"] = $sumSub2["IloscNormal"][$key][$keyy];
$categoryArray[$key][$keyy]["KosztSum2"] = $sumSub2["KosztSum"][$key][$keyy];
}
$categoryArray[$key]["IloscSum"] = $sumSub["IloscSum"][$key];
$categoryArray[$key]["SoldSum"] = $sumSub["SoldSum"][$key];
@@ -383,8 +371,7 @@
$categoryArray[$key]["KosztSum"] = $sumSub["KosztSum"][$key];
}
foreach( $categoryArray as $key=>&$element )
{
foreach ($categoryArray as $key => &$element) {
$sum["IloscSumSum"] += $sumSub["IloscSum"][$key];
$sum["SoldSumSum"] += $sumSub["SoldSum"][$key];
$sum["SoldSumSumNormal"] += $sumSub["SoldSumNormal"][$key];
@@ -414,36 +401,31 @@
}
// grupowanie po kontrahentach
foreach($categoryArray as $key1=>&$element1)
{
foreach($element1 as $key2=>&$element2)
{
foreach ($categoryArray as $key1 => &$element1) {
foreach ($element1 as $key2 => &$element2) {
$tmp2[$key1][$key2]["IloscSum2"] = $categoryArray[$key1][$key2]["IloscSum2"];
$tmp2[$key1][$key2]["SoldSum2"] = $categoryArray[$key1][$key2]["SoldSum2"];
$tmp2[$key1][$key2]["SoldSumNormal2"] = $categoryArray[$key1][$key2]["SoldSumNormal2"];
$tmp2[$key1][$key2]["IloscNormal2"] = $categoryArray[$key1][$key2]["IloscNormal2"];
$tmp2[$key1][$key2]["KosztSum2"] = $categoryArray[$key1][$key2]["KosztSum2"];
if($searchBy=="contractor")
{
if ($searchBy == "contractor") {
usort($element2, "cmp");
} else {
usort($element2, "cmp2");
}
$i = 0;
$tmp2[$key1][$key2][0] = array('name' => null);
foreach($element2 as $count=>&$element3)
{
if($element3[$groupBy]!=$tmp2[$key1][$key2][$i][$groupBy])
{
if($tmp2[$key1][$key2][$i][$groupBy]!=null)
{
foreach ($element2 as $count => &$element3) {
if ($element3[$groupBy] != $tmp2[$key1][$key2][$i][$groupBy]) {
if ($tmp2[$key1][$key2][$i][$groupBy] != null) {
$i++;
}
$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]["ordered_quantity"] = $element3["ordered_quantity"];
$tmp2[$key1][$key2][$i]["parent_id"] = $element3["parent_id"];
}
//if($element3["type"]=="normal")
@@ -464,10 +446,8 @@
$sumSub2["MarzaSum"][$key1][$key2] = ($tmp2[$key1][$key2]["SoldSumNormal2"] - $tmp2[$key1][$key2]["KosztSum2"]) / $tmp2[$key1][$key2]["SoldSumNormal2"] * 100;
$sumSub2["SredniaSum"][$key1][$key2] = $tmp2[$key1][$key2]["SoldSumNormal2"] / $tmp2[$key1][$key2]["IloscNormal2"];
if($key2=="Reszta")
{
if(is_array($sumSub2["SredniaSum"][$key1][$key2]) || $sumSub2["SredniaSum"][$key1][$key2]=='')
{
if ($key2 == "Reszta") {
if (is_array($sumSub2["SredniaSum"][$key1][$key2]) || $sumSub2["SredniaSum"][$key1][$key2] == '') {
$sumSub2["SredniaSum"][$key1][$key2] = 0;
}
}
@@ -485,14 +465,10 @@
}
////////////////// SORT sumSub /////////////////////////////////
foreach( $categoryArray1 as $key1=>&$element )
{
foreach( $element as $key2=>&$elements )
{
foreach( $element as $key3=>&$element2 )
{
if($sumSub2["SoldSum"][$key1][$key2]>$sumSub2["SoldSum"][$key1][$key3])
{
foreach ($categoryArray1 as $key1 => &$element) {
foreach ($element as $key2 => &$elements) {
foreach ($element as $key3 => &$element2) {
if ($sumSub2["SoldSum"][$key1][$key2] > $sumSub2["SoldSum"][$key1][$key3]) {
$tmp = $sumSub2["SoldSum"][$key1][$key2];
$sumSub2["SoldSum"][$key1][$key2] = $sumSub2["SoldSum"][$key1][$key3];
$sumSub2["SoldSum"][$key1][$key3] = $tmp;
@@ -501,12 +477,9 @@
}
}
foreach( $sumSub["SoldSum"] as $key1=>&$element )
{
foreach( $sumSub["SoldSum"] as $key2=>&$element2 )
{
if($sumSub["SoldSum"][$key1]>$sumSub["SoldSum"][$key2])
{
foreach ($sumSub["SoldSum"] as $key1 => &$element) {
foreach ($sumSub["SoldSum"] as $key2 => &$element2) {
if ($sumSub["SoldSum"][$key1] > $sumSub["SoldSum"][$key2]) {
$tmp = $sumSub["SoldSum"][$key1];
$sumSub["SoldSum"][$key1] = $sumSub["SoldSum"][$key2];
$sumSub["SoldSum"][$key2] = $tmp;
@@ -515,25 +488,18 @@
}
////////////////// SORT array /////////////////////////////////
$newArray2;
foreach( $sumSub["SoldSum"] as $key1=>&$element1 )
{
foreach( $categoryArray1 as $key2=>&$element2 )
{
if($sumSub["SoldSum"][$key1]==$categoryArray1[$key2]["SoldSum"])
{
foreach ($sumSub["SoldSum"] as $key1 => &$element1) {
foreach ($categoryArray1 as $key2 => &$element2) {
if ($sumSub["SoldSum"][$key1] == $categoryArray1[$key2]["SoldSum"]) {
$newArray2[$key2] = $categoryArray1[$key2];
}
}
}
$newArray1;
foreach( $newArray2 as $key1=>&$element1 )
{
foreach( $element1 as $key2=>&$element2 )
{
foreach( $element1 as $key3=>&$element3 )
{
if($sumSub2["SoldSum"][$key1][$key2]==$newArray2[$key1][$key3]["SoldSum2"])
{
foreach ($newArray2 as $key1 => &$element1) {
foreach ($element1 as $key2 => &$element2) {
foreach ($element1 as $key3 => &$element3) {
if ($sumSub2["SoldSum"][$key1][$key2] == $newArray2[$key1][$key3]["SoldSum2"]) {
$newArray1[$key1][$key3] = $newArray2[$key1][$key3];
}
}
@@ -541,18 +507,12 @@
}
//wyliczanie dokładne marży i średniej dla produktów
foreach( $newArray1 as $key1=>&$element1 )
{
foreach( $element1 as $key2=>&$element2 )
{
foreach( $element2 as $key3=>&$element3 )
{
foreach ($newArray1 as $key1 => &$element1) {
foreach ($element1 as $key2 => &$element2) {
foreach ($element2 as $key3 => &$element3) {
$newArray1[$key1][$key2][$key3]["marza"] = ($newArray1[$key1][$key2][$key3]["nettoNormal"] - $newArray1[$key1][$key2][$key3]["koszt"]) / $newArray1[$key1][$key2][$key3]["nettoNormal"] * 100;
$newArray1[$key1][$key2][$key3]["srednia"] = $newArray1[$key1][$key2][$key3]["nettoNormal"] / $newArray1[$key1][$key2][$key3]["IloscNormal"];
}
}
}
}
?>

7
modules/EcmReports/tpls/ReportSales.tpl
View File

@@ -247,7 +247,8 @@
<th width="30%" class="sorter-text tablesorter-header tablesorter-headerUnSorted" data-column="0" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">{$MOD.LBL_PRODUCTS}</th>
{if $searchBy=="product"}
<th width="10%" class="sorter-text tablesorter-header tablesorter-headerUnSorted" data-column="1" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">Indeks</th>
<th width="10%" class="sorter-text tablesorter-header tablesorter-headerUnSorted" data-column="1" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">Stan</th>
<th width="5%" class="sorter-text tablesorter-header tablesorter-headerUnSorted" data-column="1" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">Stan</th>
<th width="5%" class="sorter-text tablesorter-header tablesorter-headerUnSorted" data-column="1" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">Zamówiona ilość</th>
{/if}
<th width="10%" class="sorter-saas tablesorter-header tablesorter-headerUnSorted" data-column="2" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">{$MOD.LBL_SOLD_AMOUNT}</th>
<th width="10%" class="sorter-saas tablesorter-header tablesorter-headerUnSorted" data-column="3" tabindex="0" scope="col" role="columnheader" aria-disabled="false" unselectable="on" style="-moz-user-select: none;" aria-sort="none" aria-label="Name: No sort applied, activate to apply an ascending sort">{$MOD.LBL_VALUE_SALES}</th>
@@ -271,6 +272,7 @@
{if $searchBy=="product"}
<td class="oddListRowS1 alignLeft" ></td>
<td class="oddListRowS1 alignLeft" ></td>
<td class="oddListRowS1 alignLeft" ></td>
{/if}
<td class="oddListRowS1 sumRow" ><b>{$DATA.$CATNAME.IloscSum|number_format:0:",":"." }</b></td>
<td class="oddListRowS1 sumRow" ><b>{$DATA.$CATNAME.SoldSum|number_format:2:",":"." }</b></td>
@@ -292,6 +294,7 @@
{if $searchBy=="product"}
<td class="oddListRowS1 alignLeft" ></td>
<td class="oddListRowS1 alignLeft" ></td>
<td class="oddListRowS1 alignLeft" ></td>
{/if}
<td class="oddListRowS1 sumRow" ><b>{$CAT.$CAT2NAME.IloscSum2|number_format:0:",":"." }</b></td>
<td class="oddListRowS1 sumRow" ><b>{$CAT.$CAT2NAME.SoldSum2|number_format:2:",":"." }</b></td>
@@ -330,6 +333,7 @@
{if $searchBy=="product"}
<td class="oddListRowS1 alignLeft" >{$ROW.code}</td>
<td class="oddListRowS1 alignRight" >{$ROW.state}</td>
<td class="oddListRowS1 alignRight" >{$ROW.ordered_quantity}</td>
{/if}
<td class="oddListRowS1" >{$ROW.ilosc|number_format:0:",":"."}</td>
<td class="oddListRowS1" >{$ROW.netto|number_format:2:",":"."}</td>
@@ -352,6 +356,7 @@
{if $searchBy=="product"}
<td class="oddListRowS1" ></td>
<td class="oddListRowS1" ></td>
<td class="oddListRowS1" ></td>
{/if}
<td class="oddListRowS1 sumRow" ><b>{$SUM.IloscSumSum|number_format:0:",":"." }</b></td>
<td class="oddListRowS1 sumRow" ><b>{$SUM.SoldSumSum|number_format:2:",":"." }</b></td>

4
modules/EcmStockStates/EcmStockState.php
View File

@@ -214,9 +214,9 @@ class EcmStockState extends SugarBean {
$GLOBALS['db']->query(
"UPDATE ecmproducts as p
INNER JOIN (
SELECT round(sum(quantity*price)/sum(quantity),2) as avg_price, product_id FROM ecmstockstates GROUP BY product_id
SELECT round(sum(quantity*price)/sum(quantity),2) as avg_price, product_id, SUM(quantity) as stock_state FROM ecmstockstates GROUP BY product_id
) s ON p.id=s.product_id
SET p.ems_price = s.avg_price
SET p.ems_price = s.avg_price, p.ems_qty_in_stock = s.stock_state
WHERE p.id='$product_id'"
);
}