diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 753bda2f..cb825df4 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1410,8 +1410,9 @@ ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0))) + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file from T_IGR_Master im -join T_IGR_Details id on id.IGRNO = im.IGRNO join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO +join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode + join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID @@ -1486,8 +1487,9 @@ ifnull(sum(distinct id.QuantityAsPerInvoice * pl.Rate),0))) + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0) - ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file from T_IGR_Master im -join T_IGR_Details id on id.IGRNO = im.IGRNO join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO +join T_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode + join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID