From 14755cdc518c09b92d641ffe97fdf0e2fec344e5 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 31 Dec 2018 14:56:05 +0530
Subject: [PATCH] avg price

---
 application/models/batchcard_model.php    |  2 +-
 application/views/materialStockReport.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 218fd2c5..7d39bc35 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -1376,7 +1376,7 @@ $subquery="SELECT
   DISTINCT(p.MaterialCode) AS ProductID,Ref_No,Date(CreatedOn),mm.MaterialName,stock,MaterialType,Category,stockdate,mm.Category,ip.product_name,ip.product_id,
   SUM(IF(p.Transaction_type='Add',p.Quantity,0)) AS Addition,
   SUM(IF(p.Transaction_type='Reduce',p.Quantity,0)) AS Reduce,
-  SUM((IF(p.Transaction_type='Add',p.Quantity,0))-(IF(p.Transaction_type='Reduce',p.Quantity,0))) AS AvailableStock,ROUND(AVG(Rate),2) as Avg_rate
+  SUM((IF(p.Transaction_type='Add',p.Quantity,0))-(IF(p.Transaction_type='Reduce',p.Quantity,0))) AS AvailableStock,ROUND(AVG(Rate),2) as Avg_rate,ROUND(AVG(ItemValue),2) as Final_avg
 FROM
   T_Material_stock_history AS p
 left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
diff --git a/application/views/materialStockReport.php b/application/views/materialStockReport.php
index cafe9850..99b7c5dc 100644
--- a/application/views/materialStockReport.php
+++ b/application/views/materialStockReport.php
@@ -372,7 +372,15 @@ $(function() {
               <td><?php echo $total?></td>
               <td><?php echo $ge->Reduce?></td>
               <td><?php echo $FinalStock;?></td>
-              <td><?php echo $ge->Avg_rate;?></td>
+              <?php if($Avg_rate==''){?>
+
+              <td><?php echo $ge->Final_avg?></td>
+              <?php } 
+              else
+                {?>
+
+              <td><?php echo $ge->Avg_rate?></td>
+              <?php }?>
               <td><?php echo $MaterilCat;?></td>
             </tr>