SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/siddharth_application

Browse Source
This commit is contained in:
venbatechnologies 2018-06-23 14:44:11 +05:30
commit 660d9a2e10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/dahsboard_model.php
View File

@ -1485,7 +1485,7 @@ ifnull(sum(id.QuantityAsPerInvoice * pl.Rate),0)))
sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total, sum(id.QuantityAsPerInvoice * st.Afterdiscountval / pl.Quantity)),0),2)),2) as total,
im.file as ifile,pb.FilePath as file im.file as ifile,pb.FilePath as file
from T_IGR_Master im from T_IGR_Master im
join T_PurchaseOrder_LineItem pl on pl.PONO = im.PONO left 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_IGR_Details id on id.IGRNO = im.IGRNO and id.MaterialCode = pl.MaterialCode
join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO join T_PurchaseOrder_Master pm on pm.PONO = pl.PONO
left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
@ -1903,7 +1903,7 @@ if ($cname!= ''){
function ireport_consolidate($cname,$fa,$aa){ function ireport_consolidate($cname,$fa,$aa){
$sql="Select sid,mid,supplier_name,material_name, $sql="select sid,mid,supplier_name,material_name,
SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April, SUM(IF(month(materialrcvddate) = 4, quantity, 0)) AS April,
SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May, SUM(IF(month(materialrcvddate) = 5, quantity, 0)) AS May,
SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June, SUM(IF(month(materialrcvddate) = 6, quantity, 0)) AS June,