diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index 1a608e52..b01aba75 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -1374,14 +1374,15 @@ $endyr = $pieces['1']; $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',Quantity,0)) AS Addition, - SUM(IF(p.Transaction_type='Reduce',Quantity,0)) AS Reduce, - SUM((IF(p.Transaction_type='Add',Quantity,0))-(IF(p.Transaction_type='Reduce',Quantity,0))) AS AvailableStock + 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)) as Avg_rate FROM T_Material_stock_history AS p left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode left join ip_products ip on ip.product_id=p.MaterialCode +left join T_PurchaseOrder_LineItem pol on pol.MaterialCode = mm.MaterialCode "; diff --git a/application/views/materialStockReport.php b/application/views/materialStockReport.php index 4f116df4..cafe9850 100644 --- a/application/views/materialStockReport.php +++ b/application/views/materialStockReport.php @@ -234,6 +234,7 @@ $(function() { Total Issue Stock Closing Stock + Average Price @@ -371,6 +372,7 @@ $(function() { Reduce?> + Avg_rate;?> @@ -449,7 +451,7 @@ $(document).ready(function() { - var groupColumn = 7; + var groupColumn = 8; $.fn.dataTable.moment( 'DD-MM-YYYY' ); var table = $('#dataTableHistoriek').DataTable({ @@ -490,7 +492,7 @@ buttons: [ api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { if ( last !== group ) { $(rows).eq( i ).before( - ''+group+'' + ''+group+'' ); last = group;