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() {